summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-04-12 12:08:03 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-13 09:26:18 +0200
commitd3e93f256e5125b0948c89943b6c9bde6aa0d125 (patch)
treeb9a85ee99cf988cfb00785eadd0278c0c4f3fcf0 /salhelper
parentea09e0352a82dabc26c713adc1825d89ff824178 (diff)
install SDK headers from filelists
... which allows us to drop gb_ZipPackage. Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a
Diffstat (limited to 'salhelper')
-rw-r--r--salhelper/CustomTarget_salhelper_allheaders.mk2
-rw-r--r--salhelper/Module_salhelper.mk2
-rw-r--r--salhelper/Package_salhelper_odk_headers.mk (renamed from salhelper/ZipPackage_salhelper_odk_headers.mk)6
3 files changed, 6 insertions, 4 deletions
diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk
index 60498aab3da0..fd2e8d076904 100644
--- a/salhelper/CustomTarget_salhelper_allheaders.mk
+++ b/salhelper/CustomTarget_salhelper_allheaders.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \
# updated whenever a new public header is added
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
$(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
- $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \
+ $(SRCDIR)/salhelper/Package_salhelper_odk_headers.mk \
| $(salhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all salhelper/ includes\n' > $@
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index 31f3f22feff2..7ba68a90c4fa 100644
--- a/salhelper/Module_salhelper.mk
+++ b/salhelper/Module_salhelper.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper))
$(eval $(call gb_Module_add_targets,salhelper,\
CustomTarget_salhelper_allheaders \
Library_salhelper \
- ZipPackage_salhelper_odk_headers \
+ Package_salhelper_odk_headers \
))
$(eval $(call gb_Module_add_check_targets,salhelper,\
diff --git a/salhelper/ZipPackage_salhelper_odk_headers.mk b/salhelper/Package_salhelper_odk_headers.mk
index 8de4d5ffc1a7..89ae6148a477 100644
--- a/salhelper/ZipPackage_salhelper_odk_headers.mk
+++ b/salhelper/Package_salhelper_odk_headers.mk
@@ -25,9 +25,11 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_ZipPackage_ZipPackage,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper))
+$(eval $(call gb_Package_Package,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper))
-$(eval $(call gb_ZipPackage_add_files,salhelper_odk_headers,inc/salhelper,include/salhelper,\
+$(eval $(call gb_Package_set_outdir,salhelper_odk_headers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,salhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/salhelper,\
salhelperdllapi.h \
condition.hxx \
dynload.hxx \