diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:12 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 13:24:12 +0200 |
| commit | 5cba588ff2e3a97317f9e4fb004ef99bcda6f577 (patch) | |
| tree | 324e59dafc1bcc17ac50b5017ef0061fec08a6f1 | |
| parent | 92667c8edbaee9a252b1d5d221eb62849f76697c (diff) | |
gnumake4: fix buildbreakers from merge
| -rw-r--r-- | drawinglayer/Library_drawinglayer.mk | 3 | ||||
| -rw-r--r-- | framework/Library_fwe.mk | 1 | ||||
| -rw-r--r-- | idl/Executable_svidl.mk | 1 | ||||
| -rw-r--r-- | linguistic/Library_lng.mk | 10 | ||||
| -rw-r--r-- | xmlscript/Library_xcr.mk | 4 |
5 files changed, 7 insertions, 12 deletions
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk index 7aab083fe94a..52937783b1ef 100644 --- a/drawinglayer/Library_drawinglayer.mk +++ b/drawinglayer/Library_drawinglayer.mk @@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,drawinglayer,\ -I$(OUTDIR)/inc/offuh \ )) -$(eval $(call gb_Library_set_defs,drawinglayer,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,drawinglayer,\ -DDRAWINGLAYER_DLLIMPLEMENTATION \ )) diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk index 7665b91d06ed..51179c4523a8 100644 --- a/framework/Library_fwe.mk +++ b/framework/Library_fwe.mk @@ -90,5 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,fwe,\ framework/source/fwe/xml/xmlnamespaces \ )) -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) # vim: set noet sw=4 ts=4: diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk index a856cf7a4612..da39f4d7d249 100644 --- a/idl/Executable_svidl.mk +++ b/idl/Executable_svidl.mk @@ -42,7 +42,6 @@ $(eval $(call gb_Executable_add_defs,svidl,\ $(eval $(call gb_Executable_add_linked_libs,svidl,\ tl \ sal \ - stl \ $(gb_STDLIBS) \ )) diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk index d97278d9d819..00fcc94143b0 100644 --- a/linguistic/Library_lng.mk +++ b/linguistic/Library_lng.mk @@ -45,18 +45,16 @@ $(eval $(call gb_Library_add_defs,lng,\ )) $(eval $(call gb_Library_add_linked_libs,lng,\ + comphelper \ cppu \ cppuhelper \ - comphelper \ - vos3 \ - tl \ i18nisolang1 \ - svl \ - stl \ sal \ - xo \ + svl \ + tl \ ucbhelper \ utl \ + xo \ $(gb_STDLIBS) \ )) diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk index d3bb35c4fddf..d23347509227 100644 --- a/xmlscript/Library_xcr.mk +++ b/xmlscript/Library_xcr.mk @@ -43,10 +43,10 @@ $(eval $(call gb_Library_add_defs,xcr,\ )) $(eval $(call gb_Library_add_linked_libs,xcr,\ - sal \ + comphelper \ cppu \ cppuhelper \ - stl \ + sal \ $(gb_STDLIBS) \ )) |