diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:07:24 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-07-22 21:07:24 +0200 |
| commit | c81f9104b6b6a91588c7a74bbb50a0c9c9729e1a (patch) | |
| tree | be3b7a4178a549d061ca397081fa5589ddbf8d03 /vcl/Library_vcl.mk | |
| parent | a233dac0653f3f3054f7ad2da114ed989747e89a (diff) | |
postmerge fixes for gnumake4
Diffstat (limited to 'vcl/Library_vcl.mk')
| -rw-r--r-- | vcl/Library_vcl.mk | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 7ca41baa4b62..08ccec94ed3b 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -56,8 +56,7 @@ $(eval $(call gb_Library_set_include,vcl,\ -I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \ )) ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_set_include,vcl,\ - $$(INCLUDE) \ +$(eval $(call gb_Library_add_cxxflags,vcl,\ $$(FONTCONFIG_CFLAGS) \ $$(FREETYPE_CFLAGS) \ )) @@ -200,8 +199,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ endif ifeq ($(GUIBASE),android) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ @@ -473,8 +471,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/components/rasterizer_rsvg \ )) -$(eval $(call gb_Library_set_defs,vcl,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vcl,\ -DENABLE_LIBRSVG \ )) ifeq ($(SYSTEM_CAIRO),YES) @@ -490,8 +487,7 @@ $(eval $(call gb_Library_set_cxxflags,vcl,\ # that point as they occur on the command line, it is pointless to # search the cairo library at that point as no references to cairo # entries have been read from object files yet. -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,vcl,\ $$(CAIRO_LIBS) \ )) @@ -515,8 +511,7 @@ endif endif ifeq ($(GUIBASE),unx) -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,vcl,\ $$(FONTCONFIG_LIBS) \ $$(FREETYPE_LIBS) \ )) @@ -561,7 +556,7 @@ $(eval $(call gb_Library_add_ldflags,vcl,\ )) endif ifeq ($(COM),GCC) -$(eval $(call gb_Library_set_ldflags,vcl,\ +$(eval $(call gb_Library_add_ldflags,vcl,\ $$(LDFLAGS) \ )) endif @@ -585,8 +580,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\ endif ifeq ($(GUIBASE),cocoatouch) -$(eval $(call gb_Library_set_ldflags,vcl,\ - $$(LDFLAGS) \ +$(eval $(call gb_Library_add_ldflags,vcl,\ -framework UIKit \ -framework CoreFoundation \ )) |