]> Pileus Git - ~andy/gtk/blobdiff - gdk-pixbuf/Makefile.am
[quartz] Delete the typedef of GdkDevicePrivate
[~andy/gtk] / gdk-pixbuf / Makefile.am
index 3acb9a81cee308f4870e9b583127f61048025f2a..bb0ac92d32d113cb493f7076dd22deaaba2eae12 100644 (file)
@@ -1,3 +1,7 @@
+include $(top_srcdir)/Makefile.decl
+-include $(INTROSPECTION_MAKEFILE)
+
+INTROSPECTION_GIRS =
 
 SUBDIRS = pixops
 
@@ -6,19 +10,21 @@ no_undefined = -no-undefined
 endif
 
 if OS_WIN32
-gdk_pixbuf_def = $(srcdir)/gdk_pixbuf.def
-gdk_pixbuf_symbols = -export-symbols $(gdk_pixbuf_def)
+gdk_pixbuf_def = gdk_pixbuf.def
+gdk_pixbuf_symbols = -export-symbols $(srcdir)/gdk_pixbuf.def
 
 gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
-gdk_pixbuf_win32_res_ldflag = -Wl,$(gdk_pixbuf_win32_res)
+gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o
+
+libole32 = -lole32
 
 gdk_pixbuf-win32-res.o : gdk_pixbuf.rc
        $(WINDRES) gdk_pixbuf.rc $@
 
 install-def-file:
-       $(INSTALL) $(gdk_pixbuf_def) $(DESTDIR)$(libdir)/gdk_pixbuf-2.0.def
+       $(INSTALL) $(srcdir)/gdk_pixbuf.def $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
 uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/gdk_pixbuf-2.0.def
+       -rm $(DESTDIR)$(libdir)/gdk_pixbuf-$(GTK_API_VERSION).def
 else
 install-def-file:
 uninstall-def-file:
@@ -28,7 +34,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gdk_pixbuf-$(GTK_API_VERSION).lib
 
 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:$@
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk_pixbuf-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk_pixbuf.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gdk_pixbuf-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -40,8 +46,10 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
+# This places the generated .def file in srcdir, since it is expected to be there.
+# (The one from a tarball is)
 gdk_pixbuf.def: gdk-pixbuf.symbols
-       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g') > $(srcdir)/gdk_pixbuf.def
 
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
         $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h
@@ -54,19 +62,19 @@ TESTS = abicheck.sh pltcheck.sh
 endif
 
 lib_LTLIBRARIES =              \
-       libgdk_pixbuf-2.0.la
+       libgdk_pixbuf-3.0.la
 
-loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
+loaderdir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/loaders
 
 module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
 
 #
 # The PNG loader
 #
+libstatic_pixbufloader_png_la_SOURCES = io-png.c
 libpixbufloader_png_la_SOURCES = io-png.c
 libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs)
-libstatic_pixbufloader_png_la_SOURCES = io-png.c
 
 #
 # The BMP loader
@@ -164,6 +172,14 @@ libpixbufloader_tga_la_SOURCES = io-tga.c
 libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libpixbufloader_tga_la_LIBADD = $(module_libs)
 
+#
+# The .icns loader
+#
+libstatic_pixbufloader_icns_la_SOURCES = io-icns.c
+libpixbufloader_icns_la_SOURCES = io-icns.c
+libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libpixbufloader_icns_la_LIBADD = $(module_libs)
+
 #
 # The PCX loader
 #
@@ -172,26 +188,165 @@ libpixbufloader_pcx_la_SOURCES = io-pcx.c
 libpixbufloader_pcx_la_LDFLAGS = -avoid-version -module $(no_undefined)
 libpixbufloader_pcx_la_LIBADD = $(module_libs)
 
