summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2010-05-10 17:15:24 +0100
committerRichard Hughes <richard@hughsie.com>2010-05-10 17:15:24 +0100
commit671db307cc0a5eec21e77df21cbd234aa4f53db9 (patch)
treecb3bd10d8cdd64870a84c9a887e72f7e01d7e4f2 /contrib
parente18eb24c1d51327347cc0ccaed7f1deec034045f (diff)
downloadgtk+-671db307cc0a5eec21e77df21cbd234aa4f53db9.tar.gz
Install gdk-pixbuf-xlib-3.0.so.0, although this might be nuked in the near future
Diffstat (limited to 'contrib')
-rw-r--r--contrib/gdk-pixbuf-xlib/Makefile.am14
-rw-r--r--contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in (renamed from contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in)2
2 files changed, 8 insertions, 8 deletions
diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
index 4b89e5172d..9ddcefa7df 100644
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ b/contrib/gdk-pixbuf-xlib/Makefile.am
@@ -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
diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in
index 5c7871d76e..b55d8562b5 100644
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc.in
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in
@@ -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}