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

keep gbuild calls consistent at now, even if it is a bit longer

Browse Source
This commit is contained in:
Bjoern Michaelsen
2011-07-23 15:23:24 +02:00
parent 67cd3faba4
commit 8fb6435604
12 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
canvas/Library_cairocanvas.mk
View File

@@ -78,7 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_textlayout \ canvas/source/cairo/cairo_textlayout \
)) ))
$(call gb_Library_use_external,cairocanvas,cairo) $(eval $(call gb_Library_use_external,cairocanvas,cairo))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)

2
sax/Library_expwrap.mk
View File

@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_external,expwrap,expat_utf16) $(eval $(call gb_Library_use_external,expwrap,expat_utf16))
$(eval $(call gb_Library_add_exception_objects,expwrap,\ $(eval $(call gb_Library_add_exception_objects,expwrap,\
sax/source/expatwrap/attrlistimpl \ sax/source/expatwrap/attrlistimpl \

8
sax/Library_fastsax.mk
View File

@@ -47,13 +47,9 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
ifeq ($(SYSTEM_ZLIB),YES) $(eval $(call gb_Library_use_external,fastsax,zlib))
$(eval $(call gb_Library_add_defs,fastsax,\
-DSYSTEM_ZLIB \
))
endif
$(call gb_Library_use_external,fastsax,expat_utf8) $(eval $(call gb_Library_use_external,fastsax,expat_utf8))
# re-uses xml2utf object from sax.uno lib (see below) # re-uses xml2utf object from sax.uno lib (see below)
$(eval $(call gb_Library_add_exception_objects,fastsax,\ $(eval $(call gb_Library_add_exception_objects,fastsax,\

4
svtools/Library_svt.mk
View File

@@ -74,10 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_externals,svt,\ $(eval $(call gb_Library_use_externals,svt,\
icuuc \ icuuc \
jpeg \ jpeg \
) ))
$(eval $(call gb_Library_add_exception_objects,svt,\ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \ svtools/source/brwbox/brwbox1 \

2
tools/Library_tl.mk
View File

@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
)) ))
endif endif
$(call gb_Library_use_external,tl,zlib) $(eval $(call gb_Library_use_external,tl,zlib))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)

4
vcl/Library_desktop_detector.mk
View File

@@ -70,10 +70,10 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_externals,desktop_detector,\ $(eval $(call gb_Library_use_externals,desktop_detector,\
icule \ icule \
icuuc \ icuuc \
) ))
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \ vcl/unx/generic/desktopdetect/desktopdetector \

6
vcl/Library_vcl.mk
View File

@@ -90,10 +90,10 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_externals,vcl,\ $(eval $(call gb_Library_use_externals,vcl,\
icule \ icule \
icuuc \ icuuc \
) ))
ifeq ($(GUIBASE),aqua) ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_cxxflags,vcl,\ $(eval $(call gb_Library_add_cxxflags,vcl,\
@@ -461,7 +461,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
)) ))
endif endif
$(call gb_Library_use_external,vcl,graphite) $(eval $(call gb_Library_use_external,vcl,graphite))
endif endif
## handle Cairo ## handle Cairo

4
vcl/Library_vclplug_gen.mk
View File

@@ -62,10 +62,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_externals,vclplug_gen,\ $(eval $(call gb_Library_use_externals,vclplug_gen,\
icule \ icule \
icuuc \ icuuc \
) ))
ifeq ($(SYSTEM_CAIRO),YES) ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\ $(eval $(call gb_Library_set_ldflags,vclplug_gen,\

4
vcl/Library_vclplug_gtk.mk
View File

@@ -91,10 +91,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_externals,vclplug_gtk,\ $(eval $(call gb_Library_use_externals,vclplug_gtk,\
icule \ icule \
icuuc \ icuuc \
) ))
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\ $(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkaction \ vcl/unx/gtk/a11y/atkaction \

4
vcl/Library_vclplug_kde.mk
View File

@@ -75,10 +75,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
ICE \ ICE \
)) ))
$(call gb_Library_use_externals,vclplug_kde,\ $(eval $(call gb_Library_use_externals,vclplug_kde,\
icule \ icule \
icuuc \ icuuc \
) ))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\ $(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/kdedata \ vcl/unx/kde/kdedata \

4
vcl/Library_vclplug_kde4.mk
View File

@@ -78,10 +78,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
ICE \ ICE \
)) ))
$(call gb_Library_use_externals,vclplug_kde4,\ $(eval $(call gb_Library_use_externals,vclplug_kde4,\
icule \ icule \
icuuc \ icuuc \
) ))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\ $(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/KDEData \ vcl/unx/kde4/KDEData \

4
vcl/Library_vclplug_svp.mk
View File

@@ -68,10 +68,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
$(gb_STDLIBS) \ $(gb_STDLIBS) \
)) ))
$(call gb_Library_use_externals,vclplug_svp,\ $(eval $(call gb_Library_use_externals,vclplug_svp,\
icule \ icule \
icuuc \ icuuc \
) ))
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\ $(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/headless/svpbmp \ vcl/unx/headless/svpbmp \