]> Pileus Git - ~andy/gtk/blobdiff - gdk-pixbuf/Makefile.am
Use correct DLL and import library names, with GTK_API_VERSION in name,
[~andy/gtk] / gdk-pixbuf / Makefile.am
index b40c1f36ef6769366841f2e677f0b566ca0e6149..466c95871ee15ee8f682d8f0585663d76afdfced 100644 (file)
@@ -15,36 +15,36 @@ gdk_pixbuf-win32res.lo : gdk_pixbuf.rc
        $(top_srcdir)/build/win32/lt-compile-resource gdk_pixbuf.rc gdk_pixbuf-win32res.lo
 
 install-libtool-import-lib:
-       $(INSTALL) .libs/libgdk_pixbuf-1.3.dll.a $(DESTDIR)$(libdir)
+       $(INSTALL) .libs/libgdk_pixbuf-$(GTK_API_VERSION).dll.a $(DESTDIR)$(libdir)
 uninstall-libtool-import-lib:
-       -rm $(DESTDIR)$(libdir)/libdk_pixbuf-1.3.dll.a
+       -rm $(DESTDIR)$(libdir)/libgdk_pixbuf-$(GTK_API_VERSION).dll.a
 else
 install-libtool-import-lib:
 uninstall-libtool-import-lib:
 endif
 
 if MS_LIB_AVAILABLE
-noinst_DATA = gdk_pixbuf-1.3.lib
+noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
 
-gdk_pixbuf-1.3.lib: libgdk_pixbuf-1.3.la gdk_pixbuf.def
-       lib -name:libgdk_pixbuf-1.3-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
+gdk_pixbuf-$(GTK_API_VERSION).lib: libgdk_pixbuf-$(GTK_API_VERSION).la gdk_pixbuf.def
+       lib -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
 
 install-ms-lib:
-       $(INSTALL) gdk_pixbuf-1.3.lib $(DESTDIR)$(libdir)
+       $(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
 
 uninstall-ms-lib:
-       -rm $(DESTDIR)$(libdir)/gdk_pixbuf-1.3.lib
+       -rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).lib
 else
 install-ms-lib:
 uninstall-ms-lib:
 endif
 
 lib_LTLIBRARIES =              \
-       libgdk_pixbuf-1.3.la
+       libgdk_pixbuf-2.0.la
 
 loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
 
-module_libs = libgdk_pixbuf-1.3.la $(GDK_PIXBUF_DEP_LIBS)
+module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
 
 #
 # The PNG plugin.
@@ -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
 #
@@ -144,33 +152,48 @@ libpixbufloader_tga_la_LIBADD = $(module_libs)
 
 if HAVE_PNG
 PNG_LIB = libpixbufloader-png.la
+STATIC_PNG_LIB = libpixbufloader-static-png.la
 endif
 
 if HAVE_JPEG
 JPEG_LIB = libpixbufloader-jpeg.la
+STATIC_JPEG_LIB = libpixbufloader-static-jpeg.la
 endif
 
 GIF_LIB = libpixbufloader-gif.la
+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
 
 if HAVE_TIFF
 TIFF_LIB = libpixbufloader-tiff.la
+STATIC_TIFF_LIB = libpixbufloader-static-tiff.la
 endif
 
 XPM_LIB = libpixbufloader-xpm.la
+STATIC_XPM_LIB = libpixbufloader-static-xpm.la
 
 PNM_LIB = libpixbufloader-pnm.la
+STATIC_PNM_LIB = libpixbufloader-static-pnm.la
 
 BMP_LIB = libpixbufloader-bmp.la
+STATIC_BMP_LIB = libpixbufloader-static-bmp.la
 
 WBMP_LIB = libpixbufloader-wbmp.la
+STATIC_WBMP_LIB = libpixbufloader-static-wbmp.la
 
 XBM_LIB = libpixbufloader-xbm.la
+STATIC_XBM_LIB = libpixbufloader-static-xbm.la
 
 TGA_LIB = libpixbufloader-tga.la
