diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-10 14:47:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:21:42 +0200 |
| commit | d0857f0e57fb553b4ecb3b955273486dad002b90 (patch) | |
| tree | 100b84c6334f6005b5c8585641254e7789456c3f /odk | |
| parent | 164cf38321c63a03ec7acd9b4d5fef84404e1fd7 (diff) | |
odk: fix packaging of WNT import libraries
(regression from 613221bde1744265c336c2b5f2ade0bfb9b22d16)
Change-Id: I32775c27e7d17bfc78562f231a4061630c5b7f1a
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_lib.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/odk/CustomTarget_lib.mk b/odk/CustomTarget_lib.mk index 98ab17794510..d817835b902a 100644 --- a/odk/CustomTarget_lib.mk +++ b/odk/CustomTarget_lib.mk @@ -10,9 +10,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/lib)) define odk_lib -odkcommon_ZIPLIST += lib/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/lib): $(odk_WORKDIR)/lib/$(1) -$(odk_WORKDIR)/lib/$(1): $(call gb_Library_get_target,$(1)) +odkcommon_ZIPLIST += lib/$(notdir $(1)) +$(call gb_CustomTarget_get_target,odk/odkcommon/lib) : \ + $(odk_WORKDIR)/lib/$(notdir $(1)) +$(odk_WORKDIR)/lib/$(notdir $(1)) : $(1) mkdir -p $$(dir $$@) $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) cp $$< $$@ @@ -27,7 +28,7 @@ odk_LIBLIST := store \ cppuhelper \ purpenvhelper -$(foreach lib,$(odk_LIBLIST),$(eval $(call odk_lib,$(lib)))) +$(foreach lib,$(odk_LIBLIST),$(eval $(call odk_lib,$(call gb_Library_get_target,$(lib))))) else ifeq ($(OS),LINUX) odkcommon_ZIPLIST += lib/libsalcpprt.a $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/lib,libsalcpprt.a)) |