diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:04:53 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:21:43 +0200 |
| commit | 5ad95cec96f6f08c55bb226a6eaeb1eeb95c1279 (patch) | |
| tree | 0ac426a6e347186f4ded058c2f74c9acaa6490d1 /store | |
| parent | c56013e97b7b5cf7a09a3ff99e0c172450dcb5a5 (diff) | |
Revert "store: new ZipPackage_store_odk_headers"
This reverts commit 5c60cebafdc6d6d773c794c0a4ee58d63782df22.
The "store" library is not actually a stable URE interface.
Conflicts:
odk/CustomTarget_doxygen.mk
Change-Id: I221696515ba07b0155406a503c33760c58d1338f
Diffstat (limited to 'store')
| -rw-r--r-- | store/Library_store.mk | 2 | ||||
| -rw-r--r-- | store/Module_store.mk | 2 | ||||
| -rw-r--r-- | store/Package_inc.mk (renamed from store/ZipPackage_store_odk_headers.mk) | 12 |
3 files changed, 7 insertions, 9 deletions
diff --git a/store/Library_store.mk b/store/Library_store.mk index fabac105cfd7..11c822e17e90 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store $(eval $(call gb_Library_use_external,store,boost_headers)) $(eval $(call gb_Library_use_packages,store,\ - store_odk_headers \ + store_inc \ )) $(eval $(call gb_Library_add_defs,store,\ diff --git a/store/Module_store.mk b/store/Module_store.mk index f6a9454ecfe6..9f166ac3327f 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 \ - ZipPackage_store_odk_headers \ + Package_inc \ )) # vim:set noet sw=4 ts=4: diff --git a/store/ZipPackage_store_odk_headers.mk b/store/Package_inc.mk index cb21dbc26085..11c3e15c7411 100644 --- a/store/ZipPackage_store_odk_headers.mk +++ b/store/Package_inc.mk @@ -24,13 +24,11 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_ZipPackage_ZipPackage,store_odk_headers,$(SRCDIR)/store/inc/store)) +$(eval $(call gb_Package_Package,store_inc,$(SRCDIR)/store)) -$(eval $(call gb_ZipPackage_add_files,store_odk_headers,inc/store,include/store,\ - store.h \ - store.hxx \ - storedllapi.h \ - types.h \ -)) +$(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)) # vim: set noet sw=4 ts=4: |