diff options
author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-02-19 10:04:59 +0100 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-02-19 10:05:23 +0100 |
commit | 3708fe8434ad6f64d527215f4619556b0a5701ff (patch) | |
tree | 3b41467fd75fee3fa5d331f0cfcc2449fc157f8d /scp2 | |
parent | fix mid-air collision of commits (diff) | |
download | core-3708fe8434ad6f64d527215f4619556b0a5701ff.tar.gz core-3708fe8434ad6f64d527215f4619556b0a5701ff.zip |
Kill the --without-system-stdlibs option
Change-Id: I54bff2c8593995829857d30b38b8626a8c1a1a4f
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/InstallModule_stdlibs.mk | 38 | ||||
-rw-r--r-- | scp2/InstallScript_setup_osl.mk | 3 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 3 |
3 files changed, 0 insertions, 44 deletions
diff --git a/scp2/InstallModule_stdlibs.mk b/scp2/InstallModule_stdlibs.mk deleted file mode 100644 index 5f6c171834aa..000000000000 --- a/scp2/InstallModule_stdlibs.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_InstallModule_InstallModule,scp2/stdlibs)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/stdlibs,\ - scp2/source/stdlibs/file_stdlibs \ -)) - -$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/stdlibs,\ - scp2/source/stdlibs/module_stdlibs \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index a49c31f51a3b..166ab4268d5f 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -67,9 +67,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ scp2/onlineupdate \ ) \ - $(if $(filter-out YES,$(SYSTEM_STDLIBS)),\ - scp2/stdlibs \ - ) \ $(if $(filter TRUE,$(ENABLE_TDE)),\ scp2/tde \ ) \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 8052b91090c2..e2b92b4c9af7 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -73,9 +73,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ $(if $(filter TRUE,$(ENABLE_TDE)),\ InstallModule_tde \ ) \ - $(if $(filter-out YES,$(SYSTEM_STDLIBS)),\ - InstallModule_stdlibs \ - ) \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: |