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)
This commit is contained in:
@@ -23,7 +23,7 @@
|
||||
|
||||
$(eval $(call gb_Library_Library,merged))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,merged,\
|
||||
$(eval $(call gb_Library_use_libraries,merged,\
|
||||
basegfx \
|
||||
comphelper \
|
||||
cppu \
|
||||
@@ -58,12 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\
|
||||
endif
|
||||
|
||||
# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
|
||||
$(eval $(call gb_Library_add_library_objects,merged,\
|
||||
$(eval $(call gb_Library_use_library_objects,merged,\
|
||||
$(gb_MERGEDLIBS) \
|
||||
))
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,merged,\
|
||||
$(eval $(call gb_Library_use_libraries,merged,\
|
||||
advapi32 \
|
||||
gdi32 \
|
||||
ole32 \
|
||||
@@ -76,14 +76,14 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
|
||||
endif
|
||||
|
||||
ifeq ($(OS),MACOSX)
|
||||
$(eval $(call gb_Library_add_linked_libs,merged,\
|
||||
$(eval $(call gb_Library_use_libraries,merged,\
|
||||
objc \
|
||||
Cocoa \
|
||||
))
|
||||
endif
|
||||
|
||||
ifeq ($(OS),MACOSX)
|
||||
$(eval $(call gb_Library_add_linked_libs,merged,\
|
||||
$(eval $(call gb_Library_use_libraries,merged,\
|
||||
objc \
|
||||
Cocoa \
|
||||
))
|
||||
|
@@ -43,7 +43,7 @@ gb_LinkTarget__use_Mesa:=
|
||||
else
|
||||
|
||||
define gb_LinkTarget__use_Mesa
|
||||
$(eval $(call gb_LinkTarget_add_external_headers,$(1),Mesa_inc))
|
||||
$(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc))
|
||||
endef
|
||||
|
||||
endif
|
||||
@@ -69,7 +69,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_cppunit
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
cppunit \
|
||||
)
|
||||
|
||||
@@ -94,7 +94,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_zlib
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
zlib \
|
||||
)
|
||||
|
||||
@@ -125,7 +125,7 @@ $(call gb_LinkTarget_set_include,$(1),\
|
||||
-I$(OUTDIR)/inc/external/jpeg \
|
||||
)
|
||||
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
jpeglib \
|
||||
)
|
||||
|
||||
@@ -163,7 +163,7 @@ $(if $(filter-out ascii_expat_xmlparse,$(2)),\
|
||||
-DXML_UNICODE \
|
||||
))
|
||||
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
$(2) \
|
||||
expat_xmltok \
|
||||
)
|
||||
@@ -209,7 +209,7 @@ $(call gb_LinkTarget_set_include,$(1),\
|
||||
$$(INCLUDE) \
|
||||
-I$(OUTDIR)/inc/hunspell \
|
||||
)
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
$(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
|
||||
)
|
||||
|
||||
@@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_cmis
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
cmislib \
|
||||
)
|
||||
|
||||
@@ -270,11 +270,11 @@ endif
|
||||
|
||||
define gb_LinkTarget__use_libexttextcat
|
||||
ifeq ($(OS),WNT)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
libexttextcat \
|
||||
)
|
||||
else
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
exttextcat \
|
||||
)
|
||||
endif
|
||||
@@ -305,7 +305,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_libxml2
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
xml2 \
|
||||
)
|
||||
|
||||
@@ -332,7 +332,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_libxslt
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
xslt \
|
||||
)
|
||||
|
||||
@@ -373,7 +373,7 @@ $(call gb_LinkTarget_set_include,$(1),\
|
||||
$$(INCLUDE) \
|
||||
)
|
||||
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
neon \
|
||||
)
|
||||
|
||||
@@ -403,7 +403,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_librdf
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
rdf \
|
||||
)
|
||||
|
||||
@@ -448,7 +448,7 @@ $(call gb_LinkTarget_set_include,$(1),\
|
||||
-I$(OUTDIR)/inc/cairo \
|
||||
$(FREETYPE_CFLAGS) \
|
||||
)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
cairo \
|
||||
)
|
||||
ifneq ($(OS),WNT)
|
||||
@@ -457,7 +457,7 @@ $(call gb_LinkTarget_add_static_libs,$(1),\
|
||||
pixman-1 \
|
||||
)
|
||||
else
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
pixman-1 \
|
||||
)
|
||||
endif
|
||||
@@ -502,7 +502,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
graphite2_off \
|
||||
))
|
||||
define gb_LinkTarget__use_graphite
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
graphite2_off \
|
||||
)
|
||||
|
||||
@@ -553,13 +553,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_icudt
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icudt \
|
||||
)
|
||||
|
||||
endef
|
||||
define gb_LinkTarget__use_icuin
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icuin \
|
||||
)
|
||||
|
||||
@@ -574,13 +574,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_icudata
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icudata$(gb_ICU_suffix) \
|
||||
)
|
||||
|
||||
endef
|
||||
define gb_LinkTarget__use_icui18n
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icui18n$(gb_ICU_suffix) \
|
||||
)
|
||||
|
||||
@@ -588,19 +588,19 @@ endef
|
||||
endif
|
||||
|
||||
define gb_LinkTarget__use_icule
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icule$(gb_ICU_suffix) \
|
||||
)
|
||||
|
||||
endef
|
||||
define gb_LinkTarget__use_icutu
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icutu$(gb_ICU_suffix) \
|
||||
)
|
||||
|
||||
endef
|
||||
define gb_LinkTarget__use_icuuc
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
icuuc$(gb_ICU_suffix) \
|
||||
)
|
||||
|
||||
@@ -636,17 +636,17 @@ endif
|
||||
|
||||
define gb_LinkTarget__use_openssl
|
||||
ifeq ($(OS),WNT)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
crypto \
|
||||
ssl \
|
||||
)
|
||||
else
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
crypto \
|
||||
ssl \
|
||||
)
|
||||
ifeq ($(OS),SOLARIS)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
nsl \
|
||||
socket \
|
||||
)
|
||||
@@ -676,7 +676,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_cdr
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
cdrlib \
|
||||
)
|
||||
|
||||
@@ -703,7 +703,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_visio
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
visiolib \
|
||||
)
|
||||
|
||||
@@ -730,7 +730,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_wpd
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
wpdlib \
|
||||
)
|
||||
|
||||
@@ -757,7 +757,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_wpg
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
wpglib \
|
||||
)
|
||||
|
||||
@@ -784,7 +784,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_wps
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
wpslib \
|
||||
)
|
||||
|
||||
@@ -811,7 +811,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_lcms2
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
lcms2 \
|
||||
)
|
||||
|
||||
@@ -834,7 +834,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_lpsolve55
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
lpsolve55 \
|
||||
)
|
||||
|
||||
@@ -951,11 +951,11 @@ endif
|
||||
|
||||
define gb_LinkTarget__use_berkeleydb
|
||||
ifneq ($(OS),WNT)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
db-4.7 \
|
||||
)
|
||||
else
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
db47 \
|
||||
)
|
||||
endif
|
||||
@@ -985,7 +985,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_png
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
png \
|
||||
)
|
||||
|
||||
@@ -1012,7 +1012,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_curl
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
curl \
|
||||
)
|
||||
|
||||
@@ -1098,18 +1098,18 @@ $(call gb_LinkTarget_set_include,$(1),\
|
||||
$$(INCLUDE) \
|
||||
)
|
||||
|
||||
$(call gb_LinkTarget_add_linked_static_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_static_libraries,$(1),\
|
||||
fofi \
|
||||
Goo \
|
||||
xpdf \
|
||||
)
|
||||
|
||||
ifeq ($(OS),MACOSX)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
objc \
|
||||
)
|
||||
else ifeq ($(OS),WNT)
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
advapi32 \
|
||||
gdi32 \
|
||||
)
|
||||
@@ -1141,7 +1141,7 @@ endef
|
||||
else # !SYSTEM_CLUCENE
|
||||
|
||||
define gb_LinkTarget__use_clucene
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
clucene \
|
||||
)
|
||||
|
||||
@@ -1253,7 +1253,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
|
||||
))
|
||||
|
||||
define gb_LinkTarget__use_plc4
|
||||
$(call gb_LinkTarget_add_linked_libs,$(1),\
|
||||
$(call gb_LinkTarget_use_libraries,$(1),\
|
||||
plc4 \
|
||||
)
|
||||
|
||||
@@ -1266,13 +1266,13 @@ endif
|
||||
ifeq ($(SYSTEM_SAXON),YES)
|
||||
|
||||
define gb_JavaClassSet__use_saxon
|
||||
$(call gb_JavaClassSet_add_system_jar,$(1),$(SAXON_JAR))
|
||||
$(call gb_JavaClassSet_use_system_jar,$(1),$(SAXON_JAR))
|
||||
endef
|
||||
|
||||
else # !SYSTEM_SAXON
|
||||
|
||||
define gb_JavaClassSet__use_saxon
|
||||
$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
|
||||
$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
|
||||
endef
|
||||
|
||||
endif # SYSTEM_SAXON
|
||||
@@ -1280,13 +1280,13 @@ endif # SYSTEM_SAXON
|
||||
ifeq ($(SYSTEM_BSH),YES)
|
||||
|
||||
define gb_JavaClassSet__use_bsh
|
||||
$(call gb_JavaClassSet_add_system_jar,$(1),$(BSH_JAR))
|
||||
$(call gb_JavaClassSet_use_system_jar,$(1),$(BSH_JAR))
|
||||
endef
|
||||
|
||||
else # !SYSTEM_BSH
|
||||
|
||||
define gb_JavaClassSet__use_bsh
|
||||
$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/bsh.jar)
|
||||
$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/bsh.jar)
|
||||
endef
|
||||
|
||||
endif # SYSTEM_BSH
|
||||
|
@@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,ctl,\
|
||||
-I$(SRCDIR)/UnoControls/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,ctl,\
|
||||
$(eval $(call gb_Library_use_api,ctl,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,ctl,\
|
||||
$(eval $(call gb_Library_use_libraries,ctl,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -27,7 +27,7 @@
|
||||
|
||||
$(eval $(call gb_Jar_Jar,java_accessibility))
|
||||
|
||||
$(eval $(call gb_Jar_add_jars,java_accessibility,\
|
||||
$(eval $(call gb_Jar_use_jars,java_accessibility,\
|
||||
$(OUTDIR)/bin/jurt.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/unoil.jar \
|
||||
|
@@ -27,7 +27,7 @@
|
||||
|
||||
$(eval $(call gb_Jar_Jar,java_uno_accessbridge))
|
||||
|
||||
$(eval $(call gb_Jar_add_jars,java_uno_accessbridge,\
|
||||
$(eval $(call gb_Jar_use_jars,java_uno_accessbridge,\
|
||||
$(OUTDIR)/bin/java_accessibility.jar \
|
||||
$(OUTDIR)/bin/jurt.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
|
@@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,acc,\
|
||||
-I$(SRCDIR)/accessibility/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,acc,\
|
||||
$(eval $(call gb_Library_use_api,acc,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,acc,\
|
||||
$(eval $(call gb_Library_use_libraries,acc,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -27,14 +27,14 @@
|
||||
|
||||
$(eval $(call gb_Library_Library,java_uno_accessbridge))
|
||||
|
||||
$(eval $(call gb_Library_add_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
|
||||
$(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
|
||||
|
||||
$(eval $(call gb_Library_add_api,java_uno_accessbridge,\
|
||||
$(eval $(call gb_Library_use_api,java_uno_accessbridge,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,java_uno_accessbridge,\
|
||||
$(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
|
||||
cppu \
|
||||
jvmaccess \
|
||||
sal \
|
||||
|
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
|
||||
|
||||
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
|
||||
|
||||
$(eval $(call gb_Library_add_api,animcore,\
|
||||
$(eval $(call gb_Library_use_api,animcore,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,animcore,\
|
||||
$(eval $(call gb_Library_use_libraries,animcore,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,avmedia,\
|
||||
-I$(SRCDIR)/avmedia/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,avmedia,\
|
||||
$(eval $(call gb_Library_use_api,avmedia,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,avmedia,\
|
||||
-DAVMEDIA_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,avmedia,\
|
||||
$(eval $(call gb_Library_use_libraries,avmedia,\
|
||||
comphelper \
|
||||
ucbhelper \
|
||||
cppu \
|
||||
|
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
|
||||
-I$(SRCDIR)/avmedia/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,avmediaQuickTime,\
|
||||
$(eval $(call gb_Library_use_api,avmediaQuickTime,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\
|
||||
$(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,avmediagst,\
|
||||
$(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,avmediagst,\
|
||||
$(eval $(call gb_Library_use_api,avmediagst,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,avmediagst,\
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,avmediagst,\
|
||||
$(eval $(call gb_Library_use_libraries,avmediagst,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,avmediawin,\
|
||||
-I$(SRCDIR)/avmedia/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,avmediawin,\
|
||||
$(eval $(call gb_Library_use_api,avmediawin,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,avmediawin,\
|
||||
$(eval $(call gb_Library_use_libraries,avmediawin,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,basctl,\
|
||||
-I$(WORKDIR)/SdiTarget/basctl/sdi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,basctl,\
|
||||
$(eval $(call gb_Library_use_api,basctl,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,basctl,\
|
||||
$(eval $(call gb_Library_use_libraries,basctl,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
|
||||
))
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,basctl,\
|
||||
$(eval $(call gb_Library_use_libraries,basctl,\
|
||||
advapi32 \
|
||||
gdi32 \
|
||||
shell32 \
|
||||
|
@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
|
||||
basebmp/test/tools \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,basebmp_test, \
|
||||
basebmp \
|
||||
basegfx \
|
||||
sal \
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,basebmp,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,basebmp,\
|
||||
$(eval $(call gb_Library_use_api,basebmp,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,basebmp,\
|
||||
-DBASEBMP_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,basebmp,\
|
||||
$(eval $(call gb_Library_use_libraries,basebmp,\
|
||||
basegfx \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \
|
||||
basegfx/test/genericclipper \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,basegfx_test, \
|
||||
basegfx \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_api,basegfx_test,\
|
||||
$(eval $(call gb_CppunitTest_use_api,basegfx_test,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
@@ -51,12 +51,12 @@ $(eval $(call gb_Library_add_cxxflags,basegfx,\
|
||||
endif
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_add_api,basegfx,\
|
||||
$(eval $(call gb_Library_use_api,basegfx,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,basegfx,\
|
||||
$(eval $(call gb_Library_use_libraries,basegfx,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -47,7 +47,7 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,basegfx_s,\
|
||||
endif
|
||||
endif
|
||||
|
||||
$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\
|
||||
$(eval $(call gb_StaticLibrary_use_api,basegfx_s,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
@@ -4,10 +4,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \
|
||||
basic/qa/cppunit/test_scanner \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_library_objects,basic_scanner,sb))
|
||||
$(eval $(call gb_CppunitTest_use_library_objects,basic_scanner,sb))
|
||||
|
||||
# add a list of all needed libraries here
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
|
||||
))
|
||||
|
||||
ifeq ($(GUI),WNT)
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
|
||||
oleaut32 \
|
||||
))
|
||||
endif
|
||||
|
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,sb,\
|
||||
-I$(SRCDIR)/basic/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,sb,\
|
||||
$(eval $(call gb_Library_use_api,sb,\
|
||||
udkapi \
|
||||
offapi \
|
||||
oovbaapi \
|
||||
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,sb,\
|
||||
-DBASIC_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,sb,\
|
||||
$(eval $(call gb_Library_use_libraries,sb,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -145,12 +145,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
|
||||
))
|
||||
|
||||
# Uncomment the following line if DBG_TRACE_PROFILING is active in source/inc/sbtrace.hxx
|
||||
# $(eval $(call gb_Library_add_linked_libs,sb,\
|
||||
# $(eval $(call gb_Library_use_libraries,sb,\
|
||||
canvastools \
|
||||
))
|
||||
|
||||
ifeq ($(GUI),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,sb,\
|
||||
$(eval $(call gb_Library_use_libraries,sb,\
|
||||
uwinapi \
|
||||
oleaut32 \
|
||||
))
|
||||
|
@@ -29,7 +29,7 @@
|
||||
|
||||
$(eval $(call gb_Jar_Jar,officebean))
|
||||
|
||||
$(eval $(call gb_Jar_add_jars,officebean,\
|
||||
$(eval $(call gb_Jar_use_jars,officebean,\
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/unoil.jar \
|
||||
$(OUTDIR)/bin/jurt.jar \
|
||||
|
@@ -29,7 +29,7 @@
|
||||
|
||||
$(eval $(call gb_JunitTest_JunitTest,bean_complex))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,bean_complex,\
|
||||
$(eval $(call gb_JunitTest_use_jars,bean_complex,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
|
@@ -46,7 +46,7 @@ endif
|
||||
|
||||
ifeq ($(GUI),WNT)
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,officebean,\
|
||||
$(eval $(call gb_Library_use_libraries,officebean,\
|
||||
jawt \
|
||||
))
|
||||
|
||||
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_add_ldflags,officebean,\
|
||||
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,officebean,\
|
||||
$(eval $(call gb_Library_use_libraries,officebean,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -28,7 +28,7 @@
|
||||
|
||||
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-cache,\
|
||||
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
@@ -28,7 +28,7 @@
|
||||
|
||||
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\
|
||||
$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
@@ -36,11 +36,11 @@ $(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_library_objects,binaryurp_test-unmarshal,\
|
||||
$(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\
|
||||
binaryurp \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_api,binaryurp_test-unmarshal,\
|
||||
$(eval $(call gb_CppunitTest_use_api,binaryurp_test-unmarshal,\
|
||||
udkapi \
|
||||
))
|
||||
|
||||
|
@@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,binaryurp))
|
||||
|
||||
$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
|
||||
|
||||
$(eval $(call gb_Library_add_api,binaryurp,\
|
||||
$(eval $(call gb_Library_use_api,binaryurp,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,binaryurp,\
|
||||
$(eval $(call gb_Library_use_libraries,binaryurp,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,cairocanvas,\
|
||||
$(eval $(call gb_Library_use_api,cairocanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_cxxflags,cairocanvas,\
|
||||
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,cairocanvas,\
|
||||
sal \
|
||||
cppu \
|
||||
basegfx \
|
||||
@@ -99,7 +99,7 @@ ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
|
||||
canvas/source/cairo/cairo_win32_cairo \
|
||||
))
|
||||
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,cairocanvas,\
|
||||
gdi32 \
|
||||
))
|
||||
|
||||
@@ -115,7 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
|
||||
))
|
||||
|
||||
# freetype? fontconfig? -> test on Solaris
|
||||
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,cairocanvas,\
|
||||
X11 \
|
||||
Xrender \
|
||||
))
|
||||
|
@@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,canvasfactory,\
|
||||
$(eval $(call gb_Library_use_api,canvasfactory,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
|
||||
$(eval $(call gb_Library_use_libraries,canvasfactory,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,canvastools,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,canvastools,\
|
||||
$(eval $(call gb_Library_use_api,canvastools,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,canvastools,\
|
||||
-DCANVASTOOLS_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,canvastools,\
|
||||
$(eval $(call gb_Library_use_libraries,canvastools,\
|
||||
basegfx \
|
||||
comphelper \
|
||||
cppu \
|
||||
@@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\
|
||||
canvas/source/tools/bitmap \
|
||||
canvas/source/tools/image \
|
||||
))
|
||||
$(eval $(call gb_Library_add_linked_libs,canvastools,\
|
||||
$(eval $(call gb_Library_use_libraries,canvastools,\
|
||||
agg \
|
||||
))
|
||||
ifneq ($(strip $(AGG_VERSION)),)
|
||||
@@ -88,7 +88,7 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,canvastools,\
|
||||
$(eval $(call gb_Library_use_libraries,canvastools,\
|
||||
winmm \
|
||||
))
|
||||
endif
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,directx9canvas,\
|
||||
$(eval $(call gb_Library_use_api,directx9canvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
|
||||
-UNOMINMAX \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
|
||||
$(eval $(call gb_Library_use_libraries,directx9canvas,\
|
||||
cppu \
|
||||
tk \
|
||||
sal \
|
||||
@@ -61,13 +61,13 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
|
||||
$(eval $(call gb_Library_use_libraries,directx9canvas,\
|
||||
d3d9 \
|
||||
gdi32 \
|
||||
gdiplus \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_static_libs,directx9canvas,\
|
||||
$(eval $(call gb_Library_use_static_libraries,directx9canvas,\
|
||||
directxcanvas \
|
||||
))
|
||||
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,gdipluscanvas,\
|
||||
$(eval $(call gb_Library_use_api,gdipluscanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,gdipluscanvas,\
|
||||
cppu \
|
||||
tk \
|
||||
sal \
|
||||
@@ -67,12 +67,12 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,gdipluscanvas,\
|
||||
gdi32 \
|
||||
gdiplus \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_static_libs,gdipluscanvas,\
|
||||
$(eval $(call gb_Library_use_static_libraries,gdipluscanvas,\
|
||||
directxcanvas \
|
||||
))
|
||||
|
||||
|
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,nullcanvas,\
|
||||
$(eval $(call gb_Library_use_api,nullcanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,nullcanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,nullcanvas,\
|
||||
basegfx \
|
||||
canvastools \
|
||||
comphelper \
|
||||
|
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,simplecanvas,\
|
||||
$(eval $(call gb_Library_use_api,simplecanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,simplecanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,simplecanvas,\
|
||||
basegfx \
|
||||
canvastools \
|
||||
comphelper \
|
||||
|
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,vclcanvas,\
|
||||
$(eval $(call gb_Library_use_api,vclcanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,vclcanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,vclcanvas,\
|
||||
basegfx \
|
||||
canvastools \
|
||||
comphelper \
|
||||
|
@@ -32,7 +32,7 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\
|
||||
-I$(SRCDIR)/canvas/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_StaticLibrary_add_api,directxcanvas,\
|
||||
$(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
|
||||
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,chart2_unoapi,\
|
||||
$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
|
||||
-I$(SRCDIR)/chart2/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,chartcontroller,\
|
||||
$(eval $(call gb_Library_use_api,chartcontroller,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartcontroller,\
|
||||
# CFLAGS+=-ftemplate-depth-128
|
||||
# .ENDIF
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,chartcontroller,\
|
||||
$(eval $(call gb_Library_use_libraries,chartcontroller,\
|
||||
basegfx \
|
||||
charttools \
|
||||
chartview \
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartmodel,\
|
||||
-I$(SRCDIR)/chart2/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,chartmodel,\
|
||||
$(eval $(call gb_Library_use_api,chartmodel,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartmodel,\
|
||||
# CFLAGS+=-ftemplate-depth-128
|
||||
# .ENDIF
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,chartmodel,\
|
||||
$(eval $(call gb_Library_use_libraries,chartmodel,\
|
||||
charttools \
|
||||
comphelper \
|
||||
cppu \
|
||||
|
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_add_defs,charttools,\
|
||||
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,charttools,\
|
||||
$(eval $(call gb_Library_use_api,charttools,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,charttools,\
|
||||
$(eval $(call gb_Library_use_libraries,charttools,\
|
||||
basegfx \
|
||||
comphelper \
|
||||
cppu \
|
||||
|
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,chartview,\
|
||||
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,chartview,\
|
||||
$(eval $(call gb_Library_use_api,chartview,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,chartview,\
|
||||
$(eval $(call gb_Library_use_libraries,chartview,\
|
||||
basegfx \
|
||||
charttools \
|
||||
comphelper \
|
||||
|
@@ -49,12 +49,12 @@ $(eval $(call gb_Library_add_defs,clucene,\
|
||||
))
|
||||
|
||||
# clucene does not depend on sal nor needs uwinapi here
|
||||
$(eval $(call gb_Library_add_linked_libs,clucene,\
|
||||
$(eval $(call gb_Library_use_libraries,clucene,\
|
||||
$(filter-out uwinapi,$(gb_STDLIBS)) \
|
||||
))
|
||||
|
||||
ifeq ($(OS),LINUX)
|
||||
$(eval $(call gb_Library_add_linked_libs,clucene,\
|
||||
$(eval $(call gb_Library_use_libraries,clucene,\
|
||||
dl \
|
||||
m \
|
||||
pthread \
|
||||
|
@@ -31,12 +31,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \
|
||||
comphelper/qa/string/test_string \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_api,comphelper_test, \
|
||||
$(eval $(call gb_CppunitTest_use_api,comphelper_test, \
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,comphelper_test, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
|
||||
comphelper \
|
||||
cppuhelper \
|
||||
cppu \
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
|
||||
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,comphelper_complex,\
|
||||
$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
|
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,comphelper,\
|
||||
-DCOMPHELPER_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,comphelper,\
|
||||
$(eval $(call gb_Library_use_libraries,comphelper,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,comphelper,\
|
||||
$(eval $(call gb_Library_use_api,comphelper,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
|
||||
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,configmgr_unoapi,\
|
||||
$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
|
@@ -63,12 +63,12 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
|
||||
configmgr/source/xmldata \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,configmgr, \
|
||||
$(eval $(call gb_Library_use_api,configmgr, \
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,configmgr, \
|
||||
$(eval $(call gb_Library_use_libraries,configmgr, \
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,cppcanvas,\
|
||||
$(eval $(call gb_Library_use_api,cppcanvas,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\
|
||||
-DCPPCANVAS_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,cppcanvas,\
|
||||
$(eval $(call gb_Library_use_libraries,cppcanvas,\
|
||||
basegfx \
|
||||
canvastools \
|
||||
comphelper \
|
||||
|
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,mtfrenderer))
|
||||
|
||||
$(eval $(call gb_Library_set_componentfile,mtfrenderer,cppcanvas/source/uno/mtfrenderer))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,mtfrenderer,\
|
||||
$(eval $(call gb_Library_use_libraries,mtfrenderer,\
|
||||
sal \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,mtfrenderer,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,mtfrenderer,\
|
||||
$(eval $(call gb_Library_use_api,mtfrenderer,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \
|
||||
cppu/qa/test_any \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_any, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
|
||||
cppu \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \
|
||||
cppu/qa/test_recursion \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_recursion, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
|
||||
cppu \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \
|
||||
cppu/qa/test_reference \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_reference, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
|
||||
cppu \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \
|
||||
cppu/qa/test_unotype \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_unotype, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
|
||||
cppu \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \
|
||||
cppu/qa/cppumaker/test_cppumaker \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppu_test_cppumaker, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
|
||||
cppu \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,affine_uno,\
|
||||
-I$(SRCDIR)/cppu/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,affine_uno,\
|
||||
$(eval $(call gb_Library_use_api,affine_uno,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,affine_uno,\
|
||||
$(eval $(call gb_Library_use_libraries,affine_uno,\
|
||||
purpenvhelper \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,cppu,\
|
||||
-I$(SRCDIR)/cppu/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,cppu,\
|
||||
$(eval $(call gb_Library_use_api,cppu,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,cppu,\
|
||||
-DCPPU_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,cppu,\
|
||||
$(eval $(call gb_Library_use_libraries,cppu,\
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,log_uno,\
|
||||
-I$(SRCDIR)/cppu/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,log_uno,\
|
||||
$(eval $(call gb_Library_use_api,log_uno,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,log_uno,\
|
||||
$(eval $(call gb_Library_use_libraries,log_uno,\
|
||||
cppu \
|
||||
purpenvhelper \
|
||||
sal \
|
||||
|
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_add_defs,purpenvhelper,\
|
||||
-DPURPENV_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,purpenvhelper,\
|
||||
$(eval $(call gb_Library_use_api,purpenvhelper,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,purpenvhelper,\
|
||||
$(eval $(call gb_Library_use_libraries,purpenvhelper,\
|
||||
cppu \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,unsafe_uno,\
|
||||
-I$(SRCDIR)/cppu/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,unsafe_uno,\
|
||||
$(eval $(call gb_Library_use_api,unsafe_uno,\
|
||||
udkapi \
|
||||
offapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,unsafe_uno,\
|
||||
$(eval $(call gb_Library_use_libraries,unsafe_uno,\
|
||||
purpenvhelper \
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
|
@@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_ifcontainer,\
|
||||
cppuhelper/qa/ifcontainer/cppu_ifcontainer \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_api,cppuhelper_cppu_ifcontainer,\
|
||||
$(eval $(call gb_CppunitTest_use_api,cppuhelper_cppu_ifcontainer,\
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_ifcontainer,\
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_unourl,\
|
||||
cppuhelper/qa/unourl/cppu_unourl \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_unourl,\
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_weak,\
|
||||
cppuhelper/qa/weak/test_weak \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_api,cppuhelper_qa_weak,\
|
||||
$(eval $(call gb_CppunitTest_use_api,cppuhelper_qa_weak,\
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_qa_weak,\
|
||||
$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\
|
||||
-DCPPUHELPER_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,cppuhelper,\
|
||||
$(eval $(call gb_Library_use_libraries,cppuhelper,\
|
||||
cppu \
|
||||
sal \
|
||||
salhelper \
|
||||
|
@@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,cui,\
|
||||
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,cui,\
|
||||
$(eval $(call gb_Library_use_api,cui,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,cui,\
|
||||
$(eval $(call gb_Library_use_libraries,cui,\
|
||||
avmedia \
|
||||
basegfx \
|
||||
comphelper \
|
||||
@@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\
|
||||
))
|
||||
|
||||
ifeq ($(GUI),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,cui,\
|
||||
$(eval $(call gb_Library_use_libraries,cui,\
|
||||
advapi32 \
|
||||
shlwapi \
|
||||
))
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_macros_test, \
|
||||
dbaccess/qa/extras/macros-test \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_linked_libs,dbaccess_macros_test, \
|
||||
$(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
|
||||
avmedia \
|
||||
basegfx \
|
||||
comphelper \
|
||||
@@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\
|
||||
$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
|
||||
offapi \
|
||||
oovbaapi \
|
||||
udkapi \
|
||||
@@ -85,12 +85,12 @@ $(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\
|
||||
|
||||
$(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_type_rdbs,dbaccess_macros_test,\
|
||||
$(eval $(call gb_CppunitTest_use_type_rdbs,dbaccess_macros_test,\
|
||||
oovbaapi \
|
||||
types \
|
||||
))
|
||||
|
||||
$(eval $(call gb_CppunitTest_add_components,dbaccess_macros_test,\
|
||||
$(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
|
||||
basic/util/sb \
|
||||
comphelper/util/comphelp \
|
||||
configmgr/source/configmgr \
|
||||
|
@@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
|
||||
-I$(SRCDIR)/dbaccess/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,odbcconfig,\
|
||||
$(eval $(call gb_Library_use_api,odbcconfig,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
|
||||
$(eval $(call gb_Executable_use_libraries,odbcconfig,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -54,7 +54,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
|
||||
dbaccess/qa/complex/dbaccess/TestCase \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\
|
||||
$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
|
||||
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
|
||||
))
|
||||
|
||||
$(eval $(call gb_JunitTest_add_jars,dbaccess_unoapi,\
|
||||
$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\
|
||||
$(OUTDIR)/bin/OOoRunner.jar \
|
||||
$(OUTDIR)/bin/ridl.jar \
|
||||
$(OUTDIR)/bin/test.jar \
|
||||
|
@@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,dba,\
|
||||
-DOOO_DLLIMPLEMENTATION_DBA \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,dba,\
|
||||
$(eval $(call gb_Library_use_api,dba,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,dba,\
|
||||
$(eval $(call gb_Library_use_libraries,dba,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,dbaxml,\
|
||||
-I$(SRCDIR)/dbaccess/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,dbaxml,\
|
||||
$(eval $(call gb_Library_use_api,dbaxml,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,dbaxml,\
|
||||
$(eval $(call gb_Library_use_libraries,dbaxml,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,dbmm,\
|
||||
-I$(SRCDIR)/dbaccess/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,dbmm,\
|
||||
$(eval $(call gb_Library_use_api,dbmm,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,dbmm,\
|
||||
$(eval $(call gb_Library_use_libraries,dbmm,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbu,\
|
||||
-I$(WORKDIR)/inc/dbaccess \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,dbu,\
|
||||
$(eval $(call gb_Library_use_api,dbu,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,dbu,\
|
||||
$(eval $(call gb_Library_use_libraries,dbu,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,dbu,\
|
||||
))
|
||||
|
||||
ifeq ($(GUI),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,dbu,\
|
||||
$(eval $(call gb_Library_use_libraries,dbu,\
|
||||
ole32 \
|
||||
oleaut32 \
|
||||
uuid \
|
||||
|
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,dbui,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,dbui,\
|
||||
$(eval $(call gb_Library_use_api,dbui,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_defs,dbui,\
|
||||
-DDBACCESS_DLLIMPLEMENTATION\
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,dbui,\
|
||||
$(eval $(call gb_Library_use_libraries,dbui,\
|
||||
comphelper \
|
||||
cppuhelper \
|
||||
cppu \
|
||||
@@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
ifeq ($(OS),WNT)
|
||||
$(eval $(call gb_Library_add_linked_libs,dbui,\
|
||||
$(eval $(call gb_Library_use_libraries,dbui,\
|
||||
ole32 \
|
||||
oleaut32 \
|
||||
uuid \
|
||||
|
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,sdbt,\
|
||||
-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,sdbt,\
|
||||
$(eval $(call gb_Library_use_api,sdbt,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,sdbt,\
|
||||
$(eval $(call gb_Library_use_libraries,sdbt,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
|
||||
$(LFS_CFLAGS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
|
||||
$(eval $(call gb_Executable_use_libraries,crashrep_com,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,officeloader,\
|
||||
$(eval $(call gb_Executable_use_libraries,officeloader,\
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,oosplash,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,oosplash,\
|
||||
$(eval $(call gb_Executable_use_libraries,oosplash,\
|
||||
sal \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
@@ -80,7 +80,7 @@ endif
|
||||
|
||||
ifeq ($(OS),SOLARIS)
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,oosplash,\
|
||||
$(eval $(call gb_Executable_use_libraries,oosplash,\
|
||||
-lsocket \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,quickstart,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,quickstart,\
|
||||
$(eval $(call gb_Executable_use_libraries,quickstart,\
|
||||
comdlg32 \
|
||||
gdi32 \
|
||||
ole32 \
|
||||
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\
|
||||
|
||||
ifeq ($(COM),GCC)
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,quickstart,\
|
||||
$(eval $(call gb_Executable_use_libraries,quickstart,\
|
||||
uuid \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,sbase,\
|
||||
$(eval $(call gb_Executable_use_libraries,sbase,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,scalc,\
|
||||
$(eval $(call gb_Executable_use_libraries,scalc,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,sdraw,\
|
||||
$(eval $(call gb_Executable_use_libraries,sdraw,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,simpress,\
|
||||
$(eval $(call gb_Executable_use_libraries,simpress,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,smath,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,smath,\
|
||||
$(eval $(call gb_Executable_use_libraries,smath,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(sofficebin),\
|
||||
-I$(SRCDIR)/desktop/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
|
||||
$(eval $(call gb_Executable_use_libraries,$(sofficebin),\
|
||||
sal \
|
||||
sofficeapp \
|
||||
$(gb_STDLIBS) \
|
||||
@@ -52,7 +52,7 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
|
||||
$(eval $(call gb_Executable_use_static_libraries,$(sofficebin),\
|
||||
ooopathutils \
|
||||
winextendloaderenv \
|
||||
))
|
||||
|
@@ -29,14 +29,14 @@ $(eval $(call gb_Executable_Executable,soffice))
|
||||
|
||||
$(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,soffice,\
|
||||
$(eval $(call gb_Executable_use_libraries,soffice,\
|
||||
advapi32 \
|
||||
shell32 \
|
||||
shlwapi \
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_static_libs,soffice,\
|
||||
$(eval $(call gb_Executable_use_static_libraries,soffice,\
|
||||
ooopathutils \
|
||||
winextendloaderenv \
|
||||
))
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,sweb,\
|
||||
$(eval $(call gb_Executable_use_libraries,sweb,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\
|
||||
-DUNICODE \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,swriter,\
|
||||
$(eval $(call gb_Executable_use_libraries,swriter,\
|
||||
$(gb_STDLIBS) \
|
||||
))
|
||||
|
||||
|
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,unoinfo,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_static_libs,unoinfo,\
|
||||
$(eval $(call gb_Executable_use_static_libraries,unoinfo,\
|
||||
ooopathutils \
|
||||
))
|
||||
|
||||
|
@@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(unopkgbin),\
|
||||
-I$(SRCDIR)/desktop/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\
|
||||
$(eval $(call gb_Executable_use_libraries,$(unopkgbin),\
|
||||
comphelper \
|
||||
sal \
|
||||
tl \
|
||||
|
@@ -29,7 +29,7 @@ $(eval $(call gb_Executable_Executable,unopkg))
|
||||
|
||||
$(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
|
||||
|
||||
$(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
|
||||
$(eval $(call gb_Executable_use_static_libraries,unopkg,\
|
||||
ooopathutils \
|
||||
winextendloaderenv \
|
||||
))
|
||||
|
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deployment,\
|
||||
-I$(SRCDIR)/desktop/source/deployment/registry/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,deployment,\
|
||||
$(eval $(call gb_Library_use_api,deployment,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,deployment,\
|
||||
$(eval $(call gb_Library_use_libraries,deployment,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -94,7 +94,7 @@ $(eval $(call gb_Library_add_exception_objects,deployment,\
|
||||
|
||||
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,deployment,\
|
||||
$(eval $(call gb_Library_use_libraries,deployment,\
|
||||
helplinker \
|
||||
))
|
||||
|
||||
|
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deploymentgui,\
|
||||
-I$(SRCDIR)/desktop/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,deploymentgui,\
|
||||
$(eval $(call gb_Library_use_api,deploymentgui,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
|
||||
$(eval $(call gb_Library_use_libraries,deploymentgui,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
@@ -61,7 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,deploymentgui,\
|
||||
|
||||
ifeq ($(OS),WNT)
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,deploymentgui,\
|
||||
$(eval $(call gb_Library_use_libraries,deploymentgui,\
|
||||
ole32 \
|
||||
))
|
||||
|
||||
|
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,deploymentmisc,\
|
||||
-I$(SRCDIR)/desktop/source/deployment/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,deploymentmisc,\
|
||||
$(eval $(call gb_Library_use_api,deploymentmisc,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_defs,deploymentmisc,\
|
||||
-DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,deploymentmisc,\
|
||||
$(eval $(call gb_Library_use_libraries,deploymentmisc,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,migrationoo2,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,migrationoo2,\
|
||||
$(eval $(call gb_Library_use_api,migrationoo2,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,migrationoo2,\
|
||||
$(eval $(call gb_Library_use_libraries,migrationoo2,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
i18nisolang1 \
|
||||
|
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,migrationoo3,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,migrationoo3,\
|
||||
$(eval $(call gb_Library_use_api,migrationoo3,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,migrationoo3,\
|
||||
$(eval $(call gb_Library_use_libraries,migrationoo3,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -31,12 +31,12 @@ $(eval $(call gb_Library_set_include,offacc,\
|
||||
$$(INCLUDE) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,offacc,\
|
||||
$(eval $(call gb_Library_use_api,offacc,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,offacc,\
|
||||
$(eval $(call gb_Library_use_libraries,offacc,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
|
||||
-I$(SRCDIR)/desktop/source/deployment/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,sofficeapp,\
|
||||
$(eval $(call gb_Library_use_api,sofficeapp,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,sofficeapp,\
|
||||
$(if $(filter TRUE,$(ENABLE_SYSTRAY_GTK)),-DENABLE_QUICKSTART_APPLET) \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,sofficeapp,\
|
||||
$(eval $(call gb_Library_use_libraries,sofficeapp,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,spl,\
|
||||
-I$(SRCDIR)/desktop/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,spl,\
|
||||
$(eval $(call gb_Library_use_api,spl,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,spl,\
|
||||
$(eval $(call gb_Library_use_libraries,spl,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -27,12 +27,12 @@
|
||||
|
||||
$(eval $(call gb_Library_Library,spl_unx))
|
||||
|
||||
$(eval $(call gb_Library_add_api,spl_unx,\
|
||||
$(eval $(call gb_Library_use_api,spl_unx,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,spl_unx,\
|
||||
$(eval $(call gb_Library_use_libraries,spl_unx,\
|
||||
cppu \
|
||||
cppuhelper \
|
||||
sal \
|
||||
|
@@ -34,7 +34,7 @@ $(eval $(call gb_Library_set_include,unopkgapp,\
|
||||
-I$(SRCDIR)/desktop/source/inc \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,unopkgapp,\
|
||||
$(eval $(call gb_Library_use_api,unopkgapp,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
@@ -43,7 +43,7 @@ $(eval $(call gb_Library_add_defs,unopkgapp,\
|
||||
-DDESKTOP_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,unopkgapp,\
|
||||
$(eval $(call gb_Library_use_libraries,unopkgapp,\
|
||||
comphelper \
|
||||
cppu \
|
||||
cppuhelper \
|
||||
|
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,drawinglayer,\
|
||||
-DDRAWINGLAYER_DLLIMPLEMENTATION \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_api,drawinglayer,\
|
||||
$(eval $(call gb_Library_use_api,drawinglayer,\
|
||||
offapi \
|
||||
udkapi \
|
||||
))
|
||||
|
||||
$(eval $(call gb_Library_add_linked_libs,drawinglayer,\
|
||||
$(eval $(call gb_Library_use_libraries,drawinglayer,\
|
||||
avmedia \
|
||||
basegfx \
|
||||
canvastools \
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user