-if HAVE_PNG
-if INCLUDE_PNG
-STATIC_PNG_LIB = libstatic-pixbufloader-png.la
+#
+# The JPEG2000 loader
+#
+libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
+libpixbufloader_jasper_la_SOURCES = io-jasper.c
+libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
+
+#
+# The QTIF loader
+#
+libstatic_pixbufloader_qtif_la_SOURCES = io-qtif.c
+libpixbufloader_qtif_la_SOURCES = io-qtif.c
+libpixbufloader_qtif_la_LDFLAGS = -avoid-version -module $(no_undefined)
+libpixbufloader_qtif_la_LIBADD = $(module_libs)
+
+if BUILD_GDIPLUS_LOADERS
+
+if INCLUDE_GDIPLUS
+
+# When building the GDI+ loader statically, we put the "common" objects
+# only in one of the archives to avoid duplicate definitions
+
+STATIC_GDIPLUS_LIBS = \
+       libstatic-pixbufloader-gdip-ico.la \
+       libstatic-pixbufloader-gdip-wmf.la \
+       libstatic-pixbufloader-gdip-emf.la \
+       libstatic-pixbufloader-gdip-bmp.la \
+       libstatic-pixbufloader-gdip-gif.la \
+       libstatic-pixbufloader-gdip-jpeg.la \
+       libstatic-pixbufloader-gdip-tiff.la
+
+libstatic_pixbufloader_gdip_ico_la_SOURCES =   \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-ico.c
+
+libstatic_pixbufloader_gdip_wmf_la_SOURCES =   \
+       io-gdip-wmf.c
+
+libstatic_pixbufloader_gdip_emf_la_SOURCES =   \
+       io-gdip-emf.c
+
+libstatic_pixbufloader_gdip_bmp_la_SOURCES =   \
+       io-gdip-bmp.c
+
+libstatic_pixbufloader_gdip_gif_la_SOURCES =   \
+       io-gdip-gif.c
+
+libstatic_pixbufloader_gdip_jpeg_la_SOURCES =  \
+       io-gdip-jpeg.c
+
+libstatic_pixbufloader_gdip_tiff_la_SOURCES =  \
+       io-gdip-tiff.c
+
 else
-PNG_LIB = libpixbufloader-png.la
-endif
+
+GDIPLUS_LIBS = \
+       libpixbufloader-gdip-ico.la \
+       libpixbufloader-gdip-wmf.la \
+       libpixbufloader-gdip-emf.la \
+       libpixbufloader-gdip-bmp.la \
+       libpixbufloader-gdip-gif.la \
+       libpixbufloader-gdip-jpeg.la \
+       libpixbufloader-gdip-tiff.la
+
+libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_ico_la_SOURCES =  \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-ico.c
+libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32)
+
+libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_wmf_la_SOURCES =  \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-wmf.c
+libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32)
+
+libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_emf_la_SOURCES =  \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-emf.c
+libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32)
+
+libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_bmp_la_SOURCES =  \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-bmp.c
+libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32)
+
+libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_gif_la_SOURCES =  \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-gif.c
+libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32)
+
+libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_jpeg_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-jpeg.c
+libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
+
+libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
+libpixbufloader_gdip_tiff_la_SOURCES =         \
+       io-gdip-native.h                \
+       io-gdip-propertytags.h          \
+       io-gdip-utils.h                 \
+       io-gdip-utils.c                 \
+       io-gdip-animation.c             \
+       io-gdip-animation.h             \
+       io-gdip-tiff.c
+libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32)
+
 endif
 
+else
+
+# Loaders that aren't built if we build the GDI+ loader
+
 if INCLUDE_BMP
 STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la
 else
 BMP_LIB = libpixbufloader-bmp.la
 endif
 
-if INCLUDE_WBMP
-STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la
-else
-WBMP_LIB = libpixbufloader-wbmp.la
-endif
-
 if INCLUDE_GIF
 STATIC_GIF_LIB = libstatic-pixbufloader-gif.la
 else
@@ -204,12 +359,6 @@ else
 ICO_LIB = libpixbufloader-ico.la
 endif
 
-if INCLUDE_ANI
-STATIC_ANI_LIB = libstatic-pixbufloader-ani.la
-else
-ANI_LIB = libpixbufloader-ani.la
-endif
-
 if HAVE_JPEG
 if INCLUDE_JPEG
 STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la
@@ -218,6 +367,37 @@ JPEG_LIB = libpixbufloader-jpeg.la
 endif
 endif
 
+if HAVE_TIFF
+if INCLUDE_TIFF
+STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la
+else
+TIFF_LIB = libpixbufloader-tiff.la
+endif
+endif
+
+# End of loaders not built if building GDI+ loader
+endif
+
+if HAVE_PNG
+if INCLUDE_PNG
+STATIC_PNG_LIB = libstatic-pixbufloader-png.la
+else
+PNG_LIB = libpixbufloader-png.la
+endif
+endif
+
+if INCLUDE_WBMP
+STATIC_WBMP_LIB = libstatic-pixbufloader-wbmp.la
+else
+WBMP_LIB = libpixbufloader-wbmp.la
+endif
+
+if INCLUDE_ANI
+STATIC_ANI_LIB = libstatic-pixbufloader-ani.la
+else
+ANI_LIB = libpixbufloader-ani.la
+endif
+
 if INCLUDE_PNM
 STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la
 else
