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 /cppu | |
| parent | ea09e0352a82dabc26c713adc1825d89ff824178 (diff) | |
install SDK headers from filelists
... which allows us to drop gb_ZipPackage.
Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/CustomTarget_cppu_allheaders.mk | 2 | ||||
| -rw-r--r-- | cppu/Module_cppu.mk | 2 | ||||
| -rw-r--r-- | cppu/Package_cppu_odk_headers.mk (renamed from cppu/ZipPackage_cppu_odk_headers.mk) | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk index 6d5ebeba49f2..f7573f7e7c38 100644 --- a/cppu/CustomTarget_cppu_allheaders.mk +++ b/cppu/CustomTarget_cppu_allheaders.mk @@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \ # updated whenever a new public header is added $(cppu_allheaders_DIR)/cppu_allheaders.hxx : \ $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \ - $(SRCDIR)/cppu/ZipPackage_cppu_odk_headers.mk \ + $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \ | $(cppu_allheaders_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) printf '// Generated list of all cppu/ includes\n' > $@ diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk index 6a5bf3276ee8..c957320361a8 100644 --- a/cppu/Module_cppu.mk +++ b/cppu/Module_cppu.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,cppu,\ Library_log_uno \ Library_purpenvhelper \ Library_unsafe_uno \ - ZipPackage_cppu_odk_headers \ + Package_cppu_odk_headers \ )) $(eval $(call gb_Module_add_check_targets,cppu,\ diff --git a/cppu/ZipPackage_cppu_odk_headers.mk b/cppu/Package_cppu_odk_headers.mk index 0b7c9dca7ece..3b203fc29769 100644 --- a/cppu/ZipPackage_cppu_odk_headers.mk +++ b/cppu/Package_cppu_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,cppu_odk_headers,$(SRCDIR)/cppu/inc)) +$(eval $(call gb_Package_Package,cppu_odk_headers,$(SRCDIR)/cppu/inc)) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,include/com/sun/star/uno,\ +$(eval $(call gb_Package_set_outdir,cppu_odk_headers,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/com/sun/star/uno,\ com/sun/star/uno/Any.h \ com/sun/star/uno/Any.hxx \ com/sun/star/uno/genfunc.h \ @@ -40,7 +42,7 @@ $(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,incl com/sun/star/uno/Type.hxx \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu,\ cppu/cppudllapi.h \ cppu/EnvDcp.hxx \ cppu/Enterable.hxx \ @@ -50,19 +52,19 @@ $(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\ cppu/unotype.hxx \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu/helper/purpenv/,include/cppu/helper/purpenv/,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv/,\ cppu/helper/purpenv/Environment.hxx \ cppu/helper/purpenv/Mapping.hxx \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/typelib,include/typelib,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/typelib,\ typelib/typeclass.h \ typelib/typedescription.h \ typelib/typedescription.hxx \ typelib/uik.h \ )) -$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/uno,include/uno,\ +$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/uno,\ uno/any2.h \ uno/current_context.h \ uno/current_context.hxx \ |