Repository.mk | 8 ++++----
testtools/Library_bridgetest.mk | 18 +++++++++---------
testtools/Library_constructors.mk | 14 +++++++-------
testtools/Library_cppobj.mk | 18 +++++++++---------
testtools/StaticLibrary_bridgetest.mk | 13 ++++---------
5 files changed, 33 insertions(+), 38 deletions(-)
New commits:
commit c40a1fe0bcadee60de84d6bba6a1b2a1d5be212c
Author: David Ostrovsky <david.ostrov...@gmx.de>
Date: Sat May 19 22:10:41 2012 +0200
prefix testtools libraries with testtools_ in Repository.mk
Change-Id: I0894b073b5263a45c9026ec55049ebeaf0770535
diff --git a/Repository.mk b/Repository.mk
index 72efae3..d3b198c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -540,9 +540,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
endif
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
- cppobj \
- bridgetest \
- constructors \
acceptor \
binaryurp \
bootstrap \
@@ -557,6 +554,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
reflection \
stocservices \
streams \
+ testtools_cppobj \
+ testtools_bridgetest \
+ testtools_constructors \
textinstream \
textoutstream \
))
@@ -591,7 +591,7 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
ooopathutils \
sample \
salcpprt \
- testtools_bridgetest \
+ testtools_bridgetest_s \
transex \
ulingu \
vclmain \
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index b2765f6..a8f8fa5 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -24,34 +24,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,bridgetest))
+$(eval $(call gb_Library_Library,testtools_bridgetest))
-$(eval $(call
gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest))
+$(eval $(call
gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest))
-$(eval $(call gb_Executable_set_include,bridgetest,\
+$(eval $(call gb_Executable_set_include,testtools_bridgetest,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,bridgetest,\
+$(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,bridgetest,\
+$(eval $(call gb_Library_use_api,testtools_bridgetest,\
udkapi \
))
-$(eval $(call gb_Library_use_static_libraries,bridgetest,\
- testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\
+ testtools_bridgetest_s \
))
-$(eval $(call gb_Library_use_libraries,bridgetest,\
+$(eval $(call gb_Library_use_libraries,testtools_bridgetest,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,bridgetest,\
+$(eval $(call gb_Library_add_exception_objects,testtools_bridgetest,\
testtools/source/bridgetest/bridgetest \
))
diff --git a/testtools/Library_constructors.mk
b/testtools/Library_constructors.mk
index abf273b..3de7008 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -24,30 +24,30 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,constructors))
+$(eval $(call gb_Library_Library,testtools_constructors))
-$(eval $(call
gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors))
+$(eval $(call
gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors))
-$(eval $(call gb_Executable_set_include,constructors,\
+$(eval $(call gb_Executable_set_include,testtools_constructors,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,constructors,\
+$(eval $(call gb_Library_use_internal_api,testtools_constructors,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,constructors,\
+$(eval $(call gb_Library_use_api,testtools_constructors,\
udkapi \
))
-$(eval $(call gb_Library_use_libraries,constructors,\
+$(eval $(call gb_Library_use_libraries,testtools_constructors,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,constructors,\
+$(eval $(call gb_Library_add_exception_objects,testtools_constructors,\
testtools/source/bridgetest/constructors \
))
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 649f71a..0bbdf23 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -24,34 +24,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,cppobj))
+$(eval $(call gb_Library_Library,testtools_cppobj))
-$(eval $(call
gb_Library_set_componentfile,cppobj,testtools/source/bridgetest/cppobj))
+$(eval $(call
gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj))
-$(eval $(call gb_Executable_set_include,cppobj,\
+$(eval $(call gb_Executable_set_include,testtools_cppobj,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,cppobj,\
+$(eval $(call gb_Library_use_internal_api,testtools_cppobj,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,cppobj,\
+$(eval $(call gb_Library_use_api,testtools_cppobj,\
udkapi \
))
-$(eval $(call gb_Library_use_static_libraries,cppobj,\
- testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\
+ testtools_bridgetest_s \
))
-$(eval $(call gb_Library_use_libraries,cppobj,\
+$(eval $(call gb_Library_use_libraries,testtools_cppobj,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,cppobj,\
+$(eval $(call gb_Library_add_exception_objects,testtools_cppobj,\
testtools/source/bridgetest/cppobj \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk
b/testtools/StaticLibrary_bridgetest.mk
index c3bde3c..ed96f34 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -25,22 +25,17 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest))
+$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s))
-$(eval $(call gb_StaticLibrary_set_include,cppobj,\
- -I$(SRCDIR)/testtools/source/bridgetest \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\
bridgetest \
))
-$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest_s,\
udkapi \
))
-$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest_s,\
testtools/source/bridgetest/currentcontextchecker \
testtools/source/bridgetest/multi \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