@@ -230,14 +410,6 @@ else
 RAS_LIB = libpixbufloader-ras.la
 endif
 
-if HAVE_TIFF
-if INCLUDE_TIFF
-STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la
-else
-TIFF_LIB = libpixbufloader-tiff.la
-endif
-endif
-
 if INCLUDE_XPM
 STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la
 else
@@ -262,6 +434,26 @@ else
 PCX_LIB = libpixbufloader-pcx.la
 endif
 
+if INCLUDE_ICNS
+STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la
+else
+ICNS_LIB = libpixbufloader-icns.la
+endif
+
+if HAVE_JASPER
+if INCLUDE_JASPER
+STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la
+else
+JASPER_LIB = libpixbufloader-jasper.la
+endif
+endif
+
+if INCLUDE_QTIF
+STATIC_QTIF_LIB = libstatic-pixbufloader-qtif.la
+else
+QTIF_LIB = libpixbufloader-qtif.la
+endif
+
 if BUILD_DYNAMIC_MODULES
 
 loader_LTLIBRARIES =   \
@@ -278,7 +470,11 @@ loader_LTLIBRARIES =       \
        $(XPM_LIB)      \
        $(XBM_LIB)      \
        $(TGA_LIB)      \
-       $(PCX_LIB)
+       $(ICNS_LIB)     \
+       $(PCX_LIB)      \
+       $(JASPER_LIB)   \
+       $(QTIF_LIB)     \
+       $(GDIPLUS_LIBS)
 
 
 endif
@@ -297,7 +493,11 @@ noinst_LTLIBRARIES =               \
        $(STATIC_XPM_LIB)       \
        $(STATIC_XBM_LIB)       \
        $(STATIC_TGA_LIB)       \
-       $(STATIC_PCX_LIB)
+       $(STATIC_ICNS_LIB)      \
+       $(STATIC_PCX_LIB)       \
+       $(STATIC_JASPER_LIB)    \
+       $(STATIC_QTIF_LIB)      \
+       $(STATIC_GDIPLUS_LIBS)
 
 builtin_objs = @INCLUDED_LOADER_OBJ@
 
@@ -305,10 +505,11 @@ builtin_objs = @INCLUDED_LOADER_OBJ@
 DEPS = libgdk_pixbuf-$(GTK_API_VERSION).la
 INCLUDES = \
        -DG_LOG_DOMAIN=\"GdkPixbuf\"            \
+       -DGDK_PIXBUF_COMPILATION                \
        -I$(top_srcdir) -I$(top_builddir)       \
        -I$(top_srcdir)/gdk-pixbuf              \
        -I$(top_builddir)/gdk-pixbuf            \
-       -DGTK_SYSCONFDIR=\"$(sysconfdir)\"      \
+       -DGTK_LIBDIR=\"$(libdir)\"      \
        -DGTK_VERSION=\"$(GTK_VERSION)\"        \
        -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"  \
        -DGTK_PREFIX=\"$(prefix)\"              \
@@ -318,26 +519,26 @@ INCLUDES = \
        -DGDK_PIXBUF_ENABLE_BACKEND
 
 AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
-LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la
+LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
 
 noinst_PROGRAMS = test-gdk-pixbuf
 test_gdk_pixbuf_LDADD = $(LDADDS)
 
-bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-query-loaders
-gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-gdk_pixbuf_csource_LDADD = $(LDADDS)
+bin_PROGRAMS = gdk-pixbuf-csource-3.0 gdk-pixbuf-query-loaders-3.0
+gdk_pixbuf_csource_3_0_SOURCES = gdk-pixbuf-csource.c
+gdk_pixbuf_csource_3_0_LDADD = $(LDADDS)
 
-gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
+gdk_pixbuf_query_loaders_3_0_DEPENDENCIES = $(DEPS)
+gdk_pixbuf_query_loaders_3_0_LDADD = $(LDADDS)
 
-gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
+gdk_pixbuf_query_loaders_3_0_SOURCES = queryloaders.c
 
 
 #
 # The GdkPixBuf library
 #
