[Libreoffice-commits] core.git: basic/CppunitTest_basic_scanner.mk dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_macros_test.mk dbaccess/CppunitTest_dbaccess_nolib_save.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk editeng/Module_editeng.mk filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_pict_test.mk sal/CppunitTest_sal_rtl_oustring.mk svl/CppunitTest_svl_lngmisc.mk svx/CppunitTest_svx_unit.mk
Michael Stahl
mstahl at redhat.com
Tue Nov 22 12:18:55 UTC 2016
basic/CppunitTest_basic_scanner.mk | 6 +++---
dbaccess/CppunitTest_dbaccess_RowSetClones.mk | 4 ----
dbaccess/CppunitTest_dbaccess_dialog_save.mk | 4 ----
dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk | 4 ----
dbaccess/CppunitTest_dbaccess_macros_test.mk | 4 ----
dbaccess/CppunitTest_dbaccess_nolib_save.mk | 4 ----
editeng/Module_editeng.mk | 2 +-
filter/CppunitTest_filter_dxf_test.mk | 2 +-
filter/CppunitTest_filter_pict_test.mk | 8 ++++----
sal/CppunitTest_sal_rtl_oustring.mk | 6 +++---
svl/CppunitTest_svl_lngmisc.mk | 3 ++-
svx/CppunitTest_svx_unit.mk | 4 ----
12 files changed, 14 insertions(+), 37 deletions(-)
New commits:
commit 6a18fdceb5e6a2f2f9029ec767b405b4475a19e0
Author: Michael Stahl <mstahl at redhat.com>
Date: Mon Nov 21 23:10:52 2016 +0100
trivial makefile cleanups
Change-Id: Ida5bdfa06ecd7907305f4f171ca5ab64260d0259
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index c921cc5..aa03f41 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -41,9 +41,9 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
endif
$(eval $(call gb_CppunitTest_set_include,basic_scanner,\
--I$(SRCDIR)/basic/source/inc \
--I$(SRCDIR)/basic/inc \
-$$(INCLUDE) \
+ -I$(SRCDIR)/basic/source/inc \
+ -I$(SRCDIR)/basic/inc \
+ $$(INCLUDE) \
))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
index c41c3fe..31dfae5 100644
--- a/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
+++ b/dbaccess/CppunitTest_dbaccess_RowSetClones.mk
@@ -59,10 +59,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_set_include,dbaccess_RowSetClones,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\
offapi \
oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_dialog_save.mk b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
index 19d7767..0285625 100644
--- a/dbaccess/CppunitTest_dbaccess_dialog_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_dialog_save.mk
@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_set_include,dbaccess_dialog_save,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\
offapi \
oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
index ffb2937..3c01fe0 100644
--- a/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_set_include,dbaccess_empty_stdlib_save,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\
offapi \
oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index 6a2bbc1..115bbfb 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
offapi \
oovbaapi \
diff --git a/dbaccess/CppunitTest_dbaccess_nolib_save.mk b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
index 3559cee..258eeb5 100644
--- a/dbaccess/CppunitTest_dbaccess_nolib_save.mk
+++ b/dbaccess/CppunitTest_dbaccess_nolib_save.mk
@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_nolib_save, \
$(gb_UWINAPI) \
))
-$(eval $(call gb_CppunitTest_set_include,dbaccess_nolib_save,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_CppunitTest_use_api,dbaccess_nolib_save,\
offapi \
oovbaapi \
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 22f3602..f48dde9 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -20,7 +20,7 @@
$(eval $(call gb_Module_Module,editeng))
$(eval $(call gb_Module_add_targets,editeng,\
- CustomTarget_generated \
+ CustomTarget_generated \
Library_editeng \
))
diff --git a/filter/CppunitTest_filter_dxf_test.mk b/filter/CppunitTest_filter_dxf_test.mk
index 362c89b..19511c7 100644
--- a/filter/CppunitTest_filter_dxf_test.mk
+++ b/filter/CppunitTest_filter_dxf_test.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_dxf_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
- gie \
+ gie \
sal \
test \
tl \
diff --git a/filter/CppunitTest_filter_pict_test.mk b/filter/CppunitTest_filter_pict_test.mk
index 7da6023..6858637 100644
--- a/filter/CppunitTest_filter_pict_test.mk
+++ b/filter/CppunitTest_filter_pict_test.mk
@@ -18,14 +18,14 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \
))
$(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \
- cppu \
- comphelper \
+ cppu \
+ comphelper \
basegfx \
sal \
test \
- tk \
+ tk \
tl \
- utl \
+ utl \
unotest \
vcl \
$(gb_UWINAPI) \
diff --git a/sal/CppunitTest_sal_rtl_oustring.mk b/sal/CppunitTest_sal_rtl_oustring.mk
index a974f60..1877ab3 100644
--- a/sal/CppunitTest_sal_rtl_oustring.mk
+++ b/sal/CppunitTest_sal_rtl_oustring.mk
@@ -19,9 +19,9 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustring,\
))
$(eval $(call gb_CppunitTest_set_include,sal_rtl_oustring,\
- -I$(SRCDIR)/sal/qa/inc \
- $$(INCLUDE) \
- ))
+ -I$(SRCDIR)/sal/qa/inc \
+ $$(INCLUDE) \
+))
# The test uses O(U)String capabilities that dlopen this lib:
$(call gb_CppunitTest_get_target,sal_rtl_oustring) : \
diff --git a/svl/CppunitTest_svl_lngmisc.mk b/svl/CppunitTest_svl_lngmisc.mk
index d21e318..6769f67 100644
--- a/svl/CppunitTest_svl_lngmisc.mk
+++ b/svl/CppunitTest_svl_lngmisc.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,svl_lngmisc))
$(eval $(call gb_CppunitTest_add_exception_objects,svl_lngmisc, \
-svl/qa/unit/test_lngmisc \
+ svl/qa/unit/test_lngmisc \
))
# add a list of all needed libraries here
@@ -33,4 +33,5 @@ $(eval $(call gb_CppunitTest_set_include,svl_lngmisc,\
-I$(SRCDIR)/svl/source/inc \
$$(INCLUDE) \
))
+
# vim: set noet sw=4 ts=4:
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index 765f385..6563d60 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_CppunitTest_use_external,svx_unit,boost_headers))
$(eval $(call gb_CppunitTest_use_sdk_api,svx_unit))
-$(eval $(call gb_CppunitTest_set_include,svx_unit,\
- $$(INCLUDE) \
-))
-
$(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
svx/qa/unit/svdraw/test_SdrTextObject \
svx/qa/unit/xoutdev \
More information about the Libreoffice-commits
mailing list