diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /extensions | |
parent | a16060116346533923c607bd406d3fea511b41ec (diff) |
gbuild: "use" vs. "add":
Naming convention for gbuild methods:
- "add" is used for stuff that is logically a part of the target
(i.e. not registered at the Module, but defined in the target's makefile)
- "use" is used for stuff that is logically a different target
(i.e. it is registered at the Module, has it's own makefile, may be
in a different module than the target)
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/CppunitTest_extensions_test_update.mk | 10 | ||||
-rw-r--r-- | extensions/Executable_nsplugin.mk | 10 | ||||
-rw-r--r-- | extensions/Executable_pluginapp.bin.mk | 8 | ||||
-rw-r--r-- | extensions/Library_abp.mk | 4 | ||||
-rw-r--r-- | extensions/Library_bib.mk | 4 | ||||
-rw-r--r-- | extensions/Library_dbp.mk | 4 | ||||
-rw-r--r-- | extensions/Library_ldapbe2.mk | 4 | ||||
-rw-r--r-- | extensions/Library_log.mk | 4 | ||||
-rw-r--r-- | extensions/Library_npsoplugin.mk | 6 | ||||
-rw-r--r-- | extensions/Library_oleautobridge.mk | 4 | ||||
-rw-r--r-- | extensions/Library_oleautobridge2.mk | 4 | ||||
-rw-r--r-- | extensions/Library_pcr.mk | 4 | ||||
-rw-r--r-- | extensions/Library_pl.mk | 10 | ||||
-rw-r--r-- | extensions/Library_res.mk | 4 | ||||
-rw-r--r-- | extensions/Library_scn.mk | 6 | ||||
-rw-r--r-- | extensions/Library_so_activex.mk | 6 | ||||
-rw-r--r-- | extensions/Library_so_activex_x64.mk | 6 | ||||
-rw-r--r-- | extensions/Library_updatecheckui.mk | 4 | ||||
-rw-r--r-- | extensions/Library_updatefeed.mk | 4 | ||||
-rw-r--r-- | extensions/Library_updchk.mk | 6 | ||||
-rw-r--r-- | extensions/StaticLibrary_plugcon.mk | 4 |
21 files changed, 58 insertions, 58 deletions
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index ba0b7b9f8f85..265d9323d4b7 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -32,7 +32,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,extensions_test_update, \ extensions/qa/update/test_update \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ +$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \ updchk \ cppu \ cppuhelper \ @@ -43,7 +43,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update, \ )) ifeq ($(OS),WNT) -$(eval $(call gb_CppunitTest_add_linked_libs,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_libraries,extensions_test_update,\ shell32 \ ole32 \ )) @@ -56,18 +56,18 @@ $(eval $(call gb_CppunitTest_set_include,extensions_test_update,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_CppunitTest_add_api,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_api,extensions_test_update,\ offapi \ udkapi \ )) $(eval $(call gb_CppunitTest_uses_ure,extensions_test_update)) -$(eval $(call gb_CppunitTest_add_type_rdbs,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_type_rdbs,extensions_test_update,\ types \ )) -$(eval $(call gb_CppunitTest_add_components,extensions_test_update,\ +$(eval $(call gb_CppunitTest_use_components,extensions_test_update,\ configmgr/source/configmgr \ extensions/source/update/feed/updatefeed \ ucb/source/core/ucb1 \ diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk index c04e2ed19595..157842ec0e0f 100644 --- a/extensions/Executable_nsplugin.mk +++ b/extensions/Executable_nsplugin.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Executable_Executable,nsplugin)) -$(eval $(call gb_Executable_add_api,nsplugin,\ +$(eval $(call gb_Executable_use_api,nsplugin,\ offapi \ udkapi \ )) @@ -41,11 +41,11 @@ $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/so_main \ )) -$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\ +$(eval $(call gb_Executable_use_static_libraries,nsplugin,\ npsoenv \ )) -$(eval $(call gb_Executable_add_linked_libs,nsplugin,\ +$(eval $(call gb_Executable_use_libraries,nsplugin,\ cppu \ cppuhelper \ sal \ @@ -63,11 +63,11 @@ $(eval $(call gb_Executable_add_exception_objects,nsplugin,\ extensions/source/nsplugin/source/nsp_windows \ )) -$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\ +$(eval $(call gb_Executable_use_static_libraries,nsplugin,\ ooopathutils \ )) -$(eval $(call gb_Executable_add_linked_libs,nsplugin,\ +$(eval $(call gb_Executable_use_libraries,nsplugin,\ ws2_32 \ shell32 \ ole32 \ diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk index 52081072f4e1..4fd84f0f8cc3 100644 --- a/extensions/Executable_pluginapp.bin.mk +++ b/extensions/Executable_pluginapp.bin.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Executable_Executable,pluginapp.bin)) -$(eval $(call gb_Executable_add_external_headers,pluginapp.bin,np_sdk_inc)) +$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc)) $(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers)) @@ -39,7 +39,7 @@ $(eval $(call gb_Executable_set_include,pluginapp.bin,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_Executable_add_api,pluginapp.bin,\ +$(eval $(call gb_Executable_use_api,pluginapp.bin,\ offapi \ udkapi \ )) @@ -49,11 +49,11 @@ $(eval $(call gb_Executable_add_exception_objects,pluginapp.bin,\ extensions/source/plugin/unx/npnapi \ )) -$(eval $(call gb_Executable_add_linked_static_libs,pluginapp.bin,\ +$(eval $(call gb_Executable_use_static_libraries,pluginapp.bin,\ plugcon \ )) -$(eval $(call gb_Executable_add_linked_libs,pluginapp.bin,\ +$(eval $(call gb_Executable_use_libraries,pluginapp.bin,\ sal \ )) diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk index b751e077cab0..d327c0769c26 100644 --- a/extensions/Library_abp.mk +++ b/extensions/Library_abp.mk @@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_defs,abp,\ -DCOMPMOD_RESPREFIX=abp \ )) -$(eval $(call gb_Library_add_api,abp,\ +$(eval $(call gb_Library_use_api,abp,\ offapi \ udkapi \ )) @@ -72,7 +72,7 @@ $(eval $(call gb_Library_add_exception_objects,abp,\ extensions/source/abpilot/unodialogabp \ )) -$(eval $(call gb_Library_add_linked_libs,abp,\ +$(eval $(call gb_Library_use_libraries,abp,\ comphelper \ cppuhelper \ cppu \ diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk index ef1d30435b46..e31a42984562 100644 --- a/extensions/Library_bib.mk +++ b/extensions/Library_bib.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,bib,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_add_api,bib,\ +$(eval $(call gb_Library_use_api,bib,\ offapi \ udkapi \ )) @@ -57,7 +57,7 @@ $(eval $(call gb_Library_add_exception_objects,bib,\ extensions/source/bibliography/toolbar \ )) -$(eval $(call gb_Library_add_linked_libs,bib,\ +$(eval $(call gb_Library_use_libraries,bib,\ dbtools \ sot \ svt \ diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk index 8fb95f445b09..988464dd8d90 100644 --- a/extensions/Library_dbp.mk +++ b/extensions/Library_dbp.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,dbp,\ -DCOMPMOD_NAMESPACE=dbp \ )) -$(eval $(call gb_Library_add_api,dbp,\ +$(eval $(call gb_Library_use_api,dbp,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_exception_objects,dbp,\ extensions/source/dbpilots/wizardservices \ )) -$(eval $(call gb_Library_add_linked_libs,dbp,\ +$(eval $(call gb_Library_use_libraries,dbp,\ svt \ vcl \ tl \ diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 6f676196452c..37442a80b257 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,ldapbe2)) $(eval $(call gb_Library_set_componentfile,ldapbe2,extensions/source/config/ldap/ldapbe2)) -$(eval $(call gb_Library_add_api,ldapbe2,\ +$(eval $(call gb_Library_use_api,ldapbe2,\ offapi \ udkapi \ )) @@ -64,7 +64,7 @@ $(eval $(call gb_Library_add_exception_objects,ldapbe2,\ extensions/source/config/ldap/ldapuserprofilebe \ )) -$(eval $(call gb_Library_add_linked_libs,ldapbe2,\ +$(eval $(call gb_Library_use_libraries,ldapbe2,\ cppuhelper \ cppu \ salhelper \ diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk index ce821be0b41e..247deb3f467a 100644 --- a/extensions/Library_log.mk +++ b/extensions/Library_log.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,log)) $(eval $(call gb_Library_set_componentfile,log,extensions/source/logging/log)) -$(eval $(call gb_Library_add_api,log,\ +$(eval $(call gb_Library_use_api,log,\ offapi \ udkapi \ )) @@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_exception_objects,log,\ extensions/source/logging/plaintextformatter \ )) -$(eval $(call gb_Library_add_linked_libs,log,\ +$(eval $(call gb_Library_use_libraries,log,\ comphelper \ cppuhelper \ cppu \ diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 08e59c2304e4..7e8b400d6eb8 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,npsoplugin)) $(eval $(call gb_Library_use_external,npsoplugin,mozilla_headers)) -$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ +$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ npsoenv \ nputils \ )) @@ -65,11 +65,11 @@ endif # GUI=UNX ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\ +$(eval $(call gb_Library_use_static_libraries,npsoplugin,\ ooopathutils \ )) -$(eval $(call gb_Library_add_linked_libs,npsoplugin,\ +$(eval $(call gb_Library_use_libraries,npsoplugin,\ ws2_32 \ shell32 \ ole32 \ diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk index 106daf838c59..668e9167ea4d 100644 --- a/extensions/Library_oleautobridge.mk +++ b/extensions/Library_oleautobridge.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,oleautobridge)) $(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge)) -$(eval $(call gb_Library_add_api,oleautobridge,\ +$(eval $(call gb_Library_use_api,oleautobridge,\ udkapi \ offapi \ )) @@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,oleautobridge,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,oleautobridge,\ +$(eval $(call gb_Library_use_libraries,oleautobridge,\ cppuhelper \ cppu \ sal \ diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk index 012b99a22251..697818e04718 100644 --- a/extensions/Library_oleautobridge2.mk +++ b/extensions/Library_oleautobridge2.mk @@ -34,7 +34,7 @@ $(eval $(call gb_Library_add_defs,oleautobridge2,\ -DOWNGUID \ )) -$(eval $(call gb_Library_add_api,oleautobridge2,\ +$(eval $(call gb_Library_use_api,oleautobridge2,\ udkapi \ offapi \ )) @@ -45,7 +45,7 @@ $(eval $(call gb_Library_set_include,oleautobridge2,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,oleautobridge2,\ +$(eval $(call gb_Library_use_libraries,oleautobridge2,\ cppuhelper \ cppu \ sal \ diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk index 2a32152e6809..0221489e8540 100644 --- a/extensions/Library_pcr.mk +++ b/extensions/Library_pcr.mk @@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,pcr)) $(eval $(call gb_Library_set_componentfile,pcr,extensions/source/propctrlr/pcr)) -$(eval $(call gb_Library_add_api,pcr,\ +$(eval $(call gb_Library_use_api,pcr,\ udkapi \ offapi \ )) @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,pcr,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_linked_libs,pcr,\ +$(eval $(call gb_Library_use_libraries,pcr,\ svx \ svxcore \ editeng \ diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk index 5ec260bbcfec..cbcfc795e233 100644 --- a/extensions/Library_pl.mk +++ b/extensions/Library_pl.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,pl)) $(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl)) -$(eval $(call gb_Library_add_external_headers,pl,np_sdk_inc)) +$(eval $(call gb_Library_use_package,pl,np_sdk_inc)) $(eval $(call gb_Library_use_external,pl,mozilla_headers)) @@ -41,7 +41,7 @@ $(eval $(call gb_Library_set_include,pl,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_Library_add_api,pl,\ +$(eval $(call gb_Library_use_api,pl,\ offapi \ udkapi \ )) @@ -66,7 +66,7 @@ $(eval $(call gb_Library_add_libs,pl,\ endif # OS=SOLARIS ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,pl,\ +$(eval $(call gb_Library_use_libraries,pl,\ version \ ole32 \ advapi32 \ @@ -109,7 +109,7 @@ $(eval $(call gb_Library_add_exception_objects,pl,\ extensions/source/plugin/unx/unxmgr \ )) -$(eval $(call gb_Library_add_linked_static_libs,pl,\ +$(eval $(call gb_Library_use_static_libraries,pl,\ plugcon \ )) @@ -121,7 +121,7 @@ endif # GUIBASE=aqua endif # GUI=UNX -$(eval $(call gb_Library_add_linked_libs,pl,\ +$(eval $(call gb_Library_use_libraries,pl,\ tk \ vcl \ svl \ diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk index 1fc857aa798f..2e03681243ef 100644 --- a/extensions/Library_res.mk +++ b/extensions/Library_res.mk @@ -32,12 +32,12 @@ $(eval $(call gb_Library_Library,res)) $(eval $(call gb_Library_set_componentfile,res,extensions/source/resource/res)) -$(eval $(call gb_Library_add_api,res,\ +$(eval $(call gb_Library_use_api,res,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,res,\ +$(eval $(call gb_Library_use_libraries,res,\ vcl \ tl \ comphelper \ diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk index fa49f7948785..c19819fb7e07 100644 --- a/extensions/Library_scn.mk +++ b/extensions/Library_scn.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,scn)) $(eval $(call gb_Library_set_componentfile,scn,extensions/source/scanner/scn)) -$(eval $(call gb_Library_add_api,scn,\ +$(eval $(call gb_Library_use_api,scn,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,scn,\ +$(eval $(call gb_Library_use_libraries,scn,\ svt \ vcl \ tl \ @@ -64,7 +64,7 @@ $(eval $(call gb_Library_add_exception_objects,scn,\ extensions/source/scanner/scanunx \ )) ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,scn,\ +$(eval $(call gb_Library_use_libraries,scn,\ dl \ )) endif diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 798fc0fe22d5..44bbf3ef3690 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -30,14 +30,14 @@ $(eval $(call gb_Library_Library,so_activex)) -$(eval $(call gb_Library_add_custom_headers,so_activex,extensions/source/activex/idl)) +$(eval $(call gb_Library_use_custom_headers,so_activex,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex,\ $$(INCLUDE) \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_add_api,so_activex,\ +$(eval $(call gb_Library_use_api,so_activex,\ offapi \ udkapi \ )) @@ -57,7 +57,7 @@ $(eval $(call gb_Library_add_ldflags,so_activex,\ /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) -$(eval $(call gb_Library_add_linked_libs,so_activex,\ +$(eval $(call gb_Library_use_libraries,so_activex,\ uuid \ advapi32 \ ole32 \ diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 3839f9e0c1a7..723c66787f33 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,so_activex_x64)) $(eval $(call gb_Library_set_x64,so_activex_x64,YES)) -$(eval $(call gb_Library_add_custom_headers,so_activex_x64,extensions/source/activex/idl)) +$(eval $(call gb_Library_use_custom_headers,so_activex_x64,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex_x64,\ $$(INCLUDE) \ @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_add_api,so_activex_x64,\ +$(eval $(call gb_Library_use_api,so_activex_x64,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) -$(eval $(call gb_Library_add_linked_libs,so_activex_x64,\ +$(eval $(call gb_Library_use_libraries,so_activex_x64,\ uuid \ advapi32 \ ole32 \ diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk index c336738bce42..196fe7f3d314 100644 --- a/extensions/Library_updatecheckui.mk +++ b/extensions/Library_updatecheckui.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,updatecheckui)) $(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk)) -$(eval $(call gb_Library_add_api,updatecheckui,\ +$(eval $(call gb_Library_use_api,updatecheckui,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,updatecheckui,\ +$(eval $(call gb_Library_use_libraries,updatecheckui,\ vcl \ tl \ comphelper \ diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk index 00a42c49b723..cd1b581e7830 100644 --- a/extensions/Library_updatefeed.mk +++ b/extensions/Library_updatefeed.mk @@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,updatefeed)) $(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed)) -$(eval $(call gb_Library_add_api,updatefeed,\ +$(eval $(call gb_Library_use_api,updatefeed,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,updatefeed,\ +$(eval $(call gb_Library_use_libraries,updatefeed,\ cppuhelper \ cppu \ sal \ diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk index c5286de8e08d..98577ee3941a 100644 --- a/extensions/Library_updchk.mk +++ b/extensions/Library_updchk.mk @@ -36,19 +36,19 @@ $(eval $(call gb_Library_set_include,updchk,\ -I$(SRCDIR)/extensions/inc \ )) -$(eval $(call gb_Library_add_api,updchk,\ +$(eval $(call gb_Library_use_api,updchk,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,updchk,\ +$(eval $(call gb_Library_use_libraries,updchk,\ cppuhelper \ cppu \ sal \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,updchk,\ +$(eval $(call gb_Library_use_libraries,updchk,\ ole32 \ shell32 \ wininet \ diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk index 1d268180bd37..0ef41afc3c55 100644 --- a/extensions/StaticLibrary_plugcon.mk +++ b/extensions/StaticLibrary_plugcon.mk @@ -31,7 +31,7 @@ endif $(eval $(call gb_StaticLibrary_StaticLibrary,plugcon)) -$(eval $(call gb_StaticLibrary_add_external_headers,plugcon,np_sdk_inc)) +$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc)) $(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers)) @@ -40,7 +40,7 @@ $(eval $(call gb_StaticLibrary_set_include,plugcon,\ -I$(SRCDIR)/extensions/source/plugin/inc \ )) -$(eval $(call gb_StaticLibrary_add_api,plugcon,\ +$(eval $(call gb_StaticLibrary_use_api,plugcon,\ offapi \ udkapi \ )) |