forked from AuroraMiddleware/gtk
e0fee22e78
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
247 lines
5.6 KiB
Makefile
247 lines
5.6 KiB
Makefile
SUBDIRS = pixops
|
|
|
|
lib_LTLIBRARIES = \
|
|
libgdk_pixbuf-1.3.la
|
|
|
|
loaderdir = $(libdir)/gtk-2.0/$(GTK_VERSION)/loaders
|
|
|
|
#
|
|
# The PNG plugin.
|
|
#
|
|
libpixbufloader_png_la_SOURCES = io-png.c
|
|
libpixbufloader_png_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_png_la_LIBADD = $(LIBPNG)
|
|
libpixbufloader_static_png_la_SOURCES = io-png.c
|
|
|
|
#
|
|
# The JPEG loader
|
|
#
|
|
libpixbufloader_static_jpeg_la_SOURCES = io-jpeg.c
|
|
libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
|
|
libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG)
|
|
|
|
#
|
|
# The XPM loader
|
|
#
|
|
libpixbufloader_static_xpm_la_SOURCES = io-xpm.c
|
|
libpixbufloader_xpm_la_SOURCES = io-xpm.c
|
|
libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_xpm_la_LIBADD =
|
|
|
|
#
|
|
# The GIF loader
|
|
#
|
|
libpixbufloader_static_gif_la_SOURCES = io-gif.c
|
|
libpixbufloader_gif_la_SOURCES = io-gif.c
|
|
libpixbufloader_gif_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_gif_la_LIBADD =
|
|
|
|
#
|
|
# The ICO loader
|
|
#
|
|
libpixbufloader_static_ico_la_SOURCES = io-ico.c
|
|
libpixbufloader_ico_la_SOURCES = io-ico.c
|
|
libpixbufloader_ico_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_ico_la_LIBADD =
|
|
|
|
#
|
|
# The RAS loader
|
|
#
|
|
libpixbufloader_static_ras_la_SOURCES = io-ras.c
|
|
libpixbufloader_ras_la_SOURCES = io-ras.c
|
|
libpixbufloader_ras_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_ras_la_LIBADD =
|
|
|
|
#
|
|
# The TIFF loader
|
|
#
|
|
libpixbufloader_static_tiff_la_SOURCES = io-tiff.c
|
|
libpixbufloader_tiff_la_SOURCES = io-tiff.c
|
|
libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_tiff_la_LIBADD = $(LIBTIFF)
|
|
|
|
#
|
|
# The PNM loader
|
|
#
|
|
libpixbufloader_static_pnm_la_SOURCES = io-pnm.c
|
|
libpixbufloader_pnm_la_SOURCES = io-pnm.c
|
|
libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_pnm_la_LIBADD =
|
|
|
|
#
|
|
# The BMP loader
|
|
#
|
|
libpixbufloader_static_bmp_la_SOURCES = io-bmp.c
|
|
libpixbufloader_bmp_la_SOURCES = io-bmp.c
|
|
libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module
|
|
libpixbufloader_bmp_la_LIBADD =
|
|
|
|
#
|
|
# The WBMP loader
|
|
#
|
|
libpixbufloader_static_wbmp_la_SOURCES = io-wbmp.c
|
|
libpixbufloader_wbmp_la_SOURCES = io-wbmp.c
|
|
libpixbufloader_wbmp_la_LDFLAGS = -avoid-version -module
|
|
|
|
#
|
|
# The XBM loader
|
|
#
|
|
libpixbufloader_xbm_la_SOURCES = io-xbm.c
|
|
libpixbufloader_xbm_la_LDFLAGS = -version-info 1:0:0 -module
|
|
libpixbufloader_xbm_la_LIBADD =
|
|
|
|
if HAVE_PNG
|
|
PNG_LIB = libpixbufloader-png.la
|
|
endif
|
|
|
|
if HAVE_JPEG
|
|
JPEG_LIB = libpixbufloader-jpeg.la
|
|
endif
|
|
|
|
GIF_LIB = libpixbufloader-gif.la
|
|
|
|
ICO_LIB = libpixbufloader-ico.la
|
|
|
|
RAS_LIB = libpixbufloader-ras.la
|
|
|
|
if HAVE_TIFF
|
|
TIFF_LIB = libpixbufloader-tiff.la
|
|
endif
|
|
|
|
XPM_LIB = libpixbufloader-xpm.la
|
|
|
|
PNM_LIB = libpixbufloader-pnm.la
|
|
|
|
BMP_LIB = libpixbufloader-bmp.la
|
|
|
|
WBMP_LIB = libpixbufloader-wbmp.la
|
|
|
|
XBM_LIB = libpixbufloader-xbm.la
|
|
|
|
if BUILD_DYNAMIC_MODULES
|
|
|
|
loader_LTLIBRARIES = \
|
|
$(PNG_LIB) \
|
|
$(JPEG_LIB) \
|
|
$(GIF_LIB) \
|
|
$(ICO_LIB) \
|
|
$(RAS_LIB) \
|
|
$(XPM_LIB) \
|
|
$(TIFF_LIB) \
|
|
$(PNM_LIB) \
|
|
$(BMP_LIB) \
|
|
$(WBMP_LIB) \
|
|
$(XBM_LIB)
|
|
|
|
|
|
extra_sources =
|
|
builtin_objs =
|
|
else
|
|
loader_LTLIBRARIES =
|
|
|
|
noinst_LTLIBRARIES = \
|
|
libpixbufloader-static-png.la \
|
|
libpixbufloader-static-jpeg.la \
|
|
libpixbufloader-static-gif.la \
|
|
libpixbufloader-static-ico.la \
|
|
libpixbufloader-static-ras.la \
|
|
libpixbufloader-static-tiff.la \
|
|
libpixbufloader-static-xpm.la \
|
|
libpixbufloader-static-pnm.la \
|
|
libpixbufloader-static-bmp.la \
|
|
libpixbufloader-static-wbmp.la
|
|
|
|
builtin_objs = @INCLUDED_LOADER_OBJ@
|
|
|
|
static_libs = $(STATIC_LIB_DEPS)
|
|
|
|
endif
|
|
|
|
noinst_PROGRAMS = test-gdk-pixbuf
|
|
TESTS = test-gdk-pixbuf
|
|
|
|
DEPS = libgdk_pixbuf-1.3.la
|
|
INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
|
|
-I$(top_srcdir)/gdk-pixbuf \
|
|
-I$(top_builddir)/gdk-pixbuf \
|
|
@INCLUDED_LOADER_DEFINE@ \
|
|
@GLIB_CFLAGS@
|
|
AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\""
|
|
|
|
LDADDS = libgdk_pixbuf-1.3.la $(GLIB_LIBS) $(STATIC_LIB_DEPS)
|
|
|
|
test_gdk_pixbuf_LDADD = $(LDADDS)
|
|
|
|
bin_PROGRAMS=make-inline-pixbuf
|
|
|
|
make_inline_pixbuf_SOURCES=make-inline-pixbuf.c
|
|
|
|
make_inline_pixbuf_LDADD = $(LDADDS)
|
|
|
|
GDK_PIXBUF_LIBS = $(GLIB_LIBS) $(INTLLIBS)
|
|
|
|
#
|
|
# The GdkPixBuf library
|
|
#
|
|
|
|
BUILT_SOURCES=gdk-pixbuf-marshal.h gdk-pixbuf-marshal.c
|
|
|
|
libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
|
|
|
|
libgdk_pixbuf_1_3_la_SOURCES = \
|
|
gdk-pixbuf-i18n.h \
|
|
gdk-pixbuf.c \
|
|
gdk-pixbuf-animation.c \
|
|
gdk-pixbuf-data.c \
|
|
gdk-pixbuf-io.c \
|
|
gdk-pixbuf-loader.c \
|
|
gdk-pixbuf-marshal.h \
|
|
gdk-pixbuf-scale.c \
|
|
gdk-pixbuf-util.c
|
|
|
|
libgdk_pixbuf_1_3_la_LDFLAGS = \
|
|
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
|
|
@LIBTOOL_EXPORT_OPTIONS@ \
|
|
$(GLIB_LIBS)
|
|
libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(static_libs)
|
|
libgdk_pixbuf_1_3_la_DEPENDENCIES = $(builtin_objs)
|
|
|
|
libgdk_pixbufinclude_HEADERS = \
|
|
gdk-pixbuf.h \
|
|
gdk-pixbuf-loader.h \
|
|
gdk-pixbuf-features.h
|
|
|
|
noinst_HEADERS = \
|
|
gdk-pixbuf-io.h \
|
|
gdk-pixbuf-private.h
|
|
|
|
EXTRA_DIST = \
|
|
makefile.mingw \
|
|
makefile.mingw.in \
|
|
gdk_pixbuf.def \
|
|
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 \
|
|
pixbufloader_wbmp.def \
|
|
pixbufloader_xbm.def
|
|
|
|
|
|
gdk-pixbuf-marshal.h: gdk-pixbuf-marshal.list
|
|
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~
|
|
|
|
gdk-pixbuf-marshal.c: gdk-pixbuf-marshal.list
|
|
cd $(srcdir) \
|
|
&& glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmh \
|
|
&& (cmp -s xgen-gmh gdk-pixbuf-marshal.c || cp xgen-gmh gdk-pixbuf-marshal.c) \
|
|
&& rm -f xgen-gmh xgen-gmh~
|