diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-06-02 13:38:25 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-06-02 13:38:33 +0300 |
| commit | b0d2187bd68c8cfe0a02c18c993996e24419acc7 (patch) | |
| tree | b5c81de3ea7061ceff3e8bc24aa6bf64d4a8ade6 /gdk-pixbuf | |
| parent | Make io-png.c actually compile with the libpng 1.5 we include (diff) | |
| download | core-b0d2187bd68c8cfe0a02c18c993996e24419acc7.tar.gz core-b0d2187bd68c8cfe0a02c18c993996e24419acc7.zip | |
Make gdk-pixbuf build better
Pass the -I options needed in CPPFLAGS, not CFLAGS. Explicitly
disable dynamic loading of loaders. Pass an explicit list of loaders
to build in statically. Do include the jpeg loader.
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gdk-pixbuf/makefile.mk b/gdk-pixbuf/makefile.mk index 961184481c04..023b26d7ab82 100644 --- a/gdk-pixbuf/makefile.mk +++ b/gdk-pixbuf/makefile.mk @@ -55,12 +55,14 @@ CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) \ BASE_DEPENDENCIES_CFLAGS="-I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external/glib-2.0" \ BASE_DEPENDENCIES_LIBS=" " \ .$/configure \ + CPPFLAGS="$(EXTRA_CDEFS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/jpeg" \ + CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS)" \ + LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ --prefix=$(SRC_ROOT)$/$(PRJNAME)$/$(MISC) \ --disable-nls \ - CPPFLAGS="$(EXTRA_CDEFS)" \ - CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)$/external -I$(SOLARINCDIR)$/external$/glib-2.0 -I$(SOLARINCDIR)$/external$/libpng -I$(SOLARINCDIR)$/external$/libjpeg" \ - LDFLAGS="$(EXTRA_LINKFLAGS) -L$(SOLARLIBDIR) -lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0" \ - --disable-glibtest --without-libtiff --without-libjpeg + --disable-modules \ + --with-included-loaders=ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg \ + --disable-glibtest --without-libtiff --without-libjasper BUILD_ACTION=$(AUGMENT_LIBRARY_PATH) $(GNUMAKE) BUILD_DIR=$(CONFIGURE_DIR) |