diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-12 12:08:03 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-13 09:26:18 +0200 |
| commit | d3e93f256e5125b0948c89943b6c9bde6aa0d125 (patch) | |
| tree | b9a85ee99cf988cfb00785eadd0278c0c4f3fcf0 /cppuhelper | |
| parent | ea09e0352a82dabc26c713adc1825d89ff824178 (diff) | |
install SDK headers from filelists
... which allows us to drop gb_ZipPackage.
Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/CustomTarget_cppuhelper_allheaders.mk | 2 | ||||
| -rw-r--r-- | cppuhelper/Module_cppuhelper.mk | 2 | ||||
| -rw-r--r-- | cppuhelper/Package_cppuhelper_odk_headers.mk (renamed from cppuhelper/ZipPackage_cppuhelper_odk_headers.mk) | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk index e5f90817f556..a6d83d4069c7 100644 --- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk +++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \ # updated whenever a new public header is added $(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \ $(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \ - $(SRCDIR)/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk \ + $(SRCDIR)/cppuhelper/Package_cppuhelper_odk_headers.mk \ | $(cppuhelper_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all cppuhelper/ includes\n' > $@ diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk index 2a917fe140f4..96fd971b01f8 100644 --- a/cppuhelper/Module_cppuhelper.mk +++ b/cppuhelper/Module_cppuhelper.mk @@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\ CustomTarget_cppuhelper_allheaders \ InternalUnoApi_cppuhelper \ Library_cppuhelper \ + Package_cppuhelper_odk_headers \ Package_unorc \ StaticLibrary_findsofficepath \ - ZipPackage_cppuhelper_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,cppuhelper,\ diff --git a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk b/cppuhelper/Package_cppuhelper_odk_headers.mk index 2a95b6b4428d..93fac81c36eb 100644 --- a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk +++ b/cppuhelper/Package_cppuhelper_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,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc)) +$(eval $(call gb_Package_Package,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc)) -$(eval $(call gb_ZipPackage_add_files,cppuhelper_odk_headers,inc/cppuhelper,include/cppuhelper,\ +$(eval $(call gb_Package_set_outdir,cppuhelper_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,cppuhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppuhelper,\ cppuhelper/cppuhelperdllapi.h \ cppuhelper/access_control.hxx \ cppuhelper/basemutex.hxx \ |