diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 00:06:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:31 +0200 |
| commit | 5e300e9030d8d0730223b1eea1627953524cb58c (patch) | |
| tree | 561bc85514f044fc05dee7c9dfce3617516c2c77 /odk | |
| parent | def1a59d18b8cb1bf351ae83f2f11acbe41a8229 (diff) | |
odk: remove Package_bin, instead auto-install executables
This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.
Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 3 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 1 | ||||
| -rw-r--r-- | odk/Package_bin.mk | 27 |
3 files changed, 2 insertions, 29 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index e7d524450489..46042a49726c 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,8 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ $(if $(DOXYGEN),$(call gb_GeneratedPackage_get_target,odk_doxygen)) \ - $(call gb_Package_get_target,odk_bin) \ + $(foreach exe,$(if $(filter WNT,$(OS)),climaker) cppumaker idlc javamaker regcompare $(if $(SYSTEM_UCPP),,ucpp) uno-skeletonmaker unoapploader,\ + $(call gb_Executable_get_target,$(exe))) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(call gb_Package_get_target,odk_config) \ $(if $(filter WNT,$(OS)),\ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 7dd0e20dcecb..56b940514175 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_html \ CustomTarget_settings \ Executable_unoapploader \ - Package_bin \ Package_config \ Package_docs \ Package_html \ diff --git a/odk/Package_bin.mk b/odk/Package_bin.mk deleted file mode 100644 index 46d447a0e71c..000000000000 --- a/odk/Package_bin.mk +++ /dev/null @@ -1,27 +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_bin,$(OUTDIR)/bin)) - -$(eval $(call gb_Package_set_outdir,odk_bin,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,odk_bin,$(gb_Package_SDKDIRNAME)/bin,\ - $(addsuffix $(gb_Executable_EXT),\ - $(if $(filter WNT,$(OS)),climaker) \ - cppumaker \ - idlc \ - javamaker \ - regcompare \ - $(if $(SYSTEM_UCPP),,ucpp) \ - uno-skeletonmaker \ - unoapploader \ - ) \ -)) - -# vim: set noet sw=4 ts=4: |