-libgdk_pixbufincludedir = $(includedir)/gtk-2.0/gdk-pixbuf
-libgdk_pixbuf_2_0_la_SOURCES =   \
+libgdk_pixbufincludedir = $(includedir)/gtk-3.0/gdk-pixbuf
+libgdk_pixbuf_3_0_la_SOURCES =   \
        gdk-pixbuf-i18n.h        \
        gdk-pixbuf.c             \
        gdk-pixbuf-animation.c   \
@@ -346,11 +547,12 @@ libgdk_pixbuf_2_0_la_SOURCES =   \
        gdk-pixbuf-loader.c      \
        gdk-pixbuf-scale.c       \
        gdk-pixbuf-simple-anim.c \
+       gdk-pixbuf-scaled-anim.c \
        gdk-pixbuf-util.c        \
        gdk-pixdata.c            \
        gdk-pixbuf-enum-types.c
 
-libgdk_pixbuf_2_0_la_LDFLAGS = \
+libgdk_pixbuf_3_0_la_LDFLAGS = \
        $(gdk_pixbuf_win32_res_ldflag)          \
        -version-info $(LT_VERSION_INFO)        \
        $(LIBTOOL_EXPORT_OPTIONS)               \
@@ -358,8 +560,8 @@ libgdk_pixbuf_2_0_la_LDFLAGS = \
        $(gdk_pixbuf_symbols)
 
 
-libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS)
-libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
+libgdk_pixbuf_3_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
+libgdk_pixbuf_3_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res)
 
 gdk_pixbuf_headers =                   \
        gdk-pixbuf.h                    \
@@ -380,6 +582,7 @@ libgdk_pixbufinclude_HEADERS =      \
 noinst_HEADERS =               \
        gdk-pixbuf-alias.h      \
        gdk-pixbuf-private.h    \
+       gdk-pixbuf-scaled-anim.h \
        xpm-color-table.h
 
 BUILT_SOURCES =                \
@@ -388,7 +591,8 @@ BUILT_SOURCES =             \
        gdk-pixbuf-enum-types.h \
        gdk-pixbuf-enum-types.c \
        gdk-pixbuf-marshal.h    \
-       gdk-pixbuf-marshal.c
+       gdk-pixbuf-marshal.c    \
+       gdk-pixbuf-features.h
 
 CLEANFILES =
 MAINTAINERCLEANFILES =                 \
@@ -397,7 +601,7 @@ MAINTAINERCLEANFILES =              \
        gdk-pixbuf-enum-types.c \
        gdk-pixbuf-marshal.h    \
        gdk-pixbuf-marshal.c    \
-       gdk-pixbuf.loaders
+       loaders.cache
 
 #
 # gdk-pixbuf-enum-types.h
@@ -405,12 +609,8 @@ MAINTAINERCLEANFILES =             \
 gdk-pixbuf-enum-types.h: s-enum-types-h
        @true
 
-s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) Makefile
-       ( cd $(srcdir) && $(GLIB_MKENUMS) \
-                       --fhead "#ifndef __GDK_PIXBUF_ENUM_TYPES_H__\n#define __GDK_PIXBUF_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
-                       --fprod "/* enumerations from \"@filename@\" */\n" \
-                       --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define GDK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n"         \
-                       --ftail "G_END_DECLS\n\n#endif /* __GDK_PIXBUF_ENUM_TYPES_H__ */" \
+s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) gdk-pixbuf-enum-types.h.template
+       ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdk-pixbuf-enum-types.h.template \
                $(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
        && (cmp -s tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h ) \
        && rm -f tmp-gdk-pixbuf-enum-types.h \
@@ -422,14 +622,8 @@ MAINTAINERCLEANFILES += s-enum-types-h
 #
 # gdk-pixbuf-enum-types.c
 #
-gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) Makefile
-       (cd $(srcdir) && $(GLIB_MKENUMS) \
-               --fhead "#include <gdk-pixbuf/gdk-pixbuf.h>\n#include \"gdk-pixbuf-alias.h\"\n" \
-               --fprod "\n/* enumerations from \"@filename@\" */" \
-               --ftail "\n#define __GDK_PIXBUF_ENUM_TYPES_C__\n#include \"gdk-pixbuf-aliasdef.c\"" \
-               --vhead "GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {"       \
-               --vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-               --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n  }\n  return etype;\n}\n" \
+gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) gdk-pixbuf-enum-types.c.template
+       (cd $(srcdir) && $(GLIB_MKENUMS) --template gdk-pixbuf-enum-types.c.template \
                  $(gdk_pixbuf_headers)) > gdk-pixbuf-enum-types.c
 
 #
