define -DGDK_PIXBUF_DISABLE_DEPRECATED in the global CFLAGS.

[~andy/gtk] / gdk / x11 / Makefile.am

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 59f8e5e0caef6f5d185dd02d2f7af6c666dd5e15..0b6d5ec5d5332754bb2946aab4bcd1d3a2e381b6 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,16 +1,15 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-2.0/gdk
 
-INCLUDES =                             \
-       -DG_LOG_DOMAIN=\"Gdk\"          \
-       -DGDK_COMPILATION               \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/gdk             \
-       -I$(top_builddir)/gdk           \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
-       $(GTK_DEBUG_FLAGS)              \
+INCLUDES =                     \
+       -DG_LOG_DOMAIN=\"Gdk\"  \
+       -DGDK_COMPILATION       \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/gdk     \
+       -I$(top_builddir)/gdk   \
+       $(GTK_DEBUG_FLAGS)      \
        $(GDK_DEP_CFLAGS)
 
 LDADDS = $(GDK_DEP_LIBS)
@@ -19,6 +18,7 @@ noinst_LTLIBRARIES = libgdk-x11.la
 
 libgdk_x11_la_SOURCES =        \
        MwmUtil.h               \
+       gdkapplaunchcontext-x11.c \
        gdkasync.c              \
        gdkasync.h              \
        gdkcolor-x11.c          \
@@ -45,6 +45,7 @@ libgdk_x11_la_SOURCES =       \
        gdkscreen-x11.h         \
        gdkselection-x11.c      \
        gdkspawn-x11.c          \
+       gdktestutils-x11.c      \
        gdkvisual-x11.c         \
        gdkwindow-x11.c         \
        gdkwindow-x11.h         \
@@ -68,9 +69,16 @@ endif
 libgdkinclude_HEADERS =        \
        gdkx.h
 
+
+noinst_PROGRAMS = checksettings
+checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la 
+
+TESTS = checksettings
+
 # We need to include all these C files here since the conditionals
 # don't seem to be correctly expanded for the dist files.
-EXTRA_DIST =                   \
+EXTRA_DIST +=                  \
        gdkinput-x11.c          \
        gdkinput-xfree.c        \
-       gdkinput-none.c
+       gdkinput-none.c         \
+       gdksettings.c