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 ab32460360b5490a95ff3f5a2384c144382412f8..0b6d5ec5d5332754bb2946aab4bcd1d3a2e381b6 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,52 +1,33 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 libgdkincludedir = $(includedir)/gtk-2.0/gdk
-libgdkx11includedir = $(includedir)/gtk-2.0/gdk/x11
 
-INCLUDES = @STRIP_BEGIN@       \
+INCLUDES =                     \
        -DG_LOG_DOMAIN=\"Gdk\"  \
+       -DGDK_COMPILATION       \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
        -I$(top_builddir)/gdk   \
-       @GTK_DEBUG_FLAGS@       \
-       @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
-       @PANGO_CFLAGS@          \
-       @GLIB_CFLAGS@           \
-       @x_cflags@              \
-@STRIP_END@
+       $(GTK_DEBUG_FLAGS)      \
+       $(GDK_DEP_CFLAGS)
 
-LDADDS = @STRIP_BEGIN@         \
-       @x_ldflags@     \
-       @x_libs@        \
-       @GLIB_LIBS@     \
-       -lm             \
-@STRIP_END@
+LDADDS = $(GDK_DEP_LIBS)
 
 noinst_LTLIBRARIES = libgdk-x11.la
 
-if XINPUT_GXI
-xinput_sources =          \
-       gdkinput-x11.c     \
-       gdkinput-gxi.c
-else
-if XINPUT_XFREE
-xinput_sources =          \
-       gdkinput-x11.c     \
-       gdkinput-xfree.c
-else
-xinput_sources =          \
-       gdkinput-none.c
-endif
-endif
-
 libgdk_x11_la_SOURCES =        \
        MwmUtil.h               \
-       gdkcc-x11.c             \
+       gdkapplaunchcontext-x11.c \
+       gdkasync.c              \
+       gdkasync.h              \
        gdkcolor-x11.c          \
        gdkcursor-x11.c         \
+       gdkdisplay-x11.c        \
+       gdkdisplay-x11.h        \
        gdkdnd-x11.c            \
        gdkdrawable-x11.c       \
+       gdkdrawable-x11.h       \
        gdkevents-x11.c         \
        gdkfont-x11.c           \
        gdkgc-x11.c             \
@@ -57,39 +38,47 @@ libgdk_x11_la_SOURCES =     \
        gdkinput.c              \
        gdkkeys-x11.c           \
        gdkmain-x11.c           \
-       gdkpango-x11.c          \
        gdkpixmap-x11.c         \
+       gdkpixmap-x11.h         \
        gdkproperty-x11.c       \
+       gdkscreen-x11.c         \
+       gdkscreen-x11.h         \
        gdkselection-x11.c      \
+       gdkspawn-x11.c          \
+       gdktestutils-x11.c      \
        gdkvisual-x11.c         \
        gdkwindow-x11.c         \
+       gdkwindow-x11.h         \
+       gdkxftdefaults.c        \
        gdkxid.c                \
-       gxid_lib.c              \
-       gxid_lib.h              \
-       gxid_proto.h            \
        gdkx.h                  \
        gdkprivate-x11.h        \
        gdkinputprivate.h       \
-       $(xinput_sources)
+       xsettings-client.h      \
+       xsettings-client.c      \
+       xsettings-common.h      \
+       xsettings-common.c
+
+if XINPUT_XFREE
+libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c
+else
+libgdk_x11_la_SOURCES += gdkinput-none.c
+endif
+
 
 libgdkinclude_HEADERS =        \
        gdkx.h
 
-libgdkx11include_HEADERS =     \
-       gdkdrawable-x11.h       \
-       gdkwindow-x11.h         \
-       gdkpixmap-x11.h
 
-EXTRA_PROGRAMS = gxid
-bin_PROGRAMS = @xinput_progs@
+noinst_PROGRAMS = checksettings
+checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la 
 
-gxid_SOURCES = gxid.c
-gxid_LDADD = $(LDADDS)
+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-gxi.c          \
-       gdkinput-none.c
+       gdkinput-none.c         \
+       gdksettings.c