Make GTK+ use an external gdk-pixbuf

[~andy/gtk] / modules / engines / pixbuf / Makefile.am

diff --git a/modules/engines/pixbuf/Makefile.am b/modules/engines/pixbuf/Makefile.am
index c641f79abc626754e384ef597c2cb08b3a9f3a83..a3e8eef4cd75f8d4d01e0652fc7e17bce81e05ff 100644 (file)
--- a/modules/engines/pixbuf/Makefile.am
+++ b/modules/engines/pixbuf/Makefile.am
@@ -1,23 +1,22 @@
-if OS_WIN32
+include $(top_srcdir)/Makefile.decl
+
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
 INCLUDES = \
-       -I$(top_srcdir)                                 \
-       -I$(top_srcdir)/gdk                             \
-       -I$(top_builddir)/gdk                           \
-       -DG_DISABLE_DEPRECATED                          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED                 \
-       -DGDK_DISABLE_DEPRECATED                        \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/gdk             \
+       -I$(top_builddir)/gdk           \
+       -DGDK_DISABLE_DEPRECATED        \
        $(GTK_DEP_CFLAGS)
 
 LDADDS = \
-       $(GTK_DEP_LIBS)                                 \
-        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-2.0.la \
-       $(top_builddir)/gdk/$(gdktargetlib)             \
-       $(top_builddir)/gtk/$(gtktargetlib)             
+       $(GTK_DEP_LIBS)                                                 \
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(top_builddir)/gtk/$(gtktargetlib)
 
-enginedir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/engines
+enginedir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/engines
 
 engine_LTLIBRARIES = libpixmap.la
 
@@ -33,3 +32,5 @@ libpixmap_la_SOURCES =                \
 libpixmap_la_LDFLAGS =  -avoid-version -module $(no_undefined)
 libpixmap_la_LIBADD = $(LDADDS)
 
+
+-include $(top_srcdir)/git.mk