2001-09-19 02:10:45 +00:00
|
|
|
|
2000-01-05 21:33:58 +00:00
|
|
|
SUBDIRS = pixops
|
|
|
|
|
2001-10-29 06:48:04 +00:00
|
|
|
if PLATFORM_WIN32
|
|
|
|
no_undefined = -no-undefined
|
|
|
|
endif
|
|
|
|
|
|
|
|
if OS_WIN32
|
|
|
|
gdk_pixbuf_def = gdk_pixbuf.def
|
|
|
|
gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def)
|
|
|
|
|
2002-03-02 23:19:59 +00:00
|
|
|
gdk_pixbuf_win32res_lo = gdk_pixbuf-win32res.lo
|
|
|
|
|
|
|
|
gdk_pixbuf-win32res.lo : gdk_pixbuf.rc
|
|
|
|
$(top_srcdir)/build/win32/lt-compile-resource gdk_pixbuf.rc gdk_pixbuf-win32res.lo
|
|
|
|
|
2001-10-29 06:48:04 +00:00
|
|
|
install-libtool-import-lib:
|
2002-03-05 21:04:09 +00:00
|
|
|
$(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
|
2001-10-29 06:48:04 +00:00
|
|
|
uninstall-libtool-import-lib:
|
2002-04-18 11:21:21 +00:00
|
|
|
-rm $(DESTDIR)$(libdir)/libgdk_pixbuf-$(GTK_API_VERSION).dll.a
|
2001-10-29 06:48:04 +00:00
|
|
|
else
|
|
|
|
install-libtool-import-lib:
|
|
|
|
uninstall-libtool-import-lib:
|
|
|
|
endif
|
|
|
|
|
|
|
|
if MS_LIB_AVAILABLE
|
2002-03-05 21:04:09 +00:00
|
|
|
noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
|
2001-10-29 06:48:04 +00:00
|
|
|
|
2002-03-05 21:04:09 +00:00
|
|
|
gdk_pixbuf-$(GTK_API_VERSION).lib: libgdk_pixbuf-$(GTK_API_VERSION).la gdk_pixbuf.def
|
|
|
|
lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
|
2001-10-29 06:48:04 +00:00
|
|
|
|
|
|
|
install-ms-lib:
|
2002-03-05 21:04:09 +00:00
|
|
|
$(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
|
2001-10-29 06:48:04 +00:00
|
|
|
|
|
|
|
uninstall-ms-lib:
|
2002-03-05 21:04:09 +00:00
|
|
|
-rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).lib
|
2001-10-29 06:48:04 +00:00
|
|
|
else
|
|
|
|
install-ms-lib:
|
|
|
|
uninstall-ms-lib:
|
|
|
|
endif
|
|
|
|
|
1999-07-12 20:27:50 +00:00
|
|
|
lib_LTLIBRARIES = \
|
2002-03-05 21:04:09 +00:00
|
|
|
libgdk_pixbuf-2.0.la
|
1999-07-12 20:27:50 +00:00
|
|
|
|
2002-03-05 15:40:48 +00:00
|
|
|
loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
|
1999-07-12 20:27:50 +00:00
|
|
|
|
2002-03-05 21:04:09 +00:00
|
|
|
module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
|
2001-05-16 18:51:07 +00:00
|
|
|
|
2000-02-22 00:29:00 +00:00
|
|
|
#
|
|
|
|
# The PNG plugin.
|
|
|
|
#
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_png_la_SOURCES = io-png.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs)
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_png_la_SOURCES = io-png.c
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The JPEG loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_jpeg_la_SOURCES = io-jpeg.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The XPM loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_xpm_la_SOURCES = io-xpm.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_xpm_la_SOURCES = io-xpm.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_xpm_la_LIBADD = $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The GIF loader
|
|
|
|
#
|
2001-05-07 15:58:47 +00:00
|
|
|
libpixbufloader_static_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
|
|
|
|
libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_gif_la_LIBADD = $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The ICO loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_ico_la_SOURCES = io-ico.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_ico_la_SOURCES = io-ico.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_ico_la_LIBADD = $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The RAS loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_ras_la_SOURCES = io-ras.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_ras_la_SOURCES = io-ras.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_ras_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_ras_la_LIBADD = $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The TIFF loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_tiff_la_SOURCES = io-tiff.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_tiff_la_SOURCES = io-tiff.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The PNM loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_pnm_la_SOURCES = io-pnm.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_pnm_la_SOURCES = io-pnm.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_pnm_la_LIBADD = $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
#
|
|
|
|
# The BMP loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_bmp_la_SOURCES = io-bmp.c
|
2000-04-13 01:18:41 +00:00
|
|
|
libpixbufloader_bmp_la_SOURCES = io-bmp.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_bmp_la_LIBADD = $(module_libs)
|
2000-02-22 00:29:00 +00:00
|
|
|
|
2000-07-28 00:09:36 +00:00
|
|
|
#
|
|
|
|
# The WBMP loader
|
|
|
|
#
|
2001-01-09 09:53:28 +00:00
|
|
|
libpixbufloader_static_wbmp_la_SOURCES = io-wbmp.c
|
2000-07-28 00:09:36 +00:00
|
|
|
libpixbufloader_wbmp_la_SOURCES = io-wbmp.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_wbmp_la_LIBADD = $(module_libs)
|
2000-07-28 00:09:36 +00:00
|
|
|
|
2001-01-22 02:08:53 +00:00
|
|
|
#
|
|
|
|
# The XBM loader
|
|
|
|
#
|
2002-02-01 23:59:52 +00:00
|
|
|
libpixbufloader_static_xbm_la_SOURCES = io-xbm.c
|
2001-01-22 02:08:53 +00:00
|
|
|
libpixbufloader_xbm_la_SOURCES = io-xbm.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-05-16 18:51:07 +00:00
|
|
|
libpixbufloader_xbm_la_LIBADD = $(module_libs)
|
2001-01-22 02:08:53 +00:00
|
|
|
|
2001-08-21 08:51:06 +00:00
|
|
|
#
|
|
|
|
# The TGA loader
|
|
|
|
#
|
2002-02-01 23:59:52 +00:00
|
|
|
libpixbufloader_static_tga_la_SOURCES = io-tga.c
|
2001-08-21 08:51:06 +00:00
|
|
|
libpixbufloader_tga_la_SOURCES = io-tga.c
|
2001-10-29 06:48:04 +00:00
|
|
|
libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined)
|
2001-08-21 08:51:06 +00:00
|
|
|
libpixbufloader_tga_la_LIBADD = $(module_libs)
|
|
|
|
|
1999-07-26 06:39:39 +00:00
|
|
|
if HAVE_PNG
|
2000-04-13 01:18:41 +00:00
|
|
|
PNG_LIB = libpixbufloader-png.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_PNG_LIB = libpixbufloader-static-png.la
|
1999-07-26 06:39:39 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
if HAVE_JPEG
|
2000-04-13 01:18:41 +00:00
|
|
|
JPEG_LIB = libpixbufloader-jpeg.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_JPEG_LIB = libpixbufloader-static-jpeg.la
|
1999-07-26 06:39:39 +00:00
|
|
|
endif
|
|
|
|
|
2000-04-13 01:18:41 +00:00
|
|
|
GIF_LIB = libpixbufloader-gif.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_GIF_LIB = libpixbufloader-static-gif.la
|
1999-07-26 06:39:39 +00:00
|
|
|
|
2000-04-13 01:18:41 +00:00
|
|
|
ICO_LIB = libpixbufloader-ico.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_ICO_LIB = libpixbufloader-static-ico.la
|
1999-11-29 16:49:39 +00:00
|
|
|
|
2000-04-13 01:18:41 +00:00
|
|
|
RAS_LIB = libpixbufloader-ras.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_RAS_LIB = libpixbufloader-static-ras.la
|
1999-11-05 20:37:08 +00:00
|
|
|
|
1999-07-26 06:39:39 +00:00
|
|
|
if HAVE_TIFF
|
2000-04-13 01:18:41 +00:00
|
|
|
TIFF_LIB = libpixbufloader-tiff.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_TIFF_LIB = libpixbufloader-static-tiff.la
|
1999-07-26 06:39:39 +00:00
|
|
|
endif
|
|
|
|
|
2000-04-13 01:18:41 +00:00
|
|
|
XPM_LIB = libpixbufloader-xpm.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_XPM_LIB = libpixbufloader-static-xpm.la
|
1999-07-26 06:39:39 +00:00
|
|
|
|
2000-04-13 01:18:41 +00:00
|
|
|
PNM_LIB = libpixbufloader-pnm.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_PNM_LIB = libpixbufloader-static-pnm.la
|
1999-11-09 23:51:35 +00:00
|
|
|
|
2000-04-13 01:18:41 +00:00
|
|
|
BMP_LIB = libpixbufloader-bmp.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_BMP_LIB = libpixbufloader-static-bmp.la
|
1999-11-21 21:28:28 +00:00
|
|
|
|
2000-07-28 00:09:36 +00:00
|
|
|
WBMP_LIB = libpixbufloader-wbmp.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_WBMP_LIB = libpixbufloader-static-wbmp.la
|
2000-07-28 00:09:36 +00:00
|
|
|
|
2001-01-22 02:08:53 +00:00
|
|
|
XBM_LIB = libpixbufloader-xbm.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_XBM_LIB = libpixbufloader-static-xbm.la
|
2001-01-22 02:08:53 +00:00
|
|
|
|
2001-08-21 08:51:06 +00:00
|
|
|
TGA_LIB = libpixbufloader-tga.la
|
2002-05-07 12:59:18 +00:00
|
|
|
STATIC_TGA_LIB = libpixbufloader-static-tga.la
|
2001-08-21 08:51:06 +00:00
|
|
|
|
2000-02-22 00:29:00 +00:00
|
|
|
if BUILD_DYNAMIC_MODULES
|
|
|
|
|
2000-07-14 20:08:10 +00:00
|
|
|
loader_LTLIBRARIES = \
|
1999-07-26 06:39:39 +00:00
|
|
|
$(PNG_LIB) \
|
|
|
|
$(JPEG_LIB) \
|
|
|
|
$(GIF_LIB) \
|
1999-11-29 16:49:39 +00:00
|
|
|
$(ICO_LIB) \
|
1999-11-05 20:37:08 +00:00
|
|
|
$(RAS_LIB) \
|
1999-07-26 06:39:39 +00:00
|
|
|
$(XPM_LIB) \
|
1999-11-09 23:51:35 +00:00
|
|
|
$(TIFF_LIB) \
|
1999-11-21 21:28:28 +00:00
|
|
|
$(PNM_LIB) \
|
2000-07-28 00:09:36 +00:00
|
|
|
$(BMP_LIB) \
|
2001-01-22 02:08:53 +00:00
|
|
|
$(WBMP_LIB) \
|
2001-08-21 08:51:06 +00:00
|
|
|
$(XBM_LIB) \
|
|
|
|
$(TGA_LIB)
|
1999-07-12 20:27:50 +00:00
|
|
|
|
2000-02-22 00:29:00 +00:00
|
|
|
|
|
|
|
extra_sources =
|
2001-01-09 09:53:28 +00:00
|
|
|
builtin_objs =
|
2000-02-22 00:29:00 +00:00
|
|
|
else
|
2000-07-14 20:08:10 +00:00
|
|
|
loader_LTLIBRARIES =
|
2000-02-22 00:29:00 +00:00
|
|
|
|
2002-05-07 12:59:18 +00:00
|
|
|
noinst_LTLIBRARIES = \
|
|
|
|
$(STATIC_PNG_LIB) \
|
|
|
|
$(STATIC_JPEG_LIB) \
|
|
|
|
$(STATIC_GIF_LIB) \
|
|
|
|
$(STATIC_ICO_LIB) \
|
|
|
|
$(STATIC_RAS_LIB) \
|
|
|
|
$(STATIC_XPM_LIB) \
|
|
|
|
$(STATIC_TIFF_LIB) \
|
|
|
|
$(STATIC_PNM_LIB) \
|
|
|
|
$(STATIC_BMP_LIB) \
|
|
|
|
$(STATIC_WBMP_LIB) \
|
|
|
|
$(STATIC_XBM_LIB) \
|
|
|
|
$(STATIC_TGA_LIB)
|
2001-01-09 09:53:28 +00:00
|
|
|
|
|
|
|
builtin_objs = @INCLUDED_LOADER_OBJ@
|
|
|
|
|
2000-02-22 00:29:00 +00:00
|
|
|
endif
|
|
|
|
|
2002-03-05 21:04:09 +00:00
|
|
|
DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
|
2001-12-12 22:20:36 +00:00
|
|
|
INCLUDES = @STRIP_BEGIN@ \
|
|
|
|
-DG_LOG_DOMAIN=\"GdkPixbuf\" \
|
2001-06-26 20:56:32 +00:00
|
|
|
-I$(top_srcdir) -I$(top_builddir) \
|
2001-05-03 20:11:14 +00:00
|
|
|
-I$(top_srcdir)/gdk-pixbuf \
|
|
|
|
-I$(top_builddir)/gdk-pixbuf \
|
2001-10-29 06:48:04 +00:00
|
|
|
-DGTK_VERSION=\"@GTK_VERSION@\" \
|
Remove assorted G_OBJECT casts where unnecessary.
2001-12-13 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk-pixbuf-animation.c, gdk-pixbuf-loader.c, gdk-pixpuf.c,
io-gif-animation.c, io-gif.c, io-tiff.c, test-loaders.c: Remove
assorted G_OBJECT casts where unnecessary.
* gdk-pixbuf-loader.c: Call g_object_ref and g_object_unref
instead of gdk_pixbuf_animation_ref and gdk_pixbuf_animation_unref
resp.
* gdk-pixbuf-csource.c, io-bmp.c, io-gif-animation.c, io-ico.c,
io-jpeg.c, io-png.c, io-pnm.c, io-ras.c, io-tga.c, io-wbmp.c,
io-xbm.c, io-xpm.c, test-gdk-pixbuf.c: Dito for gdk_pixbuf_ref and
gdk_pixbuf_unref.
* Makefile.am, pixops/Makefile.am: Compile everything with
-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
* gdk-pixdata.c: Use g_ascii_strup() instead of g_strup().
* io-xpm.c: Use g_ascii_strcasecmp() instead of g_strcasecmp().
* demos/testpixbuf-drawable.c, demos/testpixbuf-save.c,
demos/testpixbuf-scale.c, demos/testpixbuf.c: Call g_object_ref
and g_object_unref instead of gdk_pixbuf_ref and gdk_pixbuf_unref
resp.
2001-12-13 21:22:12 +00:00
|
|
|
-DG_DISABLE_DEPRECATED \
|
|
|
|
-DGDK_PIXBUF_DISABLE_DEPRECATED \
|
2001-05-03 20:11:14 +00:00
|
|
|
@INCLUDED_LOADER_DEFINE@ \
|
|
|
|
@GTK_DEBUG_FLAGS@ \
|
2001-06-26 20:56:32 +00:00
|
|
|
@GDK_PIXBUF_DEP_CFLAGS@ \
|
|
|
|
@STRIP_END@
|
|
|
|
|
2001-06-01 23:05:46 +00:00
|
|
|
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
|
2002-03-05 21:04:09 +00:00
|
|
|
LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
|
2000-01-10 21:28:03 +00:00
|
|
|
|
2002-05-05 00:59:42 +00:00
|
|
|
noinst_PROGRAMS = test-gdk-pixbuf
|
2000-07-22 15:21:31 +00:00
|
|
|
test_gdk_pixbuf_LDADD = $(LDADDS)
|
1999-12-17 21:42:47 +00:00
|
|
|
|
2001-06-26 20:56:32 +00:00
|
|
|
bin_PROGRAMS = gdk-pixbuf-csource
|
|
|
|
gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
|
|
|
|
gdk_pixbuf_csource_LDADD = $(LDADDS)
|
2001-06-01 23:05:46 +00:00
|
|
|
|
2001-09-04 01:10:11 +00:00
|
|
|
#
|
|
|
|
# manual pages to install
|
|
|
|
#
|
|
|
|
man_MANS = gdk-pixbuf-csource.1
|
|
|
|
|
2001-06-01 23:05:46 +00:00
|
|
|
|
1999-01-05 21:27:07 +00:00
|
|
|
#
|
|
|
|
# The GdkPixBuf library
|
|
|
|
#
|
2000-07-14 20:08:10 +00:00
|
|
|
libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
|
2002-03-05 21:04:09 +00:00
|
|
|
libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
|
2000-10-06 18:19:18 +00:00
|
|
|
gdk-pixbuf-i18n.h \
|
1999-01-04 23:53:12 +00:00
|
|
|
gdk-pixbuf.c \
|
2000-01-02 03:59:22 +00:00
|
|
|
gdk-pixbuf-animation.c \
|
1999-10-27 23:36:44 +00:00
|
|
|
gdk-pixbuf-data.c \
|
1999-10-08 23:01:05 +00:00
|
|
|
gdk-pixbuf-io.c \
|
Add built marshaller files to support GdkPixbufLoader signals
2001-01-22 Havoc Pennington <hp@redhat.com>
* Makefile.am: Add built marshaller files to support
GdkPixbufLoader signals
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): have
GDK_PIXBUF_MODULEDIR unconditionally replace the compiled-in
module location, rather than acting as a fallback, because we are
using GDK_PIXBUF_MODULEDIR to use gdk-pixbuf before installing it.
* gdk-pixbuf.h: include gdk-pixbuf-loader.h
* gdk-pixbuf-loader.h, gdk-pixbuf-loader.c: Move back over here
from gtk, and add error to close(), because stop_load may do
parsing of the image.
* pixops/have_mmx.S (_pixops_have_mmx): add newline at end of file
* io-*.c: make individual operations static, and add fill_vtable
functions which are exported. Fix the collection of type warnings
that surfaced, including a number of functions that didn't
properly take a GError and some that weren't
const-correct. Involved adding error handling for a few loaders.
* gdk-pixbuf-io.h: Add error reporting to stop_load function
* gdk-pixbuf-io.c (gdk_pixbuf_load_module): change to just look up
a function that fills in the GdkPixbufModule vtable, instead of
looking up all the image functions individually; this means we
can get type safety within modules for the loader functions.
Also it means you don't have to keep the statically compiled and
GModule versions in sync.
* test-gdk-pixbuf.c (main): remove gdk_pixbuf_init()
* make-inline-pixbuf.c (main): remove call to gdk_pixbuf_init()
* gdk-pixbuf.h: nuke gdk_pixbuf_init()
* gdk-pixbuf-animation.c (gdk_pixbuf_frame_get_type): g_type_init
() here
* gdk-pixbuf.c (gdk_pixbuf_get_type): g_type_init () here
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_get_type):
g_type_init() here
2001-01-22 Havoc Pennington <hp@redhat.com>
* demos/testanimation.c: fix to reflect gdk-pixbuf changes
* demos/testpixbuf.c: fix to reflect gdk-pixbuf changes
* gtk/gdk-pixbuf-loader.c, gtk/gdk-pixbuf-loader.h:
Remove, move back to gdk-pixbuf
* gtk/gtktextiter.c, gtk/gtktextiter.h: add sentence equivalents
to all the word functions
* gtk/gtktextview.c (gtk_text_view_start_cursor_blink): return
before doing anything on NULL layout or if we don't have the focus
* gtk/testtext.c (fill_example_buffer): "justification"
* gtk/gtktexttag.h, gtk/gtktexttag.c: change the tag attribute
to be called "justification" not "justify"
* demos/gtk-demo/textview.c (create_tags): "justification"
* gtk/gtktextlayout.c (set_para_values): Handle char-wise wrapping
2001-01-22 23:09:48 +00:00
|
|
|
gdk-pixbuf-loader.c \
|
2000-01-05 21:33:58 +00:00
|
|
|
gdk-pixbuf-scale.c \
|
2001-06-26 20:56:32 +00:00
|
|
|
gdk-pixbuf-util.c \
|
|
|
|
gdk-pixdata.c \
|
2001-09-16 23:54:37 +00:00
|
|
|
$(gdk_pixbuf_built_cfiles) \
|
2001-06-26 20:56:32 +00:00
|
|
|
@STRIP_END@
|
2002-03-05 21:04:09 +00:00
|
|
|
libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
|
2000-07-06 15:50:54 +00:00
|
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
2001-06-26 20:56:32 +00:00
|
|
|
@LIBTOOL_EXPORT_OPTIONS@ \
|
2001-10-29 06:48:04 +00:00
|
|
|
$(no_undefined) \
|
|
|
|
$(gdk_pixbuf_symbols) \
|
2001-06-26 20:56:32 +00:00
|
|
|
@STRIP_END@
|
|
|
|
|
2002-03-05 21:04:09 +00:00
|
|
|
libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
|
|
|
|
libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def)
|
2000-01-05 21:33:58 +00:00
|
|
|
|
2001-09-19 04:34:55 +00:00
|
|
|
gdk_pixbuf_headers = \
|
|
|
|
gdk-pixbuf.h \
|
|
|
|
gdk-pixbuf-loader.h
|
2001-09-16 23:54:37 +00:00
|
|
|
|
2001-09-19 04:34:55 +00:00
|
|
|
libgdk_pixbufinclude_HEADERS = \
|
2001-09-16 23:54:37 +00:00
|
|
|
$(gdk_pixbuf_headers) \
|
|
|
|
$(gdk_pixbuf_built_headers) \
|
2001-09-19 04:34:55 +00:00
|
|
|
gdk-pixbuf-features.h \
|
2001-06-26 20:56:32 +00:00
|
|
|
gdk-pixdata.h
|
1999-01-05 21:27:07 +00:00
|
|
|
|
2000-04-11 07:03:25 +00:00
|
|
|
noinst_HEADERS = \
|
|
|
|
gdk-pixbuf-io.h \
|
|
|
|
gdk-pixbuf-private.h
|
2000-07-22 23:50:19 +00:00
|
|
|
|
2001-09-19 02:10:45 +00:00
|
|
|
gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h gdk-pixbuf-marshal.h
|
2001-09-19 04:34:55 +00:00
|
|
|
gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c
|
2002-03-05 21:04:09 +00:00
|
|
|
$(libgdk_pixbuf_2_0_la_OBJECTS) $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
|
2001-09-16 23:54:37 +00:00
|
|
|
|
2001-09-19 04:34:55 +00:00
|
|
|
CLEANFILES =
|
|
|
|
MAINTAINERCLEANFILES = $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
|
|
|
|
|
|
|
|
#
|
|
|
|
# gdk-pixbuf-enum-types.h
|
|
|
|
#
|
2001-09-19 02:10:45 +00:00
|
|
|
$(srcdir)/gdk-pixbuf-enum-types.h: s-enum-types-h
|
|
|
|
@true
|
2001-09-19 04:34:55 +00:00
|
|
|
|
2001-09-16 23:54:37 +00:00
|
|
|
s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
|
|
|
|
( cd $(srcdir) && glib-mkenums \
|
2002-01-09 16:36:20 +00:00
|
|
|
--fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
|
2001-09-16 23:54:37 +00:00
|
|
|
--fprod "/* enumerations from \"@filename@\" */\n" \
|
|
|
|
--vhead "GType @enum_name@_get_type (void);\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
|
2002-01-09 16:36:20 +00:00
|
|
|
--ftail "G_END_DECLS\n\n#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \
|
2001-09-16 23:54:37 +00:00
|
|
|
$(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
|
|
|
|
&& (cmp -s tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h $(srcdir)/gdk-pixbuf-enum-types.h ) \
|
|
|
|
&& rm -f tmp-gdk-pixbuf-enum-types.h \
|
|
|
|
&& echo timestamp > $(@F)
|
2001-09-19 04:34:55 +00:00
|
|
|
|
2001-09-19 02:10:45 +00:00
|
|
|
CLEANFILES += tmp-gdk-pixbuf-enum-types.h
|
2001-09-19 04:34:55 +00:00
|
|
|
MAINTAINERCLEANFILES += s-enum-types-h
|
|
|
|
|
|
|
|
#
|
|
|
|
# gdk-pixbuf-enum-types.c
|
|
|
|
#
|
2001-09-19 02:10:45 +00:00
|
|
|
$(srcdir)/gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile
|
2001-09-19 04:34:55 +00:00
|
|
|
cd $(srcdir) && glib-mkenums \
|
2001-09-19 02:10:45 +00:00
|
|
|
--fhead "#include <gdk-pixbuf/gdk-pixbuf.h>" \
|
|
|
|
--fprod "\n/* enumerations from \"@filename@\" */" \
|
2001-09-20 15:41:20 +00:00
|
|
|
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
|
2001-09-19 02:10:45 +00:00
|
|
|
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
|
2001-09-20 15:41:20 +00:00
|
|
|
--vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \
|
2001-09-19 04:34:55 +00:00
|
|
|
$(gdk_pixbuf_headers) > gdk-pixbuf-enum-types.c
|
|
|
|
|
|
|
|
#
|
|
|
|
# gdk-pixbuf-marshal.h
|
|
|
|
#
|
2001-09-19 02:10:45 +00:00
|
|
|
$(srcdir)/gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
|
2001-09-16 23:54:37 +00:00
|
|
|
@true
|
2001-09-19 04:34:55 +00:00
|
|
|
|
2001-09-19 02:10:45 +00:00
|
|
|
stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
|
|
|
|
case @GLIB_GENMARSHAL@ in \
|
|
|
|
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
|
|
|
|
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
|
|
|
|
esac; \
|
|
|
|
cd $(srcdir) \
|
|
|
|
&& $$glib_genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \
|
|
|
|
&& (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
|
|
|
|
&& rm -f xgen-gmh xgen-gmh~ \
|
2001-09-16 23:54:37 +00:00
|
|
|
&& echo timestamp > $(@F)
|
2001-09-19 04:34:55 +00:00
|
|
|
|
2001-09-19 02:10:45 +00:00
|
|
|
CLEANFILES += xgen-gmh
|
2001-09-19 04:34:55 +00:00
|
|
|
MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
|
|
|
|
|
|
|
|
#
|
|
|
|
# gdk-pixbuf-marshal.c
|
|
|
|
#
|
2001-09-19 02:10:45 +00:00
|
|
|
$(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
|
|
|
|
case @GLIB_GENMARSHAL@ in \
|
|
|
|
.*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \
|
|
|
|
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
|
|
|
|
esac; \
|
|
|
|
cd $(srcdir) \
|
|
|
|
&& $$glib_genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
|
|
|
|
&& cp xgen-gmc gdk-pixbuf-marshal.c \
|
|
|
|
&& rm -f xgen-gmc xgen-gmc~
|
2001-09-19 04:34:55 +00:00
|
|
|
|
2001-09-19 02:10:45 +00:00
|
|
|
CLEANFILES += xgen-gmc
|
2001-09-16 23:54:37 +00:00
|
|
|
|
2000-07-22 23:50:19 +00:00
|
|
|
EXTRA_DIST = \
|
2001-09-04 16:07:05 +00:00
|
|
|
gdk-pixbuf-csource.1 \
|
2000-07-22 23:50:19 +00:00
|
|
|
makefile.mingw \
|
|
|
|
makefile.mingw.in \
|
2001-12-29 10:09:50 +00:00
|
|
|
makefile.msc \
|
2000-07-22 23:50:19 +00:00
|
|
|
gdk_pixbuf.def \
|
2002-03-02 23:19:59 +00:00
|
|
|
gdk_pixbuf.rc \
|
2001-09-19 02:10:45 +00:00
|
|
|
gdk-pixbuf-marshal.c \
|
2001-04-04 07:20:41 +00:00
|
|
|
gdk-pixbuf-marshal.list \
|
2000-08-11 02:58:59 +00:00
|
|
|
pixbufloader_ico.def \
|
|
|
|
pixbufloader_pnm.def \
|
|
|
|
pixbufloader_xpm.def \
|
|
|
|
pixbufloader_bmp.def \
|
|
|
|
pixbufloader_jpeg.def \
|
|
|
|
pixbufloader_ras.def \
|
|
|
|
pixbufloader_gif.def \
|
|
|
|
pixbufloader_png.def \
|
|
|
|
pixbufloader_tiff.def \
|
2001-01-22 02:08:53 +00:00
|
|
|
pixbufloader_wbmp.def \
|
2002-02-01 23:59:52 +00:00
|
|
|
pixbufloader_xbm.def \
|
|
|
|
pixbufloader_tga.def
|
2001-10-29 06:48:04 +00:00
|
|
|
|
|
|
|
install-data-local: install-ms-lib install-libtool-import-lib
|
|
|
|
|
|
|
|
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
|