diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 21:18:16 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:23 +0100 |
| commit | 6cf65f96123772565b76898dc6892f692696e673 (patch) | |
| tree | 33fd3670c1b01b3e54a7b6ed3fbea67ce3a59bc7 | |
| parent | 2b16f68044aa05e6d50537ba3b26a97571a7161e (diff) | |
odk: merge Package_config_notwin into Packge_config
Change-Id: I021ae1bc6d816d359be364c221d70a0e178a8b80
| -rw-r--r-- | odk/Module_odk.mk | 4 | ||||
| -rw-r--r-- | odk/Package_config.mk | 16 | ||||
| -rw-r--r-- | odk/Package_config_notwin.mk | 19 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 7 |
4 files changed, 9 insertions, 37 deletions
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 56b940514175..2fe4b61b7bf9 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -36,10 +36,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_config_win \ Package_config_win \ )) -else -$(eval $(call gb_Module_add_targets,odk,\ - Package_config_notwin \ -)) endif ifneq ($(ENABLE_JAVA),) diff --git a/odk/Package_config.mk b/odk/Package_config.mk index 6efe33b1d4f8..e9c495e1bb74 100644 --- a/odk/Package_config.mk +++ b/odk/Package_config.mk @@ -7,21 +7,23 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,odk_config,$(SRCDIR)/odk/config)) +$(eval $(call gb_Package_Package,odk_config,$(SRCDIR))) $(eval $(call gb_Package_set_outdir,odk_config,$(INSTDIR))) ifeq ($(OS),WNT) $(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\ - cfgWin.js \ - setsdkenv_windows.template \ - setsdkname.bat \ + odk/config/cfgWin.js \ + odk/config/setsdkenv_windows.template \ + odk/config/setsdkname.bat \ )) else $(eval $(call gb_Package_add_files,odk_config,$(SDKDIRNAME),\ - configure.pl \ - setsdkenv_unix \ - setsdkenv_unix.sh.in \ + config.guess \ + config.sub \ + odk/config/configure.pl \ + odk/config/setsdkenv_unix \ + odk/config/setsdkenv_unix.sh.in \ )) endif diff --git a/odk/Package_config_notwin.mk b/odk/Package_config_notwin.mk deleted file mode 100644 index 8bd2d513f668..000000000000 --- a/odk/Package_config_notwin.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,odk_config_notwin,$(SRCDIR))) - -$(eval $(call gb_Package_set_outdir,odk_config_notwin,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,odk_config_notwin,$(SDKDIRNAME),\ - config.guess \ - config.sub \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 06fef8e4964b..e9ba29c89e56 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -96,13 +96,6 @@ File gid_File_Package_odk_config_win Name = "odk_config_win.filelist"; Styles = (FILELIST,USE_INTERNAL_RIGHTS); End -#else -File gid_File_Package_odk_config_notwin - TXT_FILE_BODY; - Dir = FILELIST_SDK_DIR; - Name = "odk_config_notwin.filelist"; - Styles = (FILELIST,USE_INTERNAL_RIGHTS); -End #endif File gid_File_Package_odk_docs |