diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index eb89d95db8..2aaa9f0004 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,5 +1,7 @@ 2002-02-01 Matthias Clasen + * Makefile.am: Build the tga loader as a static library. (#70157) + * io-ico.c: Merge 16- and 32-bit ico support from the stable branch. (#61179) diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 527c1d1656..e72011e37e 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -124,6 +124,7 @@ libpixbufloader_wbmp_la_LIBADD = $(module_libs) # # The XBM loader # +libpixbufloader_static_xbm_la_SOURCES = io-xbm.c libpixbufloader_xbm_la_SOURCES = io-xbm.c libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined) libpixbufloader_xbm_la_LIBADD = $(module_libs) @@ -131,6 +132,7 @@ libpixbufloader_xbm_la_LIBADD = $(module_libs) # # The TGA loader # +libpixbufloader_static_tga_la_SOURCES = io-tga.c libpixbufloader_tga_la_SOURCES = io-tga.c libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined) libpixbufloader_tga_la_LIBADD = $(module_libs) @@ -197,7 +199,9 @@ noinst_LTLIBRARIES = \ libpixbufloader-static-xpm.la \ libpixbufloader-static-pnm.la \ libpixbufloader-static-bmp.la \ - libpixbufloader-static-wbmp.la + libpixbufloader-static-wbmp.la \ + libpixbufloader-static-xbm.la \ + libpixbufloader-static-tga.la builtin_objs = @INCLUDED_LOADER_OBJ@ @@ -367,7 +371,8 @@ EXTRA_DIST = \ pixbufloader_png.def \ pixbufloader_tiff.def \ pixbufloader_wbmp.def \ - pixbufloader_xbm.def + pixbufloader_xbm.def \ + pixbufloader_tga.def install-data-local: install-ms-lib install-libtool-import-lib