summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-18 21:01:14 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-21 19:23:43 +0200
commit90cc3ce0795eddfa9664cc3fabe88efb6df38367 (patch)
treea59a9d02ed8affe1b477979ba6983dddf258167f
parent0c46d4126ee84fa3ceeeee97a192e55bddf9168a (diff)
Repository.mk: adjust layer of libraries in smoketest instset
These are currently installed in the "program" dir, whether that is a good idea or not. Change-Id: I842bc0a72f9a6f78462ad18151cd42f85753aadf
-rw-r--r--Repository.mk14
-rw-r--r--RepositoryExternal.mk2
-rw-r--r--cppunit/ExternalProject_cppunit.mk2
3 files changed, 11 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk
index 8d6f10c1bf4b..4f2a380e5de9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -434,16 +434,20 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+# these libraries are packaged in the "Test" instset, in the "program" dir :-/
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
smoketest \
- subsequenttest \
test \
- testtools_cppobj \
- testtools_bridgetest \
- testtools_constructors \
unobootstrapprotector \
unoexceptionprotector \
unotest \
+))
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
+ subsequenttest \
+ testtools_cppobj \
+ testtools_bridgetest \
+ testtools_constructors \
scqahelper \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 755c3c2ad26b..560ff4344f9f 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -192,7 +192,7 @@ endef
else
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE,\
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
cppunit \
))
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index cc4b9ad8edb7..649bae1dcc01 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/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=/@.__________________________________________________NONE) \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(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") \