You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/11/15 00:39:13 UTC
svn commit: r1409563 - in /incubator/ooo/branches/gbuild/main/vcl:
Library_vcl.mk Library_vclplug_gen.mk Library_vclplug_gtk.mk
Library_vclplug_kde.mk Library_vclplug_kde4.mk
Author: arist
Date: Wed Nov 14 23:39:12 2012
New Revision: 1409563
URL: http://svn.apache.org/viewvc?rev=1409563&view=rev
Log:
gnumake4_077_4a760b654a05.patch
# HG changeset patch
# User Michael Stahl <ms...@openoffice.org>
# Date 1302711099 0
# Node ID 4a760b654a0515071cd40c04829a752a7ddf2db1
# Parent dc0c2c602eb848b7f81754f62496775f18932561
gnumake4: vcl: adapt makefiles to gnumake4 changes
Modified:
incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk
incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk?rev=1409563&r1=1409562&r2=1409563&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vcl.mk Wed Nov 14 23:39:12 2012
@@ -47,11 +47,11 @@ $(eval $(call gb_Library_set_include,vcl
-I$(SRCDIR)/solenv/inc \
-I$(OUTDIR)/inc/stl \
-I$(OUTDIR)/inc \
- $$(FREETYPE_CFLAGS) \
))
ifeq ($(GUIBASE),unx)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vcl,\
+ $$(INCLUDE) \
+ $$(FREETYPE_CFLAGS) \
))
endif
@@ -91,20 +91,15 @@ endif
ifeq ($(GUIBASE),os2)
# YD FIXME this is not working... needs ldflags hack...
-$(eval $(call gb_Library_add_linked_libs,vcl,\
- ft2lib \
-))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
-lft2lib \
))
endif
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
- $$(CXXFLAGS) \
- $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+ $(gb_OBJCXXFLAGS) \
))
ifeq ($(ENABLE_CAIRO),TRUE)
$(eval $(call gb_Library_set_defs,vcl,\
@@ -479,8 +474,7 @@ $(eval $(call gb_Library_add_exception_o
vcl/source/glyphs/graphite_serverfont \
))
ifeq ($(SYSTEM_GRAPHITE),YES)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
$(GRAPHITE_LIBS) \
))
else
@@ -507,13 +501,11 @@ endif
ifeq ($(OS),SOLARIS)
ifeq ($(CPUNAME)$(CPU),SPARCU)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib/64 \
))
else
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-R/usr/sfw/lib \
))
endif
@@ -523,8 +515,7 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_linked_libs,vcl,\
AppleRemote \
))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vcl,\
-framework QuickTime \
-framework Cocoa \
-framework Carbon \
@@ -534,8 +525,7 @@ endif
ifeq ($(OS),WNT)
ifeq ($(USE_MINGW),)
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain@12 \
))
endif
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk?rev=1409563&r1=1409562&r2=1409563&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gen.mk Wed Nov 14 23:39:12 2012
@@ -126,12 +126,11 @@ $(eval $(call gb_Library_set_defs,vclplu
-DUSE_RANDR \
))
ifeq ($(XRANDR_DLOPEN),FALSE)
-$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+ $$(INCLUDE) \
$$(XRANDR_CFLAGS) \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
$(XRANDR_LIBS) \
))
else
@@ -152,13 +151,11 @@ $(eval $(call gb_Library_set_defs,vclplu
-DUSE_XINERAMA_XORG \
))
ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
))
else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
))
endif
@@ -172,13 +169,11 @@ $(eval $(call gb_Library_set_defs,vclplu
ifeq ($(USE_XINERAMA_VERSION),Xorg)
# Solaris, Xorg
ifeq ($(XINERAMA_LINK),dynamic)
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-lXinerama \
))
else
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
-Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
))
endif
@@ -192,8 +187,7 @@ $(eval $(call gb_Library_set_defs,vclplu
$$(DEFS) \
-DXRENDER_LINK \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_gen,\
$(shell pkg-config --libs xrender) \
))
endif
@@ -204,13 +198,13 @@ $(eval $(call gb_Library_add_linked_libs
m \
pthread \
))
-$(eval $(call gb_Library_add_external_libs,vclplug_gen, \
- Xinerama Xrandr \
+$(eval $(call gb_Library_add_libs,vclplug_gen, \
+ -lXinerama -lXrandr \
))
endif
ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Library_add_external_libs,vclplug_gen, \
- Xinerama Xrandr \
+$(eval $(call gb_Library_add_libs,vclplug_gen, \
+ -lXinerama -lXrandr \
))
endif
# vim: set noet sw=4 ts=4:
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk?rev=1409563&r1=1409562&r2=1409563&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_gtk.mk Wed Nov 14 23:39:12 2012
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+ $$(INCLUDE) \
$$(GTK_CFLAGS) \
))
@@ -57,23 +57,14 @@ $(eval $(call gb_Library_set_defs,vclplu
$$(DEFS) \
-DENABLE_DBUS \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
- $$(LDFLAGS) \
- $(filter-out -l%,$(shell pkg-config --libs dbus-glib-1)) \
-))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \
- $(patsubst -l%,%, $(filter -l%, $(shell pkg-config --libs dbus-glib-1))) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+ $(shell pkg-config --libs dbus-glib-1) \
))
endif
-$(eval $(call gb_Library_set_ldflags,vclplug_gtk, \
- $$(LDFLAGS) \
- $(filter-out -l%,$(GTK_LIBS)) \
- $(filter-out -l%,$(GTHREAD_LIBS)) \
-))
-$(eval $(call gb_Library_add_external_libs,vclplug_gtk, \
- $(patsubst -l%,%, $(filter -l%, $(GTK_LIBS))) \
- $(patsubst -l%,%, $(filter -l%, $(GTHREAD_LIBS))) \
+$(eval $(call gb_Library_add_libs,vclplug_gtk,\
+ $(GTK_LIBS) \
+ $(GTHREAD_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk?rev=1409563&r1=1409562&r2=1409563&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde.mk Wed Nov 14 23:39:12 2012
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+ $$(INCLUDE) \
$$(KDE_CFLAGS) \
))
@@ -47,9 +47,8 @@ $(eval $(call gb_Library_set_defs,vclplu
-DVCLPLUG_KDE_IMPLEMENTATION \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
- $$(KDE_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde,\
+ $$(KDE_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
Modified: incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk?rev=1409563&r1=1409562&r2=1409563&view=diff
==============================================================================
--- incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk (original)
+++ incubator/ooo/branches/gbuild/main/vcl/Library_vclplug_kde4.mk Wed Nov 14 23:39:12 2012
@@ -37,8 +37,8 @@ $(eval $(call gb_Library_set_include,vcl
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+ $$(INCLUDE) \
$$(KDE4_CFLAGS) \
))
@@ -47,9 +47,8 @@ $(eval $(call gb_Library_set_defs,vclplu
-DVCLPLUG_KDE4_IMPLEMENTATION \
))
-$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
- $$(KDE4_LIBS)\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_libs,vclplug_kde4,\
+ $$(KDE4_LIBS) \
))
$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\