mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trivial makefile cleanups

Browse Source 
Change-Id: Ida5bdfa06ecd7907305f4f171ca5ab64260d0259
This commit is contained in:
Michael Stahl
2016-11-21 23:10:52 +01:00
parent ac9ba52117
commit 6a18fdceb5
12 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
basic/CppunitTest_basic_scanner.mk
View File

@@ -41,9 +41,9 @@ $(eval $(call gb_CppunitTest_use_system_win32_libs,basic_scanner, \
endif endif
$(eval $(call gb_CppunitTest_set_include,basic_scanner,\ $(eval $(call gb_CppunitTest_set_include,basic_scanner,\
-I$(SRCDIR)/basic/source/inc \ -I$(SRCDIR)/basic/source/inc \
-I$(SRCDIR)/basic/inc \ -I$(SRCDIR)/basic/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
dbaccess/CppunitTest_dbaccess_RowSetClones.mk
View File

@@ -59,10 +59,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_RowSetClones, \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppunitTest_set_include,dbaccess_RowSetClones,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\ $(eval $(call gb_CppunitTest_use_api,dbaccess_RowSetClones,\
offapi \ offapi \
oovbaapi \ oovbaapi \

4
dbaccess/CppunitTest_dbaccess_dialog_save.mk
View File

@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppunitTest_set_include,dbaccess_dialog_save,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\ $(eval $(call gb_CppunitTest_use_api,dbaccess_dialog_save,\
offapi \ offapi \
oovbaapi \ oovbaapi \

4
dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk
View File

@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_empty_stdlib_save, \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppunitTest_set_include,dbaccess_empty_stdlib_save,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\ $(eval $(call gb_CppunitTest_use_api,dbaccess_empty_stdlib_save,\
offapi \ offapi \
oovbaapi \ oovbaapi \

4
dbaccess/CppunitTest_dbaccess_macros_test.mk
View File

@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\ $(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
offapi \ offapi \
oovbaapi \ oovbaapi \

4
dbaccess/CppunitTest_dbaccess_nolib_save.mk
View File

@@ -55,10 +55,6 @@ $(eval $(call gb_CppunitTest_use_libraries,dbaccess_nolib_save, \
$(gb_UWINAPI) \ $(gb_UWINAPI) \
)) ))
$(eval $(call gb_CppunitTest_set_include,dbaccess_nolib_save,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_api,dbaccess_nolib_save,\ $(eval $(call gb_CppunitTest_use_api,dbaccess_nolib_save,\
offapi \ offapi \
oovbaapi \ oovbaapi \

2
editeng/Module_editeng.mk
View File

@@ -20,7 +20,7 @@
$(eval $(call gb_Module_Module,editeng)) $(eval $(call gb_Module_Module,editeng))
$(eval $(call gb_Module_add_targets,editeng,\ $(eval $(call gb_Module_add_targets,editeng,\
CustomTarget_generated \ CustomTarget_generated \
Library_editeng \ Library_editeng \
)) ))

2
filter/CppunitTest_filter_dxf_test.mk
View File

@@ -16,7 +16,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_dxf_test, \
)) ))
$(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \ $(eval $(call gb_CppunitTest_use_libraries,filter_dxf_test, \
gie \ gie \
sal \ sal \
test \ test \
tl \ tl \

8
filter/CppunitTest_filter_pict_test.mk
View File

@@ -18,14 +18,14 @@ $(eval $(call gb_CppunitTest_add_exception_objects,filter_pict_test, \
)) ))
$(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \ $(eval $(call gb_CppunitTest_use_libraries,filter_pict_test, \
cppu \ cppu \
comphelper \ comphelper \
basegfx \ basegfx \
sal \ sal \
test \ test \
tk \ tk \
tl \ tl \
utl \ utl \
unotest \ unotest \
vcl \ vcl \
$(gb_UWINAPI) \ $(gb_UWINAPI) \

6
sal/CppunitTest_sal_rtl_oustring.mk
View File

@@ -19,9 +19,9 @@ $(eval $(call gb_CppunitTest_use_libraries,sal_rtl_oustring,\
)) ))
$(eval $(call gb_CppunitTest_set_include,sal_rtl_oustring,\ $(eval $(call gb_CppunitTest_set_include,sal_rtl_oustring,\
-I$(SRCDIR)/sal/qa/inc \ -I$(SRCDIR)/sal/qa/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
# The test uses O(U)String capabilities that dlopen this lib: # The test uses O(U)String capabilities that dlopen this lib:
$(call gb_CppunitTest_get_target,sal_rtl_oustring) : \ $(call gb_CppunitTest_get_target,sal_rtl_oustring) : \

3
svl/CppunitTest_svl_lngmisc.mk
View File

@@ -10,7 +10,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,svl_lngmisc)) $(eval $(call gb_CppunitTest_CppunitTest,svl_lngmisc))
$(eval $(call gb_CppunitTest_add_exception_objects,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 # 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 \ -I$(SRCDIR)/svl/source/inc \
$$(INCLUDE) \ $$(INCLUDE) \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

4
svx/CppunitTest_svx_unit.mk
View File

@@ -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_use_sdk_api,svx_unit))
$(eval $(call gb_CppunitTest_set_include,svx_unit,\
$$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \ $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
svx/qa/unit/svdraw/test_SdrTextObject \ svx/qa/unit/svdraw/test_SdrTextObject \
svx/qa/unit/xoutdev \ svx/qa/unit/xoutdev \