@@ -439,7 +633,9 @@ gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
        @true
 
 stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-       $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
+       echo "#if !defined(GDK_PIXBUF_DISABLE_DEPRECATED) || defined(GDK_PIXBUF_COMPILATION)" > xgen-gmh \
+       && $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
+       && echo "#endif /* !GDK_PIXBUF_DISABLE_DEPRECATED || GDK_PIXBUF_COMPILATION */" >> xgen-gmh \
        && (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $(@F)
@@ -464,7 +660,7 @@ distclean-local:
          rm -f $(MAINTAINERCLEANFILES); \
        fi
 
-EXTRA_DIST                                   \
+EXTRA_DIST +=                                  \
         gdk-pixbuf-csource.1                   \
        makefile.msc                            \
        gdk-pixbuf.symbols                      \
@@ -475,8 +671,31 @@ EXTRA_DIST =                                       \
        gdk_pixbuf.rc                           \
        gdk-pixbuf-marshal.c                    \
        gdk-pixbuf-marshal.list                 \
+       gdk-pixbuf-enum-types.c.template        \
+       gdk-pixbuf-enum-types.h.template        \
        gen-color-table.pl
 
+if HAVE_INTROSPECTION
+
+GdkPixbuf-3.0.gir: libgdk_pixbuf-3.0.la Makefile
+GdkPixbuf_3_0_gir_SCANNERFLAGS = --strip-prefix=Gdk
+GdkPixbuf_3_0_gir_INCLUDES = GModule-2.0 Gio-2.0
+GdkPixbuf_3_0_gir_LIBS = libgdk_pixbuf-3.0.la
+GdkPixbuf_3_0_gir_CFLAGS = $(INCLUDES)
+GdkPixbuf_3_0_gir_FILES = \
+    $(addprefix $(srcdir)/,$(libgdk_pixbufinclude_HEADERS)) \
+    $(addprefix $(srcdir)/,$(libgdk_pixbuf_3_0_la_SOURCES))
+INTROSPECTION_GIRS += GdkPixbuf-3.0.gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(gir_DATA) $(typelibs_DATA)
+endif
+
 if CROSS_COMPILING
 RUN_QUERY_LOADER_TEST=false
 else
@@ -491,37 +710,39 @@ endif
 # after the libraries are installed in their final locations.
 install-data-hook: install-ms-lib install-def-file
        @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 ; \
+         $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-3.0/3.0.0 ; \
+         $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 > $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/loaders.cache ; \
        else \
          echo "***" ; \
-         echo "*** Warning: gdk-pixbuf.loaders not built" ; \
+         echo "*** Warning: loaders.cache not built" ; \
          echo "***" ; \
          echo "*** Generate this file manually on host" ; \
-         echo "*** system using gdk-pixbuf-query-loaders" ; \
+         echo "*** system using gdk-pixbuf-query-loaders-3.0" ; \
          echo "***" ; \
        fi
 
 uninstall-local: uninstall-ms-lib uninstall-def-file
-       rm -f $(DESTDIR)$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+       rm -f $(DESTDIR)$(libdir)/gtk-3.0/3.0.0/loaders.cache
 
 if CROSS_COMPILING
 else
-all-local: gdk-pixbuf.loaders
+all-local: loaders.cache
 endif
 
 if BUILD_DYNAMIC_MODULES
-gdk-pixbuf.loaders: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
+loaders.cache: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders-3.0$(EXEEXT)
        LOADERS=`echo libpixbufloader-*.la` ; \
        if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
-          echo "Writing a gdk-pixbuf.loader file to use when running examples before installing gdk-pixbuf."; \
-         $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./gdk-pixbuf.loaders ;\
+          echo "Writing a loaders.cache file to use when running examples before installing gdk-pixbuf."; \
+         $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders-3.0 $$LOADERS > ./loaders.cache ;\
        else \
           echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
-         touch gdk-pixbuf.loaders; \
+         touch loaders.cache; \
        fi
 else
-gdk-pixbuf.loaders: 
+loaders.cache:
        echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
-       touch gdk-pixbuf.loaders;
+       touch loaders.cache;
 endif
+
+-include $(top_srcdir)/git.mk