diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:08:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-10 16:21:43 +0200 |
| commit | 857adeada9cc3276e79ceb828959a3ffe2d7409b (patch) | |
| tree | 350adcb6e9b8453ac2f5dfe180e503b5b0e29034 /codemaker | |
| parent | 5ad95cec96f6f08c55bb226a6eaeb1eeb95c1279 (diff) | |
Revert "registry: new ZipPackage_registry_odk_headers"
This reverts commit ba8372449befc6c534ab9596d7a3fd1e66884d61.
The "reg" library is not actually a stable URE interface.
Conflicts:
odk/CustomTarget_doxygen.mk
registry/Module_registry.mk
Change-Id: Ic53e1b8eecd6a12c9ec194df2f0093004db7c01b
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/StaticLibrary_codemaker.mk | 2 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker_cpp.mk | 2 | ||||
| -rw-r--r-- | codemaker/StaticLibrary_codemaker_java.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index ebd86c881718..f95842fe37bb 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker,\ codemaker_inc \ - registry_odk_headers \ + registry_inc \ sal_generated \ sal_odk_headers \ salhelper_odk_headers \ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index 7bd556506785..6c081ffefcb6 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ codemaker_inc \ - registry_odk_headers \ + registry_inc \ sal_generated \ sal_odk_headers \ salhelper_odk_headers \ diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 4ef12c366994..096da0fd78de 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -31,7 +31,7 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers)) $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ codemaker_inc \ - registry_odk_headers \ + registry_inc \ sal_generated \ sal_odk_headers \ salhelper_odk_headers \ |