define -DGDK_PIXBUF_DISABLE_DEPRECATED in the global CFLAGS.

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

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index bead87b88b9ea2c7461f198f9ff4194c107219a7..c1ac55438317315a864cfacafc9940eb4f2c17f0 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -31,7 +31,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)
@@ -43,7 +43,7 @@ install-ms-lib:
 uninstall-ms-lib:
 endif
 
-# This places the generated .def in srcdir, since it is expected to be there.
+# 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') > $(srcdir)/gdk_pixbuf.def
@@ -500,6 +500,7 @@ 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            \
@@ -585,7 +586,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 =                 \
@@ -626,9 +628,9 @@ gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
        @true
 
 stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-       echo "#ifndef GDK_PIXBUF_DISABLE_DEPRECATED" > 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 */" >> 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)