diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-27 00:23:07 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-27 01:33:19 +0100 |
| commit | 5c60cebafdc6d6d773c794c0a4ee58d63782df22 (patch) | |
| tree | b9dcb6bfac82ee0b43823d768339e527aba0b09e | |
| parent | ba8372449befc6c534ab9596d7a3fd1e66884d61 (diff) | |
store: new ZipPackage_store_odk_headers
Change-Id: I2d4e2853014ef30419a66c8f9b2675b92d60adb6
| -rw-r--r-- | odk/CustomTarget_doxygen.mk | 2 | ||||
| -rw-r--r-- | store/Library_store.mk | 2 | ||||
| -rw-r--r-- | store/Module_store.mk | 2 | ||||
| -rw-r--r-- | store/ZipPackage_store_odk_headers.mk (renamed from store/Package_inc.mk) | 12 |
4 files changed, 10 insertions, 8 deletions
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk index 36009e27256a..cde87c4baa55 100644 --- a/odk/CustomTarget_doxygen.mk +++ b/odk/CustomTarget_doxygen.mk @@ -24,7 +24,7 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \ $(call gb_Package_get_target,salhelper_odk_headers) \ $(call gb_Package_get_target,cppu_odk_headers) \ $(call gb_Package_get_target,cppuhelper_odk_headers) \ - $(call gb_Package_get_target,store_inc) \ + $(call gb_Package_get_target,store_odk_headers) \ $(call gb_Package_get_target,registry_odk_headers) diff --git a/store/Library_store.mk b/store/Library_store.mk index f66c1ebce6db..09546926fe03 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,store)) $(eval $(call gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store.map)) $(eval $(call gb_Library_use_packages,store,\ - store_inc \ + store_odk_headers \ )) $(eval $(call gb_Library_add_defs,store,\ diff --git a/store/Module_store.mk b/store/Module_store.mk index 9f166ac3327f..f6a9454ecfe6 100644 --- a/store/Module_store.mk +++ b/store/Module_store.mk @@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,store)) $(eval $(call gb_Module_add_targets,store,\ Library_store \ - Package_inc \ + ZipPackage_store_odk_headers \ )) # vim:set noet sw=4 ts=4: diff --git a/store/Package_inc.mk b/store/ZipPackage_store_odk_headers.mk index 11c3e15c7411..cb21dbc26085 100644 --- a/store/Package_inc.mk +++ b/store/ZipPackage_store_odk_headers.mk @@ -24,11 +24,13 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,store_inc,$(SRCDIR)/store)) +$(eval $(call gb_ZipPackage_ZipPackage,store_odk_headers,$(SRCDIR)/store/inc/store)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h)) -$(eval $(call gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h)) +$(eval $(call gb_ZipPackage_add_files,store_odk_headers,inc/store,include/store,\ + store.h \ + store.hxx \ + storedllapi.h \ + types.h \ +)) # vim: set noet sw=4 ts=4: |