diff options
| author | Michael Stahl <mst@openoffice.org> | 2011-04-01 20:49:35 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-17 09:55:38 +0200 |
| commit | 990111d87aa2589a93455828aa59352ba7ee25d2 (patch) | |
| tree | 29b07fbc1819863f8964bf5b267c2e7cc647a9a7 /canvas | |
| parent | f3ef6ed5400ae3cb024a889a9688cf52f2eccab7 (diff) | |
gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_cairocanvas.mk | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk index 1bfd3c7dce1b..02b7fc323a59 100644 --- a/canvas/Library_cairocanvas.mk +++ b/canvas/Library_cairocanvas.mk @@ -47,22 +47,6 @@ $(eval $(call gb_Library_set_defs,cairocanvas,\ )) endif -ifeq ($(SYSTEM_CAIRO),YES) -# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used -# $(CAIRO_CFLAGS) currently not set; taking usr/include directly -$(eval $(call gb_Library_set_include,cairocanvas,\ - $$(INCLUDE) \ - $(FREETYPE_CFLAGS) \ - -I/usr/include \ -)) -else -$(eval $(call gb_Library_set_include,cairocanvas,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/cairo \ - $(FREETYPE_CFLAGS) \ -)) -endif - $(eval $(call gb_Library_add_linked_libs,cairocanvas,\ sal \ stl \ @@ -96,6 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_textlayout \ )) +$(call gb_Library_use_external,cairocanvas,cairo) ifeq ($(OS),WNT) @@ -103,18 +88,12 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_win32_cairo \ )) $(eval $(call gb_Library_add_linked_libs,cairocanvas,\ - cairo \ gdi32 \ user32 \ )) else -$(eval $(call gb_Library_add_linked_libs,cairocanvas,\ - cairo \ - pixman-1 \ -)) - ifeq ($(OS),MACOSX) $(eval $(call gb_Library_add_exception_objects,cairocanvas,\ canvas/source/cairo/cairo_quartz_cairo \ |