Use correct DLL and import library names, with GTK_API_VERSION in name,

[~andy/gtk] / gdk-pixbuf / Makefile.am

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 4833092a93d1adfd25819f6ebe6eb35b425d0cd2..466c95871ee15ee8f682d8f0585663d76afdfced 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -86,6 +86,14 @@ libpixbufloader_ico_la_SOURCES = io-ico.c
 libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libpixbufloader_ico_la_LIBADD = $(module_libs)
 
+#
+# The ANI loader
+#
+libpixbufloader_static_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
+libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
+libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libpixbufloader_ani_la_LIBADD = $(module_libs)
+
 #
 # The RAS loader
 #
@@ -158,6 +166,9 @@ STATIC_GIF_LIB = libpixbufloader-static-gif.la
 ICO_LIB = libpixbufloader-ico.la
 STATIC_ICO_LIB = libpixbufloader-static-ico.la
 
+ANI_LIB = libpixbufloader-ani.la
+STATIC_ANI_LIB = libpixbufloader-static-ani.la
+
 RAS_LIB = libpixbufloader-ras.la
 STATIC_RAS_LIB = libpixbufloader-static-ras.la
 
@@ -191,6 +202,7 @@ loader_LTLIBRARIES =        \
        $(JPEG_LIB)     \
        $(GIF_LIB)      \
        $(ICO_LIB)      \
+       $(ANI_LIB)      \
        $(RAS_LIB)      \
        $(XPM_LIB)      \
        $(TIFF_LIB)     \
@@ -211,6 +223,7 @@ noinst_LTLIBRARIES =                \
        $(STATIC_JPEG_LIB)      \
        $(STATIC_GIF_LIB)       \
        $(STATIC_ICO_LIB)       \
+       $(STATIC_ANI_LIB)       \
        $(STATIC_RAS_LIB)       \
        $(STATIC_XPM_LIB)       \
        $(STATIC_TIFF_LIB)      \
@@ -230,6 +243,7 @@ INCLUDES = @STRIP_BEGIN@                    \
        -I$(top_srcdir) -I$(top_builddir)       \
        -I$(top_srcdir)/gdk-pixbuf              \
        -I$(top_builddir)/gdk-pixbuf            \
+       -DGTK_SYSCONFDIR=\"$(sysconfdir)\"      \
        -DGTK_VERSION=\"@GTK_VERSION@\"         \
        -DGTK_BINARY_VERSION=\"@GTK_BINARY_VERSION@\"   \
        -DG_DISABLE_DEPRECATED                  \
@@ -237,6 +251,7 @@ INCLUDES = @STRIP_BEGIN@                    \
        @INCLUDED_LOADER_DEFINE@                \
        @GTK_DEBUG_FLAGS@                       \
        @GDK_PIXBUF_DEP_CFLAGS@                 \
+       -DGDK_PIXBUF_ENABLE_BACKEND             \
 @STRIP_END@
 
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
@@ -245,10 +260,16 @@ LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 noinst_PROGRAMS = test-gdk-pixbuf
 test_gdk_pixbuf_LDADD = $(LDADDS)
 
-bin_PROGRAMS = gdk-pixbuf-csource
+bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
 gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
 gdk_pixbuf_csource_LDADD = $(LDADDS)
 
+gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
+gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+
+gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+
+
 #
 # manual pages to install
 #
@@ -279,10 +300,12 @@ libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
 @STRIP_END@
 
 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)
+libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32res_lo)
 
 gdk_pixbuf_headers =                   \
        gdk-pixbuf.h                    \
+       gdk-pixbuf-io.h                 \
+       gdk-pixbuf-animation.h          \
        gdk-pixbuf-loader.h
 
 libgdk_pixbufinclude_HEADERS =         \
@@ -292,7 +315,6 @@ libgdk_pixbufinclude_HEADERS =      \
        gdk-pixdata.h
 
 noinst_HEADERS =               \
-       gdk-pixbuf-io.h         \
        gdk-pixbuf-private.h
 
 gdk_pixbuf_built_headers = gdk-pixbuf-enum-types.h gdk-pixbuf-marshal.h
@@ -371,14 +393,13 @@ CLEANFILES += xgen-gmc
 
 EXTRA_DIST =                   \
         gdk-pixbuf-csource.1    \
-       makefile.mingw          \
-       makefile.mingw.in       \
        makefile.msc            \
        gdk_pixbuf.def          \
        gdk_pixbuf.rc           \
        gdk-pixbuf-marshal.c    \
        gdk-pixbuf-marshal.list         \
        pixbufloader_ico.def            \
+       pixbufloader_ani.def            \
        pixbufloader_pnm.def            \
        pixbufloader_xpm.def            \
        pixbufloader_bmp.def            \
@@ -391,6 +412,37 @@ EXTRA_DIST =                       \
        pixbufloader_xbm.def            \
        pixbufloader_tga.def
 
+if CROSS_COMPILING
+RUN_QUERY_LOADER_TEST=false
+else
+RUN_QUERY_LOADER_TEST=test -z "$(DESTDIR)"
+endif
+
+# Running this if cross compiling or if DESTDIR is set is going to
+# not work at all, so skip it
 install-data-local: install-ms-lib install-libtool-import-lib
+       @if $(RUN_QUERY_LOADER_TEST) ; then \
+         $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0 ; \
+         $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders ; \
+       else \
+         echo "***" ; \
+         echo "*** Warning: gdk-pixbuf.loaders not built" ; \
+         echo "***" ; \
+         echo "*** Generate this file manually on on host" ; \
+         echo "*** system using gdk-pixbuf-query-loaders" ; \
+         echo "***" ; \
+       fi
+
+all-local: gdk-pixbuf.loaders
+
+gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders
+       if find . -name 'libpixbufloader-*.@SOEXT@' | grep '@SOEXT@' > /dev/null ; then \
+          echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
+         GDK_PIXBUF_MODULEDIR=.libs $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders > ./gdk-pixbuf.loaders ;\
+       else \
+          echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
+         touch gdk-pixbuf.loaders; \
+       fi
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+