[Libreoffice-commits] .: Branch 'feature/gnumake4' - canvas/Library_cairocanvas.mk sax/Library_expwrap.mk sax/Library_fastsax.mk svtools/Library_svt.mk tools/Library_tl.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sat Jul 23 06:27:12 PDT 2011
canvas/Library_cairocanvas.mk | 2 +-
sax/Library_expwrap.mk | 2 +-
sax/Library_fastsax.mk | 8 ++------
svtools/Library_svt.mk | 4 ++--
tools/Library_tl.mk | 2 +-
vcl/Library_desktop_detector.mk | 4 ++--
vcl/Library_vcl.mk | 6 +++---
vcl/Library_vclplug_gen.mk | 4 ++--
vcl/Library_vclplug_gtk.mk | 4 ++--
vcl/Library_vclplug_kde.mk | 4 ++--
vcl/Library_vclplug_kde4.mk | 4 ++--
vcl/Library_vclplug_svp.mk | 4 ++--
12 files changed, 22 insertions(+), 26 deletions(-)
New commits:
commit 3ee3f480d136d0f5bc759f04966078463e18f624
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jul 23 15:23:24 2011 +0200
keep gbuild calls consistent at now, even if it is a bit longer
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 6d36898..c31a0b1 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -78,7 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_textlayout \
))
-$(call gb_Library_use_external,cairocanvas,cairo)
+$(eval $(call gb_Library_use_external,cairocanvas,cairo))
ifeq ($(OS),WNT)
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 5b9bd34..f69281e 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
$(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,\
sax/source/expatwrap/attrlistimpl \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index f347842..d6fe471 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -47,13 +47,9 @@ $(eval $(call gb_Library_add_linked_libs,fastsax,\
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_add_defs,fastsax,\
- -DSYSTEM_ZLIB \
-))
-endif
+$(eval $(call gb_Library_use_external,fastsax,zlib))
-$(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)
$(eval $(call gb_Library_add_exception_objects,fastsax,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index ea6a568..b6569b4 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -74,10 +74,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,svt,\
+$(eval $(call gb_Library_use_externals,svt,\
icuuc \
jpeg \
-)
+))
$(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 439f171..c861523 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -127,7 +127,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
))
endif
-$(call gb_Library_use_external,tl,zlib)
+$(eval $(call gb_Library_use_external,tl,zlib))
ifeq ($(OS),WNT)
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 3673218..10ffd6f 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -70,10 +70,10 @@ $(eval $(call gb_Library_add_linked_libs,desktop_detector,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,desktop_detector,\
+$(eval $(call gb_Library_use_externals,desktop_detector,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
vcl/unx/generic/desktopdetect/desktopdetector \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 08ccec9..b67e24c 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -90,10 +90,10 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vcl,\
+$(eval $(call gb_Library_use_externals,vcl,\
icule \
icuuc \
-)
+))
ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_cxxflags,vcl,\
@@ -461,7 +461,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
))
endif
-$(call gb_Library_use_external,vcl,graphite)
+$(eval $(call gb_Library_use_external,vcl,graphite))
endif
## handle Cairo
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 895afe2..9f7c771 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -62,10 +62,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vclplug_gen,\
+$(eval $(call gb_Library_use_externals,vclplug_gen,\
icule \
icuuc \
-)
+))
ifeq ($(SYSTEM_CAIRO),YES)
$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index d9674f0..b6305fc 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -91,10 +91,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vclplug_gtk,\
+$(eval $(call gb_Library_use_externals,vclplug_gtk,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
vcl/unx/gtk/a11y/atkaction \
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index e4586b8..d72ce2e 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -75,10 +75,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
ICE \
))
-$(call gb_Library_use_externals,vclplug_kde,\
+$(eval $(call gb_Library_use_externals,vclplug_kde,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
vcl/unx/kde/kdedata \
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index bbc64aa..19c1b97 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -78,10 +78,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
ICE \
))
-$(call gb_Library_use_externals,vclplug_kde4,\
+$(eval $(call gb_Library_use_externals,vclplug_kde4,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
vcl/unx/kde4/KDEData \
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 7616e6c..a876915 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -68,10 +68,10 @@ $(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
$(gb_STDLIBS) \
))
-$(call gb_Library_use_externals,vclplug_svp,\
+$(eval $(call gb_Library_use_externals,vclplug_svp,\
icule \
icuuc \
-)
+))
$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
vcl/unx/headless/svpbmp \
More information about the Libreoffice-commits
mailing list