119 lines
4.5 KiB
Plaintext
119 lines
4.5 KiB
Plaintext
--- gdk-pixbuf/Makefile.in.orig Sat Oct 5 01:29:29 2002
|
|
+++ gdk-pixbuf/Makefile.in Sat Oct 5 01:32:30 2002
|
|
@@ -132,71 +132,71 @@
|
|
# The PNG plugin.
|
|
#
|
|
libpixbufloader_png_la_SOURCES = io-png.c
|
|
-libpixbufloader_png_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_png_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The JPEG loader
|
|
#
|
|
libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
|
|
-libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The XPM loader
|
|
#
|
|
libpixbufloader_xpm_la_SOURCES = io-xpm.c
|
|
-libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The GIF loader
|
|
#
|
|
libpixbufloader_gif_la_SOURCES = io-gif.c
|
|
-libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The ICO loader
|
|
#
|
|
libpixbufloader_ico_la_SOURCES = io-ico.c
|
|
-libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The RAS loader
|
|
#
|
|
libpixbufloader_ras_la_SOURCES = io-ras.c
|
|
-libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The TIFF loader
|
|
#
|
|
libpixbufloader_tiff_la_SOURCES = io-tiff.c
|
|
-libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The PNM loader
|
|
#
|
|
libpixbufloader_pnm_la_SOURCES = io-pnm.c
|
|
-libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The BMP loader
|
|
#
|
|
libpixbufloader_bmp_la_SOURCES = io-bmp.c
|
|
-libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
#
|
|
# The XBM loader
|
|
#
|
|
libpixbufloader_xbm_la_SOURCES = io-xbm.c
|
|
-libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
|
|
-libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
|
|
+libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module
|
|
+libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
@HAVE_PNG_TRUE@PNG_LIB = @HAVE_PNG_TRUE@libpixbufloader-png.la
|
|
|
|
@@ -259,11 +259,11 @@
|
|
|
|
LDADDS = libgdk_pixbuf.la $(GLIB_LIBS) $(GTK_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
-test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
|
|
-testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
|
|
+test_gdk_pixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
|
|
+testpixbuf_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
|
|
testpixbuf_drawable_LDADD = $(LDADDS) $(GNOME_LIBS)
|
|
testpixbuf_scale_LDADD = $(LDADDS) $(GNOME_LIBS)
|
|
-testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) -lgmodule
|
|
+testanimation_LDADD = $(LDADDS) $(GNOME_LIBS) `$(GLIB_CONFIG) --libs gmodule`
|
|
|
|
GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(GTK_LIBS)
|
|
|
|
@@ -400,7 +400,7 @@
|
|
libpixbufloader_bmp_la_OBJECTS = io-bmp.lo
|
|
libpixbufloader_xbm_la_DEPENDENCIES = libgdk_pixbuf.la
|
|
libpixbufloader_xbm_la_OBJECTS = io-xbm.lo
|
|
-noinst_PROGRAMS = test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
|
|
+noinst_PROGRAMS = # test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
|
|
testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \
|
|
testpixbuf-scale$(EXEEXT)
|
|
PROGRAMS = $(noinst_PROGRAMS)
|