projects / packages / gdk-pixbuf.git / blame
| Commit | Line | Data |
|---|---|---|
| 0296f02e JB |
1 | --- gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am.orig 2006-08-27 11:30:25.283051000 +0200 |
| 2 | +++ gdk-pixbuf-0.22.0/gdk-pixbuf/Makefile.am 2006-08-27 11:59:49.269293750 +0200 | |
| 3 | @@ -16,7 +16,8 @@ | |
| 4 | libgdk_pixbuf_xlib.la \ | |
| 5 | $(CANVAS_PIXBUF_LIB) | |
| 6 | ||
| 7 | -libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 $(EXTRA_GNOME_LIBS) | |
| 8 | +libgnomecanvaspixbuf_la_LDFLAGS = -version-info 1:0:0 | |
| 9 | +libgnomecanvaspixbuf_la_LIBADD = libgdk_pixbuf.la $(EXTRA_GNOME_LIBS) | |
| 10 | ||
| 11 | loadersdir = $(libdir)/gdk-pixbuf/loaders | |
| 12 | ||
| 13 | @@ -190,8 +191,8 @@ | |
| 14 | gdk-pixbuf-parse-color.c \ | |
| 15 | $(extra_sources) | |
| 16 | ||
| 17 | -libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(GTK_LIBS) | |
| 18 | -libgdk_pixbuf_la_LIBADD = pixops/libpixops.la | |
| 19 | +libgdk_pixbuf_la_LDFLAGS = -version-info 2:0:0 -export-dynamic | |
| 20 | +libgdk_pixbuf_la_LIBADD = pixops/libpixops.la $(GTK_LIBS) $(GLIB_LIBS) | |
| 21 | ||
| 22 | # | |
| 23 | # The GdkPixbufXlib library | |
| 24 | @@ -211,8 +212,8 @@ | |
| 25 | gdk-pixbuf-parse-color.c \ | |
| 26 | $(extra_sources) | |
| 27 | ||
| 28 | -libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) | |
| 29 | -libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS) | |
| 30 | +libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic | |
| 31 | +libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS) $(GLIB_LIBS) -lX11 | |
| 32 | ||
| 33 | ||
| 34 | libgdk_pixbufinclude_HEADERS = \ | |
| 35 | --- gdk-pixbuf-0.22.0/configure.in.orig 2006-08-27 11:30:25.291052000 +0200 | |
| 36 | +++ gdk-pixbuf-0.22.0/configure.in 2006-08-27 12:08:30.525870250 +0200 | |
| 37 | @@ -272,7 +272,7 @@ | |
| 38 | ||
| 39 | GDK_PIXBUF_XLIB_LIBDIR=$GDK_PIXBUF_LIBDIR | |
| 40 | GDK_PIXBUF_XLIB_INCLUDEDIR=$GDK_PIXBUF_INCLUDEDIR | |
| 41 | -GDK_PIXBUF_XLIB_LIBS="$GLIB_LIBS -lgdk_pixbuf_xlib $X11_LIBS" | |
| 42 | +GDK_PIXBUF_XLIB_LIBS="$GLIB_LIBS -lgdk_pixbuf_xlib -lX11" | |
| 43 | ||
| 44 | GNOMECANVASPIXBUF_LIBDIR=$GDK_PIXBUF_LIBDIR | |
| 45 | GNOMECANVASPIXBUF_INCLUDEDIR=$GDK_PIXBUF_INCLUDEDIR |