]> Pileus Git - ~andy/gtk/commitdiff
Install gdk-pixbuf-xlib-3.0.so.0, although this might be nuked in the near future
authorRichard Hughes <richard@hughsie.com>
Mon, 10 May 2010 16:15:24 +0000 (17:15 +0100)
committerRichard Hughes <richard@hughsie.com>
Mon, 10 May 2010 16:15:24 +0000 (17:15 +0100)
contrib/gdk-pixbuf-xlib/Makefile.am
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in [moved from contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in with 80% similarity]

index 4b89e5172d85e2a28c041c87d2f362e248aea31c..9ddcefa7df3087494833d198306870e6b3899a77 100644 (file)
@@ -4,7 +4,7 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
+lib_LTLIBRARIES=libgdk_pixbuf_xlib-3.0.la
 
 INCLUDES = \
        -I$(top_srcdir) -I$(top_builddir)       \
@@ -12,31 +12,31 @@ INCLUDES = \
        -I$(top_srcdir)/contrib                 \
        $(GDK_PIXBUF_XLIB_DEP_CFLAGS)
 
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
+libgdk_pixbuf_xlib_3_0_la_LDFLAGS =         \
        -export-dynamic                                         \
        $(no_undefined)                                         \
        -version-info $(LT_VERSION_INFO)
 
-libgdk_pixbuf_xlib_2_0_la_LIBADD = \
+libgdk_pixbuf_xlib_3_0_la_LIBADD = \
         $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
        $(GDK_PIXBUF_XLIB_DEP_LIBS)
 
-libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
+libgdk_pixbuf_xlib_3_0_la_SOURCES =         \
        gdk-pixbuf-xlib-private.h       \
         gdk-pixbuf-xlib.c               \
         gdk-pixbuf-xlib-render.c        \
         gdk-pixbuf-xlib-drawable.c      \
         gdk-pixbuf-xlibrgb.c
 
-libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-2.0/gdk-pixbuf-xlib
+libgdk_pixbuf_xlibincludedir=$(includedir)/gtk-3.0/gdk-pixbuf-xlib
 
 libgdk_pixbuf_xlibinclude_HEADERS =                    \
         gdk-pixbuf-xlib.h                              \
         gdk-pixbuf-xlibrgb.h
 
 pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
+pkgconfig_DATA = gdk-pixbuf-xlib-3.0.pc
 
-EXTRA_DIST += gdk-pixbuf-xlib-2.0.pc.in
+EXTRA_DIST += gdk-pixbuf-xlib-3.0.pc.in
 
 -include $(top_srcdir)/git.mk
similarity index 80%
rename from contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
rename to contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in
index 5c7871d76eab602b616c89d5f9892fa594ffd88b..b55d8562b5351dc8da7a3a0380fe19010169d4f4 100644 (file)
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: GdkPixbuf Xlib
 Description: GdkPixbuf rendering for Xlib
 Version: @VERSION@
-Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-2.0
+Requires: gobject-2.0,gmodule-no-export-2.0,gdk-pixbuf-3.0
 Libs: -L${libdir} -lgdk_pixbuf_xlib-@GTK_API_VERSION@
 Cflags: -I${includedir}