diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 00:32:12 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 14:42:17 +0200 |
| commit | 621b30e277128018432397860a46c932ff82388c (patch) | |
| tree | 3579ba1035f085d1e9f074dffa0e1cdf19286ebe | |
| parent | 800f387af08f243e7d532ad7a78df1e3d6ad80e4 (diff) | |
Revert "Repository.mk: adjust layer of libraries in smoketest instset"
This reverts commit 1b736bf55e8ca79a06faabfa9866fffa6cab6c81.
Obsoleted by commit 359472b2b50165966c27c239eccd3ecfb03e2acc.
| -rw-r--r-- | Repository.mk | 14 | ||||
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | external/cppunit/ExternalProject_cppunit.mk | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/Repository.mk b/Repository.mk index 666a534b68e6..99941add5169 100644 --- a/Repository.mk +++ b/Repository.mk @@ -438,20 +438,16 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif -# these libraries are packaged in the "Test" instset, in the "program" dir :-/ -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - smoketest \ - test \ - unobootstrapprotector \ - unoexceptionprotector \ - unotest \ -)) - $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ + smoketest \ subsequenttest \ + test \ testtools_cppobj \ testtools_bridgetest \ testtools_constructors \ + unobootstrapprotector \ + unoexceptionprotector \ + unotest \ scqahelper \ unowinreg \ )) diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d1aea961e8da..37d0a34dece6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -192,7 +192,7 @@ endef else -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\ cppunit \ )) diff --git a/external/cppunit/ExternalProject_cppunit.mk b/external/cppunit/ExternalProject_cppunit.mk index 649bae1dcc01..cc4b9ad8edb7 100644 --- a/external/cppunit/ExternalProject_cppunit.mk +++ b/external/cppunit/ExternalProject_cppunit.mk @@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,cppunit,build) : --disable-html-docs \ --disable-latex-docs \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \ $(if $(filter WNT,$(OS)),LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ $(if $(filter SOLARIS,$(OS)),LIBS="-lm") \ $(if $(filter ANDROID,$(OS)),LIBS="-lgnustl_shared -lm") \ |