diff options
| author | Tor Lillqvist <tml@novell.com> | 2006-10-11 12:41:14 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2006-10-11 12:41:14 +0000 |
| commit | bedf0bc1c0e88dc23e36336107088c0b3ccb84f9 (patch) | |
| tree | f1ca16b0319a781be31ac7df9658607e8097c497 /gdk-pixbuf/io-xpm.c | |
| parent | 6caa448732e4d358f22de8a98e049f7f9bfd456a (diff) | |
| download | gdk-pixbuf-bedf0bc1c0e88dc23e36336107088c0b3ccb84f9.tar.gz | |
Enable having some gdk-pixbuf loaders built-in even if loading the others
2006-10-11 Tor Lillqvist <tml@novell.com>
* configure.in: Enable having some gdk-pixbuf loaders built-in
even if loading the others dynamically. Define Automake
conditional INCLUDE_FOO for each loader as TRUE if that loader is
built-in. See also gdk-pixbuf/ChangeLog.
2006-10-11 Tor Lillqvist <tml@novell.com>
Enable having some loaders built-in even if loading the others
dynamically. Have loaders in the same order as in configure.in in
all places where they are handled/listed.
* Makefile.am: Define the STATIC_FOO_LIB and FOO_LIB macros
conditionally depending on whether said loader is built-in or
not. Use the names libstatic-pixbufloader-foo.la instead of
libpixbufloader-static-foo.la for the built-in ones so that the
"echo libpixbufloader-*.la" won't match them.
* gdk-pixbuf-io.c: Reorganize code as to plumb the built-in
loaders also if USE_GMODULE. Don't warn about a missing
gdk-pixbuf.loaders file if we have at least one included loader.
* gdk-pixbuf-private.h
* io-*.c: Don't define a generic MODULE_ENTRY, as we can't use it
in the loaders anyway. Each loader needs to check if INCLUDE_foo
is defined.
Diffstat (limited to 'gdk-pixbuf/io-xpm.c')
| -rw-r--r-- | gdk-pixbuf/io-xpm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gdk-pixbuf/io-xpm.c b/gdk-pixbuf/io-xpm.c index 8959a0483..558196f84 100644 --- a/gdk-pixbuf/io-xpm.c +++ b/gdk-pixbuf/io-xpm.c @@ -781,6 +781,12 @@ gdk_pixbuf__xpm_image_load_increment (gpointer data, return TRUE; } +#ifndef INCLUDE_xpm +#define MODULE_ENTRY(type,function) function +#else +#define MODULE_ENTRY(type,function) _gdk_pixbuf__ ## type ## _ ## function +#endif + void MODULE_ENTRY (xpm, fill_vtable) (GdkPixbufModule *module) { |