If major.minor of required and available glib versions are the same, add

[~andy/gtk] / contrib / gdk-pixbuf-xlib / Makefile.am

diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index af8ab40e2e25fd2fb52267451083c967ac6db937..dabdb52d01fb8878c2d68d14d001e5ddc27c45b6 100644 (file)
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -1,18 +1,19 @@
 lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
 
-INCLUDES = @STRIP_BEGIN@                       \
+INCLUDES = \
        -I$(top_srcdir) -I$(top_builddir)       \
        -I$(top_srcdir)/gdk-pixbuf              \
        -I$(top_srcdir)/contrib                 \
-       @GDK_PIXBUF_XLIB_DEP_CFLAGS@            \
-@STRIP_END@
+       -DGDK_PIXBUF_DISABLE_DEPRECATED         \
+       $(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
 libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
        -export-dynamic                                         \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+       -version-info $(LT_VERSION_INFO)
 
 libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-       @GDK_PIXBUF_XLIB_DEP_LIBS@
+        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+       $(GDK_PIXBUF_XLIB_DEP_LIBS)
 
 libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
        gdk-pixbuf-xlib-private.h       \