+STATIC_TGA_LIB = libpixbufloader-static-tga.la
 
 if BUILD_DYNAMIC_MODULES
 
@@ -179,6 +202,7 @@ loader_LTLIBRARIES =        \
        $(JPEG_LIB)     \
        $(GIF_LIB)      \
        $(ICO_LIB)      \
+       $(ANI_LIB)      \
        $(RAS_LIB)      \
        $(XPM_LIB)      \
        $(TIFF_LIB)     \
@@ -194,50 +218,58 @@ 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 \
-       libpixbufloader-static-xbm.la  \
-       libpixbufloader-static-tga.la
+noinst_LTLIBRARIES =           \
+       $(STATIC_PNG_LIB)       \
+       $(STATIC_JPEG_LIB)      \
+       $(STATIC_GIF_LIB)       \
+       $(STATIC_ICO_LIB)       \
+       $(STATIC_ANI_LIB)       \
+       $(STATIC_RAS_LIB)       \
+       $(STATIC_XPM_LIB)       \
+       $(STATIC_TIFF_LIB)      \
+       $(STATIC_PNM_LIB)       \
+       $(STATIC_BMP_LIB)       \
+       $(STATIC_WBMP_LIB)      \
+       $(STATIC_XBM_LIB)       \
+       $(STATIC_TGA_LIB)
 
 builtin_objs = @INCLUDED_LOADER_OBJ@
 
 endif
 
-DEPS = libgdk_pixbuf-1.3.la
+DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
 INCLUDES = @STRIP_BEGIN@                       \
        -DG_LOG_DOMAIN=\"GdkPixbuf\"            \
        -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                  \
        -DGDK_PIXBUF_DISABLE_DEPRECATED         \
        @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\""
-LDADDS = libgdk_pixbuf-1.3.la
+LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
 
-noinst_PROGRAMS = test-gdk-pixbuf test-loaders
+noinst_PROGRAMS = test-gdk-pixbuf
 test_gdk_pixbuf_LDADD = $(LDADDS)
-test_loaders_LDADD = $(LDADDS)
-test_loaders_SOURCES = test-loaders.c test-images.h
 
-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
 #
@@ -248,7 +280,7 @@ man_MANS = gdk-pixbuf-csource.1
 # The GdkPixBuf library
 #
 libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
-libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \
+libgdk_pixbuf_2_0_la_SOURCES = @STRIP_BEGIN@ \
        gdk-pixbuf-i18n.h       \
        gdk-pixbuf.c            \
        gdk-pixbuf-animation.c  \
@@ -260,18 +292,20 @@ libgdk_pixbuf_1_3_la_SOURCES = @STRIP_BEGIN@ \
        gdk-pixdata.c           \
        $(gdk_pixbuf_built_cfiles) \
 @STRIP_END@
-libgdk_pixbuf_1_3_la_LDFLAGS = @STRIP_BEGIN@ \
+libgdk_pixbuf_2_0_la_LDFLAGS = @STRIP_BEGIN@ \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
        @LIBTOOL_EXPORT_OPTIONS@                                \
        $(no_undefined)                                         \
        $(gdk_pixbuf_symbols)                                   \
 @STRIP_END@
 
-libgdk_pixbuf_1_3_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_win32res_lo) $(GDK_PIXBUF_DEP_LIBS)
-libgdk_pixbuf_1_3_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def)
+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) $(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 =         \
@@ -281,12 +315,11 @@ 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
 gdk_pixbuf_built_cfiles = gdk-pixbuf-enum-types.c 
-$(libgdk_pixbuf_1_3_la_OBJECTS) $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
+$(libgdk_pixbuf_2_0_la_OBJECTS) $(OBJECTS): $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
 
 CLEANFILES =
 MAINTAINERCLEANFILES = $(gdk_pixbuf_built_headers) $(gdk_pixbuf_built_cfiles) gdk-pixbuf-marshal.c
@@ -360,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            \
@@ -380,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
+