Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3503 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/3503/1 gbuild: drop empty use_packages calls Change-Id: I8e9f70eb5d929c98b4379416c2259a74e31d587f --- M animations/Library_animcore.mk M basegfx/Library_basegfx.mk M basic/AllLangResTarget_sb.mk M bean/Library_officebean.mk M canvas/Library_canvasfactory.mk M chart2/AllLangResTarget_chartcontroller.mk M codemaker/StaticLibrary_codemaker.mk M codemaker/StaticLibrary_codemaker_cpp.mk M codemaker/StaticLibrary_codemaker_java.mk M connectivity/CppunitTest_connectivity_commontools.mk M connectivity/Library_dbtools.mk M connectivity/Library_kabdrv1.mk M connectivity/Library_tdeab1.mk M connectivity/Library_tdeabdrv1.mk M cosv/StaticLibrary_cosv.mk M cppuhelper/StaticLibrary_findsofficepath.mk M cui/AllLangResTarget_cui.mk M dbaccess/AllLangResTarget_dba.mk M dbaccess/AllLangResTarget_dbmm.mk M dbaccess/AllLangResTarget_sdbt.mk M desktop/AllLangResTarget_deploymentgui.mk M desktop/AllLangResTarget_dkt.mk M desktop/Executable_unopkg.com.mk M desktop/Executable_unopkg.mk M desktop/Library_libreoffice.mk M desktop/StaticLibrary_winextendloaderenv.mk M dtrans/StaticLibrary_dtobj.mk M editeng/AllLangResTarget_editeng.mk M embeddedobj/Library_embobj.mk M embedserv/Library_inprocserv.mk M extensions/AllLangResTarget_abp.mk M extensions/AllLangResTarget_bib.mk M extensions/AllLangResTarget_dbp.mk M extensions/Executable_nsplugin.mk M extensions/Library_bib.mk M extensions/Library_log.mk M extensions/Library_updatecheckui.mk M extensions/Library_updchk.mk M extensions/StaticLibrary_npsoenv.mk M filter/AllLangResTarget_pdffilter.mk M filter/AllLangResTarget_xsltdlg.mk M forms/AllLangResTarget_frm.mk M formula/AllLangResTarget_for.mk M formula/AllLangResTarget_forui.mk M formula/Library_for.mk M fpicker/AllLangResTarget_fps_office.mk M fpicker/Library_fps.mk M fpicker/Library_fps_aqua.mk M framework/AllLangResTarget_fwe.mk M i18nlangtag/Library_i18nlangtag.mk M jurt/Library_jpipe.mk M jvmaccess/Library_jvmaccess.mk M jvmfwk/Library_jvmfwk.mk M jvmfwk/Library_sunjavaplugin.mk M l10ntools/StaticLibrary_transex.mk M lingucomponent/StaticLibrary_ulingu.mk M mysqlcppconn/Library_mysqlcppconn.mk M np_sdk/StaticLibrary_nputils.mk M odk/Executable_unoapploader.mk M pyuno/Library_pyuno_wrapper.mk M registry/Library_reg.mk M registry/StaticLibrary_registry_helper.mk M sal/Library_sal.mk M sal/Library_uwinapi.mk M sal/StaticLibrary_salcpprt.mk M sax/Library_sax.mk M sax/StaticLibrary_sax_shared.mk M sc/Library_sc.mk M sdext/Executable_xpdfimport.mk M sdext/StaticLibrary_pdfimport_s.mk M sfx2/AllLangResTarget_sfx2.mk M shell/Library_kdebe.mk M shell/Library_tdebe.mk M slideshow/Library_slideshow.mk M starmath/Library_smd.mk M store/Library_store.mk M svl/AllLangResTarget_svl.mk M svl/Library_svl.mk M svtools/AllLangResTarget_svt.mk M svx/AllLangResTarget_gal.mk M svx/AllLangResTarget_ofa.mk M svx/AllLangResTarget_svx.mk M svx/AllLangResTarget_textconversiondlgs.mk M svx/Library_textconversiondlgs.mk M sw/Library_sw.mk M testtools/StaticLibrary_bridgetest.mk M tools/StaticLibrary_ooopathutils.mk M ucb/Library_srtrs1.mk M ucb/Library_ucpext.mk M udm/StaticLibrary_udm.mk M uui/AllLangResTarget_uui.mk M vcl/AllLangResTarget_vcl.mk M vcl/Library_vcl.mk M vcl/Library_vclplug_kde.mk M vcl/Library_vclplug_tde.mk M vcl/StaticLibrary_headless.mk M vcl/StaticLibrary_vclmain.mk M writerperfect/StaticLibrary_writerperfect.mk M xmlscript/Library_xmlscript.mk M xmlsecurity/AllLangResTarget_xsec.mk 100 files changed, 0 insertions(+), 300 deletions(-) diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk index cbab833..d0eb763 100644 --- a/animations/Library_animcore.mk +++ b/animations/Library_animcore.mk @@ -30,9 +30,6 @@ $(eval $(call gb_Library_use_external,animcore,boost_headers)) -$(eval $(call gb_Library_use_packages,animcore,\ -)) - $(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore)) $(eval $(call gb_Library_use_sdk_api,animcore)) diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index 8605b1cc..532cc74 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -11,9 +11,6 @@ $(eval $(call gb_Library_use_external,basegfx,boost_headers)) -$(eval $(call gb_Library_use_packages,basegfx,\ -)) - $(eval $(call gb_Library_use_sdk_api,basegfx)) $(eval $(call gb_Library_use_libraries,basegfx,\ diff --git a/basic/AllLangResTarget_sb.mk b/basic/AllLangResTarget_sb.mk index fffe07b..fa79228 100644 --- a/basic/AllLangResTarget_sb.mk +++ b/basic/AllLangResTarget_sb.mk @@ -26,9 +26,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sb/res)) -$(eval $(call gb_SrsTarget_use_packages,sb/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,sb/res,\ $$(INCLUDE) \ -I$(SRCDIR)/basic/inc \ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index 47e5d2f..47a314e 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -35,9 +35,6 @@ )) ifneq ($(OS),WNT) -$(eval $(call gb_Library_use_packages,officebean,\ -)) - $(eval $(call gb_Library_add_cobjects,officebean,\ bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow \ bean/native/unix/com_sun_star_beans_LocalOfficeWindow \ diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk index 74d5c76..2fde4a1 100644 --- a/canvas/Library_canvasfactory.mk +++ b/canvas/Library_canvasfactory.mk @@ -28,9 +28,6 @@ $(eval $(call gb_Library_Library,canvasfactory)) -$(eval $(call gb_Library_use_package,canvasfactory,\ -)) - $(eval $(call gb_Library_set_componentfile,canvasfactory,canvas/source/factory/canvasfactory)) $(eval $(call gb_Library_set_include,canvasfactory,\ diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index ef8dbfa..2ffe5e2 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,chart2/res)) -$(eval $(call gb_SrsTarget_use_packages,chart2/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,chart2/res,\ $$(INCLUDE) \ -I$(SRCDIR)/chart2/source/controller/dialogs \ diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk index 7eae7d4..a20d4cc 100644 --- a/codemaker/StaticLibrary_codemaker.mk +++ b/codemaker/StaticLibrary_codemaker.mk @@ -29,9 +29,6 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker,boost_headers)) -$(eval $(call gb_StaticLibrary_use_packages,codemaker,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker,\ codemaker/source/codemaker/exceptiontree \ codemaker/source/codemaker/global \ diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk index a69d26c..ea4387d 100644 --- a/codemaker/StaticLibrary_codemaker_cpp.mk +++ b/codemaker/StaticLibrary_codemaker_cpp.mk @@ -29,9 +29,6 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_cpp,boost_headers)) -$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\ codemaker/source/commoncpp/commoncpp \ )) diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk index 5f5ce51..31fda9e 100644 --- a/codemaker/StaticLibrary_codemaker_java.mk +++ b/codemaker/StaticLibrary_codemaker_java.mk @@ -29,9 +29,6 @@ $(eval $(call gb_StaticLibrary_use_external,codemaker_java,boost_headers)) -$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\ codemaker/source/commonjava/commonjava \ )) diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk index 6cf8f26..4c2e77e 100644 --- a/connectivity/CppunitTest_connectivity_commontools.mk +++ b/connectivity/CppunitTest_connectivity_commontools.mk @@ -9,9 +9,6 @@ $(eval $(call gb_CppunitTest_CppunitTest,connectivity_commontools)) -$(eval $(call gb_CppunitTest_use_packages,connectivity_commontools,\ -)) - $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk index fac3f2a..7a5df86 100644 --- a/connectivity/Library_dbtools.mk +++ b/connectivity/Library_dbtools.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,dbtools)) -$(eval $(call gb_Library_use_packages,dbtools,\ -)) - $(eval $(call gb_Library_add_defs,dbtools,\ -DOOO_DLLIMPLEMENTATION_DBTOOLS \ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ diff --git a/connectivity/Library_kabdrv1.mk b/connectivity/Library_kabdrv1.mk index d2dd565..022eaee 100644 --- a/connectivity/Library_kabdrv1.mk +++ b/connectivity/Library_kabdrv1.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,kabdrv1)) -$(eval $(call gb_Library_use_packages,kabdrv1,\ -)) - $(eval $(call gb_Library_use_sdk_api,kabdrv1)) $(eval $(call gb_Library_use_externals,kabdrv1,\ diff --git a/connectivity/Library_tdeab1.mk b/connectivity/Library_tdeab1.mk index 363e1ab..59f2f80 100644 --- a/connectivity/Library_tdeab1.mk +++ b/connectivity/Library_tdeab1.mk @@ -33,9 +33,6 @@ $(eval $(call gb_Library_set_componentfile,tdeab1,connectivity/source/drivers/kab/tdeab1)) -$(eval $(call gb_Library_use_packages,tdeab1,\ -)) - $(eval $(call gb_Library_set_include,tdeab1,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ diff --git a/connectivity/Library_tdeabdrv1.mk b/connectivity/Library_tdeabdrv1.mk index 26a0541..b8786fd 100644 --- a/connectivity/Library_tdeabdrv1.mk +++ b/connectivity/Library_tdeabdrv1.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,tdeabdrv1)) -$(eval $(call gb_Library_use_packages,tdeabdrv1,\ -)) - $(eval $(call gb_Library_set_include,tdeabdrv1,\ -I$(SRCDIR)/connectivity/source/inc \ $$(INCLUDE) \ diff --git a/cosv/StaticLibrary_cosv.mk b/cosv/StaticLibrary_cosv.mk index 7848176..9c2ad6b 100644 --- a/cosv/StaticLibrary_cosv.mk +++ b/cosv/StaticLibrary_cosv.mk @@ -9,9 +9,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cosv)) -$(eval $(call gb_StaticLibrary_use_packages,cosv,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,cosv,\ cosv/source/comphelp/badcast \ cosv/source/service/comdline \ diff --git a/cppuhelper/StaticLibrary_findsofficepath.mk b/cppuhelper/StaticLibrary_findsofficepath.mk index ddb1e5b..080f20b 100644 --- a/cppuhelper/StaticLibrary_findsofficepath.mk +++ b/cppuhelper/StaticLibrary_findsofficepath.mk @@ -9,9 +9,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,findsofficepath)) -$(eval $(call gb_StaticLibrary_use_packages,findsofficepath,\ -)) - $(eval $(call gb_StaticLibrary_add_cobjects,findsofficepath,\ cppuhelper/source/findsofficepath \ )) diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk index 408615d..2285d88 100644 --- a/cui/AllLangResTarget_cui.mk +++ b/cui/AllLangResTarget_cui.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,cui/res)) -$(eval $(call gb_SrsTarget_use_packages,cui/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,cui/res,\ $$(INCLUDE) \ -I$(SRCDIR)/cui/source/inc \ diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk index 347f813..7c58a5b 100644 --- a/dbaccess/AllLangResTarget_dba.mk +++ b/dbaccess/AllLangResTarget_dba.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba)) -$(eval $(call gb_SrsTarget_use_packages,dbaccess/dba,\ -)) - $(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\ $$(INCLUDE) \ -I$(SRCDIR)/dbaccess/source/core/inc \ diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk index bdec00b..5aa3af4 100644 --- a/dbaccess/AllLangResTarget_dbmm.mk +++ b/dbaccess/AllLangResTarget_dbmm.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm)) -$(eval $(call gb_SrsTarget_use_packages,dbaccess/dbmm,\ -)) - $(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\ dbaccess/source/ext/macromigration/macromigration.src \ )) diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk index 9d1d795..814f92e 100644 --- a/dbaccess/AllLangResTarget_sdbt.mk +++ b/dbaccess/AllLangResTarget_sdbt.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt)) -$(eval $(call gb_SrsTarget_use_packages,dbaccess/sdbt,\ -)) - $(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\ $$(INCLUDE) \ -I$(SRCDIR)/dbaccess/source/sdbtools/inc \ diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk index 180e380..d9e82cc 100644 --- a/desktop/AllLangResTarget_deploymentgui.mk +++ b/desktop/AllLangResTarget_deploymentgui.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res)) -$(eval $(call gb_SrsTarget_use_packages,deploymentgui/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk index 0dce925..417af08 100644 --- a/desktop/AllLangResTarget_dkt.mk +++ b/desktop/AllLangResTarget_dkt.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dkt/res)) -$(eval $(call gb_SrsTarget_use_packages,dkt/res,\ -)) - $(eval $(call gb_SrsTarget_add_files,dkt/res,\ desktop/source/app/desktop.src \ )) diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk index a46f74c..946e579 100644 --- a/desktop/Executable_unopkg.com.mk +++ b/desktop/Executable_unopkg.com.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com)) -$(eval $(call gb_Executable_use_packages,unopkg_com,\ -)) - $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO)) $(eval $(call gb_Executable_add_defs,unopkg_com,\ diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk index 142b22e..27611ea 100644 --- a/desktop/Executable_unopkg.mk +++ b/desktop/Executable_unopkg.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Executable_Executable,unopkg)) -$(eval $(call gb_Executable_use_packages,unopkg,\ -)) - $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES)) $(eval $(call gb_Executable_use_static_libraries,unopkg,\ diff --git a/desktop/Library_libreoffice.mk b/desktop/Library_libreoffice.mk index 6b42adf..dbe3e81 100644 --- a/desktop/Library_libreoffice.mk +++ b/desktop/Library_libreoffice.mk @@ -9,9 +9,6 @@ $(eval $(call gb_Library_Library,libreoffice)) -$(eval $(call gb_Library_use_packages,libreoffice,\ -)) - $(eval $(call gb_Library_set_include,libreoffice,\ $$(INCLUDE) \ -I$(SRCDIR)/desktop/inc \ diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk index 61b333e..aad9e80 100644 --- a/desktop/StaticLibrary_winextendloaderenv.mk +++ b/desktop/StaticLibrary_winextendloaderenv.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,winextendloaderenv)) -$(eval $(call gb_StaticLibrary_use_packages,winextendloaderenv,\ -)) - $(eval $(call gb_StaticLibrary_add_noexception_objects,winextendloaderenv,\ desktop/win32/source/extendloaderenvironment \ )) diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index f845362..0200799 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -28,9 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) -$(eval $(call gb_StaticLibrary_use_packages,dtobj,\ -)) - $(eval $(call gb_StaticLibrary_use_sdk_api,dtobj)) $(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\ diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk index c1850b0..881579c 100644 --- a/editeng/AllLangResTarget_editeng.mk +++ b/editeng/AllLangResTarget_editeng.mk @@ -24,9 +24,6 @@ $(eval $(call gb_AllLangResTarget_add_srs,editeng, editeng/res)) $(eval $(call gb_SrsTarget_SrsTarget,editeng/res)) -$(eval $(call gb_SrsTarget_use_packages,editeng/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,editeng/res,\ $$(INCLUDE) \ -I$(SRCDIR)/editeng/inc \ diff --git a/embeddedobj/Library_embobj.mk b/embeddedobj/Library_embobj.mk index c0af8b1..b9ecdd3 100644 --- a/embeddedobj/Library_embobj.mk +++ b/embeddedobj/Library_embobj.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,embobj)) -$(eval $(call gb_Library_use_packages,embobj,\ -)) - $(eval $(call gb_Library_set_componentfile,embobj,embeddedobj/util/embobj)) $(eval $(call gb_Library_set_include,embobj,\ diff --git a/embedserv/Library_inprocserv.mk b/embedserv/Library_inprocserv.mk index a042994..3c1bf0d 100644 --- a/embedserv/Library_inprocserv.mk +++ b/embedserv/Library_inprocserv.mk @@ -42,9 +42,6 @@ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_packages,inprocserv,\ -)) - ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,inprocserv,\ /EXPORT:DllCanUnloadNow \ diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk index 541764f..4fcd845 100644 --- a/extensions/AllLangResTarget_abp.mk +++ b/extensions/AllLangResTarget_abp.mk @@ -36,9 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,abp/res)) -$(eval $(call gb_SrsTarget_use_packages,abp/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,abp/res,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/inc \ diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk index 1c1aa18..b30b17a 100644 --- a/extensions/AllLangResTarget_bib.mk +++ b/extensions/AllLangResTarget_bib.mk @@ -34,9 +34,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,bib/res)) -$(eval $(call gb_SrsTarget_use_packages,bib/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,bib/res,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/inc \ diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk index 5de43a2..a9a6e72 100644 --- a/extensions/AllLangResTarget_dbp.mk +++ b/extensions/AllLangResTarget_dbp.mk @@ -34,9 +34,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,dbp/res)) -$(eval $(call gb_SrsTarget_use_packages,dbp/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,dbp/res,\ $$(INCLUDE) \ -I$(SRCDIR)/extensions/inc \ diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index 5d5b7f2..fe9954e 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -30,9 +30,6 @@ $(eval $(call gb_Executable_Executable,nsplugin)) -$(eval $(call gb_Executable_use_packages,nsplugin,\ -)) - $(eval $(call gb_Executable_use_external,nsplugin,boost_headers)) $(eval $(call gb_Executable_use_sdk_api,nsplugin)) diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index 979d14c..0db9d5c 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -30,9 +30,6 @@ $(eval $(call gb_Library_Library,bib)) -$(eval $(call gb_Library_use_packages,bib,\ -)) - $(eval $(call gb_Library_set_componentfile,bib,extensions/source/bibliography/bib)) $(eval $(call gb_Library_set_include,bib,\ diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index 77ed1dd..5465846 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -30,9 +30,6 @@ $(eval $(call gb_Library_Library,log)) -$(eval $(call gb_Library_use_packages,log,\ -)) - $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) $(eval $(call gb_Library_use_external,log,boost_headers)) diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk index 1a41f26..2ac4b27 100644 --- a/extensions/Library_updatecheckui.mk +++ b/extensions/Library_updatecheckui.mk @@ -30,9 +30,6 @@ $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk)) -$(eval $(call gb_Library_use_packages,updatecheckui,\ -)) - $(eval $(call gb_Library_use_external,updatecheckui,boost_headers)) $(eval $(call gb_Library_use_sdk_api,updatecheckui)) diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index 3d8a013..2394731 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -36,9 +36,6 @@ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_use_packages,updchk,\ -)) - $(eval $(call gb_Library_use_sdk_api,updchk)) $(eval $(call gb_Library_use_libraries,updchk,\ diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk index bc9e8e6..41d1aa4 100644 --- a/extensions/StaticLibrary_npsoenv.mk +++ b/extensions/StaticLibrary_npsoenv.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,npsoenv)) -$(eval $(call gb_StaticLibrary_use_packages,npsoenv,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\ extensions/source/nsplugin/source/so_env \ )) diff --git a/filter/AllLangResTarget_pdffilter.mk b/filter/AllLangResTarget_pdffilter.mk index c92b9a9..fddc6ff 100644 --- a/filter/AllLangResTarget_pdffilter.mk +++ b/filter/AllLangResTarget_pdffilter.mk @@ -27,9 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,filter/pdffilter)) -$(eval $(call gb_SrsTarget_use_packages,filter/pdffilter,\ -)) - $(eval $(call gb_SrsTarget_set_include,filter/pdffilter,\ $$(INCLUDE) \ -I$(SRCDIR)/filter/inc \ diff --git a/filter/AllLangResTarget_xsltdlg.mk b/filter/AllLangResTarget_xsltdlg.mk index e4f5440..d90401e 100644 --- a/filter/AllLangResTarget_xsltdlg.mk +++ b/filter/AllLangResTarget_xsltdlg.mk @@ -24,9 +24,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,filter/xsltdlg)) -$(eval $(call gb_SrsTarget_use_packages,filter/xsltdlg,\ -)) - $(eval $(call gb_SrsTarget_set_include,filter/xsltdlg,\ $$(INCLUDE) \ -I$(SRCDIR)/filter/inc \ diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk index 862ba9a..29c1278 100644 --- a/forms/AllLangResTarget_frm.mk +++ b/forms/AllLangResTarget_frm.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,frm/res)) -$(eval $(call gb_SrsTarget_use_packages,frm/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,frm/res,\ $$(INCLUDE) \ -I$(SRCDIR)/forms/source/inc \ diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk index 6d81d2e..7eb72e37 100644 --- a/formula/AllLangResTarget_for.mk +++ b/formula/AllLangResTarget_for.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/res)) -$(eval $(call gb_SrsTarget_use_packages,formula/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,formula/res,\ $$(INCLUDE) \ -I$(SRCDIR)/formula/source/core/inc \ diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk index a8c6687..d6e95d2 100644 --- a/formula/AllLangResTarget_forui.mk +++ b/formula/AllLangResTarget_forui.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,formula/ui)) -$(eval $(call gb_SrsTarget_use_packages,formula/ui,\ -)) - $(eval $(call gb_SrsTarget_set_include,formula/ui,\ $$(INCLUDE) \ -I$(SRCDIR)/formula/inc \ diff --git a/formula/Library_for.mk b/formula/Library_for.mk index aa6f358..3e13c37 100644 --- a/formula/Library_for.mk +++ b/formula/Library_for.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,for)) -$(eval $(call gb_Library_use_package,for,\ -)) - $(eval $(call gb_Library_set_include,for,\ $$(INCLUDE) \ -I$(SRCDIR)/formula/source/core/inc \ diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk index 5df6411..b799e21 100644 --- a/fpicker/AllLangResTarget_fps_office.mk +++ b/fpicker/AllLangResTarget_fps_office.mk @@ -35,9 +35,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,fps_office/res)) -$(eval $(call gb_SrsTarget_use_packages,fps_office/res,\ -)) - $(eval $(call gb_SrsTarget_add_files,fps_office/res,\ fpicker/source/office/OfficeFilePicker.src \ fpicker/source/office/iodlg.src \ diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk index de25649..52e925e 100644 --- a/fpicker/Library_fps.mk +++ b/fpicker/Library_fps.mk @@ -31,9 +31,6 @@ $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps)) -$(eval $(call gb_Library_use_packages,fps,\ -)) - $(eval $(call gb_Library_use_external,fps,boost_headers)) $(eval $(call gb_Library_use_sdk_api,fps)) diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk index b8b98e2..2c2ca35 100644 --- a/fpicker/Library_fps_aqua.mk +++ b/fpicker/Library_fps_aqua.mk @@ -29,9 +29,6 @@ $(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua)) -$(eval $(call gb_Library_use_packages,fps_aqua,\ -)) - $(eval $(call gb_Library_use_external,fps_aqua,boost_headers)) $(eval $(call gb_Library_use_sdk_api,fps_aqua)) diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk index 4e6105e..b3a601b 100644 --- a/framework/AllLangResTarget_fwe.mk +++ b/framework/AllLangResTarget_fwe.mk @@ -41,9 +41,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,fwe/fwk_services)) -$(eval $(call gb_SrsTarget_use_packages,fwe/fwk_services,\ -)) - $(eval $(call gb_SrsTarget_set_include,fwe/fwk_services,\ $$(INCLUDE) \ -I$(SRCDIR)/framework/inc \ diff --git a/i18nlangtag/Library_i18nlangtag.mk b/i18nlangtag/Library_i18nlangtag.mk index 43f2696..5d357d3 100644 --- a/i18nlangtag/Library_i18nlangtag.mk +++ b/i18nlangtag/Library_i18nlangtag.mk @@ -28,9 +28,6 @@ $(eval $(call gb_Library_Library,i18nlangtag)) -$(eval $(call gb_Library_use_packages,i18nlangtag,\ -)) - $(eval $(call gb_Library_set_include,i18nlangtag,\ -I$(SRCDIR)/i18nlangtag/inc \ $$(INCLUDE) \ diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 02ac5a9..2c551fb 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -39,9 +39,6 @@ jurt/source/pipe/wrapper/wrapper \ )) -$(eval $(call gb_Library_use_packages,jpipe,\ -)) - else $(eval $(call gb_Library_use_libraries,jpipe,\ diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk index ee37a82..842e393 100644 --- a/jvmaccess/Library_jvmaccess.mk +++ b/jvmaccess/Library_jvmaccess.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,jvmaccess)) -$(eval $(call gb_Library_use_package,jvmaccess,\ -)) - $(eval $(call gb_Library_add_defs,jvmaccess,\ -DJVMACCESS_DLLIMPLEMENTATION \ )) diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 3533f11..8c1cf27 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,jvmfwk)) -$(eval $(call gb_Library_use_package,jvmfwk,\ -)) - $(eval $(call gb_Library_add_defs,jvmfwk,\ -DJVMFWK_DLLIMPLEMENTATION \ )) diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index 1f97ab2..d9a6222 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -41,9 +41,6 @@ udkapi \ )) -$(eval $(call gb_Library_use_package,sunjavaplugin,\ -)) - $(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppu \ cppuhelper \ diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index d251f02..9967862 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,transex)) -$(eval $(call gb_StaticLibrary_use_packages,transex,\ -)) - $(eval $(call gb_StaticLibrary_set_include,transex,\ -I$(SRCDIR)/l10ntools/inc \ $$(INCLUDE) \ diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk index 2e17b6a..4a369c6 100644 --- a/lingucomponent/StaticLibrary_ulingu.mk +++ b/lingucomponent/StaticLibrary_ulingu.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ulingu)) -$(eval $(call gb_StaticLibrary_use_packages,ulingu,\ -)) - $(eval $(call gb_StaticLibrary_use_api,ulingu,\ udkapi \ offapi \ diff --git a/mysqlcppconn/Library_mysqlcppconn.mk b/mysqlcppconn/Library_mysqlcppconn.mk index d35f8c1..8555ab2 100644 --- a/mysqlcppconn/Library_mysqlcppconn.mk +++ b/mysqlcppconn/Library_mysqlcppconn.mk @@ -11,9 +11,6 @@ $(eval $(call gb_Library_use_unpacked,mysqlcppconn,mysqlcppconn)) -$(eval $(call gb_Library_use_packages,mysqlcppconn,\ -)) - $(eval $(call gb_Library_use_externals,mysqlcppconn, \ mysql \ boost_headers \ diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk index f365ca9..ad8db18 100644 --- a/np_sdk/StaticLibrary_nputils.mk +++ b/np_sdk/StaticLibrary_nputils.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,nputils)) -$(eval $(call gb_StaticLibrary_use_packages,nputils,\ -)) - $(eval $(call gb_StaticLibrary_use_externals,nputils,\ npapi_headers \ )) diff --git a/odk/Executable_unoapploader.mk b/odk/Executable_unoapploader.mk index 709b118..3128a3b 100644 --- a/odk/Executable_unoapploader.mk +++ b/odk/Executable_unoapploader.mk @@ -9,9 +9,6 @@ $(eval $(call gb_Executable_Executable,unoapploader)) -$(eval $(call gb_Executable_use_packages,unoapploader,\ -)) - $(eval $(call gb_Executable_use_static_libraries,unoapploader,\ findsofficepath \ )) diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk index 18f1875..911beef 100644 --- a/pyuno/Library_pyuno_wrapper.mk +++ b/pyuno/Library_pyuno_wrapper.mk @@ -26,9 +26,6 @@ $(eval $(call gb_Library_Library,pyuno_wrapper)) -$(eval $(call gb_Library_use_packages,pyuno_wrapper,\ -)) - $(eval $(call gb_Library_set_include,pyuno_wrapper,\ -I$(SRCDIR)/pyuno/source/module \ -I$(SRCDIR)/pyuno/inc \ diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk index 52a77bc4..bb4afed 100644 --- a/registry/Library_reg.mk +++ b/registry/Library_reg.mk @@ -26,9 +26,6 @@ $(eval $(call gb_Library_Library,reg)) -$(eval $(call gb_Library_use_packages,reg,\ -)) - $(eval $(call gb_Library_add_defs,reg,\ $(LFS_CFLAGS) \ -DREG_DLLIMPLEMENTATION \ diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk index ffcc5ff..a7d4671 100644 --- a/registry/StaticLibrary_registry_helper.mk +++ b/registry/StaticLibrary_registry_helper.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,registry_helper)) -$(eval $(call gb_StaticLibrary_use_packages,registry_helper,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,registry_helper,\ registry/tools/fileurl \ registry/tools/options \ diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 100fa78..02db1d1 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -31,9 +31,6 @@ $(eval $(call gb_Library_set_precompiled_header,sal,$(SRCDIR)/sal/inc/pch/precompiled_sal)) -$(eval $(call gb_Library_use_packages,sal,\ -)) - $(eval $(call gb_Library_set_include,sal,\ $$(INCLUDE) \ -I$(SRCDIR)/sal/inc \ diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk index 1d6f2ac..f62e043 100644 --- a/sal/Library_uwinapi.mk +++ b/sal/Library_uwinapi.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,uwinapi)) -$(eval $(call gb_Library_use_packages,uwinapi,\ -)) - $(eval $(call gb_Library_use_system_win32_libs,uwinapi,\ $(if $(filter $(COM),MSC), \ kernel32 \ diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk index 475139c..296f064 100644 --- a/sal/StaticLibrary_salcpprt.mk +++ b/sal/StaticLibrary_salcpprt.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt)) -$(eval $(call gb_StaticLibrary_use_packages,salcpprt,\ -)) - $(eval $(call gb_StaticLibrary_add_defs,salcpprt, \ $(LFS_CFLAGS) \ )) diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk index 07c3b72..ebb314c 100644 --- a/sax/Library_sax.mk +++ b/sax/Library_sax.mk @@ -9,9 +9,6 @@ $(eval $(call gb_Library_Library,sax)) -$(eval $(call gb_Library_use_package,sax,\ -)) - $(eval $(call gb_Library_set_include,sax,\ -I$(SRCDIR)/sax/inc \ $$(INCLUDE) \ diff --git a/sax/StaticLibrary_sax_shared.mk b/sax/StaticLibrary_sax_shared.mk index 0c49ab6..cdbc3c8 100644 --- a/sax/StaticLibrary_sax_shared.mk +++ b/sax/StaticLibrary_sax_shared.mk @@ -9,9 +9,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,sax_shared)) -$(eval $(call gb_StaticLibrary_use_packages,sax_shared,\ -)) - $(eval $(call gb_StaticLibrary_set_include,sax_shared,\ -I$(SRCDIR)/sax/inc \ $$(INCLUDE) \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index a39fd3e..d198155 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -42,9 +42,6 @@ -DSC_INFO_OSVERSION=\"$(OS)\" \ )) -$(eval $(call gb_Library_use_packages,sc,\ -)) - $(eval $(call gb_Library_use_sdk_api,sc)) $(eval $(call gb_Library_use_externals,sc,\ diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk index 56d820c..32c108e 100644 --- a/sdext/Executable_xpdfimport.mk +++ b/sdext/Executable_xpdfimport.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Executable_Executable,xpdfimport)) -$(eval $(call gb_Executable_use_packages,xpdfimport,\ -)) - $(eval $(call gb_Executable_use_externals,xpdfimport,\ boost_headers \ poppler \ diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk index 2545bcc..48ecfb0 100644 --- a/sdext/StaticLibrary_pdfimport_s.mk +++ b/sdext/StaticLibrary_pdfimport_s.mk @@ -27,9 +27,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,pdfimport_s)) -$(eval $(call gb_StaticLibrary_use_packages,pdfimport_s,\ -)) - $(eval $(call gb_StaticLibrary_use_api,pdfimport_s,\ offapi \ udkapi \ diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index d8fdfe6..596bf98 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -27,9 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) -$(eval $(call gb_SrsTarget_use_packages,sfx/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,sfx/res,\ $$(INCLUDE) \ -I$(SRCDIR)/sfx2/source/dialog \ diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk index a9ac974..07b38ca 100644 --- a/shell/Library_kdebe.mk +++ b/shell/Library_kdebe.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,kdebe1)) -$(eval $(call gb_Library_use_packages,kdebe1,\ -)) - $(eval $(call gb_Library_add_libs,kdebe1,\ -lkio \ )) diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk index f95a4af..25ac9f4 100644 --- a/shell/Library_tdebe.mk +++ b/shell/Library_tdebe.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,tdebe1)) -$(eval $(call gb_Library_use_packages,tdebe1,\ -)) - $(eval $(call gb_Library_use_sdk_api,tdebe1)) $(eval $(call gb_Library_use_externals,tdebe1,\ diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk index 00be62e..0d78a88 100644 --- a/slideshow/Library_slideshow.mk +++ b/slideshow/Library_slideshow.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,slideshow)) -$(eval $(call gb_Library_use_packages,slideshow,\ -)) - $(eval $(call gb_Library_set_include,slideshow,\ $$(INCLUDE) \ -I$(SRCDIR)/slideshow/source/inc \ diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk index 8288aa7..9828438 100644 --- a/starmath/Library_smd.mk +++ b/starmath/Library_smd.mk @@ -22,9 +22,6 @@ $(eval $(call gb_Library_Library,smd)) -$(eval $(call gb_Library_use_packages,smd,\ -)) - $(eval $(call gb_Library_set_componentfile,smd,starmath/util/smd)) $(eval $(call gb_Library_set_include,smd,\ diff --git a/store/Library_store.mk b/store/Library_store.mk index 3017216..94f136c 100644 --- a/store/Library_store.mk +++ b/store/Library_store.mk @@ -28,9 +28,6 @@ $(eval $(call gb_Library_use_external,store,boost_headers)) -$(eval $(call gb_Library_use_packages,store,\ -)) - $(eval $(call gb_Library_add_defs,store,\ $(LFS_CFLAGS) \ -DSTORE_DLLIMPLEMENTATION \ diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk index c76ed01..edb9041 100644 --- a/svl/AllLangResTarget_svl.mk +++ b/svl/AllLangResTarget_svl.mk @@ -25,9 +25,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svl/res)) -$(eval $(call gb_SrsTarget_use_packages,svl/res,\ -)) - $(eval $(call gb_SrsTarget_add_files,svl/res,\ svl/source/misc/mediatyp.src \ svl/source/items/cstitem.src \ diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index ce4aa97..5717dba 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.mk @@ -30,9 +30,6 @@ $(eval $(call gb_Library_use_external,svl,boost_headers)) -$(eval $(call gb_Library_use_packages,svl,\ -)) - $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index edaeef6..24d4df1 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -27,9 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svt/res)) -$(eval $(call gb_SrsTarget_use_packages,svt/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,svt/res,\ $$(INCLUDE) \ -I$(SRCDIR)/svtools/source/inc \ diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk index 5851581..6b98d1c 100644 --- a/svx/AllLangResTarget_gal.mk +++ b/svx/AllLangResTarget_gal.mk @@ -25,9 +25,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/gal)) -$(eval $(call gb_SrsTarget_use_packages,svx/gal,\ -)) - $(eval $(call gb_SrsTarget_set_include,svx/gal,\ $$(INCLUDE) \ -I$(SRCDIR)/svx/source/gallery2 \ diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk index 4003a67..ea925ae 100644 --- a/svx/AllLangResTarget_ofa.mk +++ b/svx/AllLangResTarget_ofa.mk @@ -25,9 +25,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/ofa)) -$(eval $(call gb_SrsTarget_use_packages,svx/ofa,\ -)) - $(eval $(call gb_SrsTarget_add_files,svx/ofa,\ svx/source/src/errtxt.src \ svx/source/src/app.src \ diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index 1c1cadc..6042b52 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -27,9 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res)) -$(eval $(call gb_SrsTarget_use_packages,svx/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,svx/res,\ $$(INCLUDE) \ -I$(call gb_SrsTemplateTarget_get_include_dir,svx) \ diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk index d3b8ad8..2cfce3e 100644 --- a/svx/AllLangResTarget_textconversiondlgs.mk +++ b/svx/AllLangResTarget_textconversiondlgs.mk @@ -27,9 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs)) -$(eval $(call gb_SrsTarget_use_packages,svx/textconversiondlgs,\ -)) - $(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\ svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src \ )) diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk index 5fd91aa..6b4a4b3 100644 --- a/svx/Library_textconversiondlgs.mk +++ b/svx/Library_textconversiondlgs.mk @@ -19,9 +19,6 @@ $(eval $(call gb_Library_Library,textconversiondlgs)) -$(eval $(call gb_Library_use_packages,textconversiondlgs,\ -)) - $(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs)) $(eval $(call gb_Library_set_include,textconversiondlgs,\ diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index f9fd27b..4fab3fc 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -74,9 +74,6 @@ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_use_packages,sw,\ -)) - $(eval $(call gb_Library_use_externals,sw,\ boost_headers \ icuuc \ diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk index ece6680..30f8d35 100644 --- a/testtools/StaticLibrary_bridgetest.mk +++ b/testtools/StaticLibrary_bridgetest.mk @@ -29,9 +29,6 @@ $(eval $(call gb_StaticLibrary_use_external,testtools_bridgetest_s,boost_headers)) -$(eval $(call gb_StaticLibrary_use_packages,testtools_bridgetest_s,\ -)) - $(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\ bridgetest \ )) diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk index 4a14ddf..1891c54 100644 --- a/tools/StaticLibrary_ooopathutils.mk +++ b/tools/StaticLibrary_ooopathutils.mk @@ -19,9 +19,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils)) -$(eval $(call gb_StaticLibrary_use_packages,ooopathutils,\ -)) - $(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\ tools/source/misc/pathutils \ )) diff --git a/ucb/Library_srtrs1.mk b/ucb/Library_srtrs1.mk index b073620..e607258 100644 --- a/ucb/Library_srtrs1.mk +++ b/ucb/Library_srtrs1.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,srtrs1)) -$(eval $(call gb_Library_use_packages,srtrs1,\ -)) - $(eval $(call gb_Library_set_componentfile,srtrs1,ucb/source/sorter/srtrs1)) $(eval $(call gb_Library_use_sdk_api,srtrs1)) diff --git a/ucb/Library_ucpext.mk b/ucb/Library_ucpext.mk index 71fe40f..e520231 100644 --- a/ucb/Library_ucpext.mk +++ b/ucb/Library_ucpext.mk @@ -27,9 +27,6 @@ $(eval $(call gb_Library_Library,ucpext)) -$(eval $(call gb_Library_use_packages,ucpext,\ -)) - $(eval $(call gb_Library_set_componentfile,ucpext,ucb/source/ucp/ext/ucpext)) $(eval $(call gb_Library_use_external,ucpext,boost_headers)) diff --git a/udm/StaticLibrary_udm.mk b/udm/StaticLibrary_udm.mk index d8eac68..aee8897 100644 --- a/udm/StaticLibrary_udm.mk +++ b/udm/StaticLibrary_udm.mk @@ -9,9 +9,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,udm)) -$(eval $(call gb_StaticLibrary_use_packages,udm,\ -)) - $(eval $(call gb_StaticLibrary_set_include,udm,\ -I$(SRCDIR)/udm/source/inc \ $$(INCLUDE) \ diff --git a/uui/AllLangResTarget_uui.mk b/uui/AllLangResTarget_uui.mk index d1189bb..67d4d57 100644 --- a/uui/AllLangResTarget_uui.mk +++ b/uui/AllLangResTarget_uui.mk @@ -34,9 +34,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,uui/res)) -$(eval $(call gb_SrsTarget_use_packages,uui/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,uui/res,\ -I$(SRCDIR)/uui/source \ $$(INCLUDE) \ diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk index 40411cc..5304b75 100644 --- a/vcl/AllLangResTarget_vcl.mk +++ b/vcl/AllLangResTarget_vcl.mk @@ -27,9 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src)) -$(eval $(call gb_SrsTarget_use_packages,vcl/source/src,\ -)) - $(eval $(call gb_SrsTarget_set_include,vcl/source/src,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index df09fcc..35787bc 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -341,9 +341,6 @@ endif -$(eval $(call gb_Library_use_packages,vcl,\ -)) - vcl_quartz_code= \ vcl/quartz/salbmp \ vcl/quartz/utils \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index 844129f..6d962dd 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -19,9 +19,6 @@ $(eval $(call gb_Library_Library,vclplug_kde)) -$(eval $(call gb_Library_use_packages,vclplug_kde,\ -)) - $(eval $(call gb_Library_set_include,vclplug_kde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk index e2a3d28..4b1954f 100644 --- a/vcl/Library_vclplug_tde.mk +++ b/vcl/Library_vclplug_tde.mk @@ -26,9 +26,6 @@ $(eval $(call gb_Library_Library,vclplug_tde)) -$(eval $(call gb_Library_use_packages,vclplug_tde,\ -)) - $(eval $(call gb_Library_set_include,vclplug_tde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ diff --git a/vcl/StaticLibrary_headless.mk b/vcl/StaticLibrary_headless.mk index b8cdcd0..43dfac8 100644 --- a/vcl/StaticLibrary_headless.mk +++ b/vcl/StaticLibrary_headless.mk @@ -28,9 +28,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,headless)) -$(eval $(call gb_StaticLibrary_use_packages,headless,\ -)) - $(eval $(call gb_StaticLibrary_use_external,headless,boost_headers)) $(eval $(call gb_StaticLibrary_use_api,headless,\ diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk index 1c7791d..dd7b27d 100644 --- a/vcl/StaticLibrary_vclmain.mk +++ b/vcl/StaticLibrary_vclmain.mk @@ -19,9 +19,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain)) -$(eval $(call gb_StaticLibrary_use_packages,vclmain,\ -)) - ifeq ($(OS),IOS) $(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\ $(gb_OBJCXXFLAGS) \ diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk index 50b83b1..a936e4e 100644 --- a/writerperfect/StaticLibrary_writerperfect.mk +++ b/writerperfect/StaticLibrary_writerperfect.mk @@ -19,9 +19,6 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,writerperfect)) -$(eval $(call gb_StaticLibrary_use_packages,writerperfect,\ -)) - $(eval $(call gb_StaticLibrary_set_include,writerperfect,\ $$(INCLUDE) \ -I$(SRCDIR)/writerperfect/source \ diff --git a/xmlscript/Library_xmlscript.mk b/xmlscript/Library_xmlscript.mk index c625594..869109a 100644 --- a/xmlscript/Library_xmlscript.mk +++ b/xmlscript/Library_xmlscript.mk @@ -11,9 +11,6 @@ $(eval $(call gb_Library_use_external,xmlscript,boost_headers)) -$(eval $(call gb_Library_use_packages,xmlscript,\ -)) - $(eval $(call gb_Library_set_componentfile,xmlscript,xmlscript/util/xmlscript)) $(eval $(call gb_Library_use_sdk_api,xmlscript)) diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk index 4ce1595..7a67556 100644 --- a/xmlsecurity/AllLangResTarget_xsec.mk +++ b/xmlsecurity/AllLangResTarget_xsec.mk @@ -36,9 +36,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,xmlsec/res)) -$(eval $(call gb_SrsTarget_use_packages,xmlsec/res,\ -)) - $(eval $(call gb_SrsTarget_set_include,xmlsec/res,\ $$(INCLUDE) \ -I$(SRCDIR)/xmlsecurity/inc \ -- To view, visit https://gerrit.libreoffice.org/3503 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8e9f70eb5d929c98b4379416c2259a74e31d587f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Tardon <dtar...@redhat.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice