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 6fe36798480cddca8cd72421fd5e4c5ec5835d17..0b6d5ec5d5332754bb2946aab4bcd1d3a2e381b6 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,71 +1,84 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
-INCLUDES = @STRIP_BEGIN@       \
+libgdkincludedir = $(includedir)/gtk-2.0/gdk
+
+INCLUDES =                     \
        -DG_LOG_DOMAIN=\"Gdk\"  \
+       -DGDK_COMPILATION       \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
-       @GTK_DEBUG_FLAGS@       \
-       @GTK_XIM_FLAGS@         \
-       @GTK_LOCALE_FLAGS@      \
-       @GLIB_CFLAGS@           \
-       @x_cflags@              \
-@STRIP_END@
+       -I$(top_builddir)/gdk   \
+       $(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
+libgdk_x11_la_SOURCES =        \
+       MwmUtil.h               \
+       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             \
+       gdkgeometry-x11.c       \
+       gdkglobals-x11.c        \
+       gdkim-x11.c             \
+       gdkimage-x11.c          \
+       gdkinput.c              \
+       gdkkeys-x11.c           \
+       gdkmain-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                \
+       gdkx.h                  \
+       gdkprivate-x11.h        \
+       gdkinputprivate.h       \
+       xsettings-client.h      \
+       xsettings-client.c      \
+       xsettings-common.h      \
+       xsettings-common.c
+
 if XINPUT_XFREE
-xinput_sources =          \
-       gdkinput-x11.c     \
-       gdkinput-xfree.c
+libgdk_x11_la_SOURCES += gdkinput-x11.c gdkinput-xfree.c
 else
-xinput_sources =          \
-       gdkinput-none.c
-endif
+libgdk_x11_la_SOURCES += gdkinput-none.c
 endif
 
-libgdk_x11_la_SOURCES =    \
-       MwmUtil.h          \
-       gdkcc-x11.c        \
-       gdkcolor-x11.c     \
-       gdkcursor-x11.c    \
-       gdkdnd-x11.c       \
-       gdkdrawable-x11.c  \
-       gdkevents-x11.c    \
-       gdkfont-x11.c      \
-       gdkgc-x11.c        \
-       gdkglobals-x11.c   \
-       gdkim-x11.c        \
-       gdkimage-x11.c     \
-       gdkinput.c         \
-       gdkmain-x11.c      \
-       gdkpixmap-x11.c    \
-       gdkproperty-x11.c  \
-       gdkregion-x11.c    \
-       gdkselection-x11.c \
-       gdkvisual-x11.c    \
-       gdkwindow-x11.c    \
-       gdkxid.c           \
-       gxid_lib.c         \
-       gxid_lib.h         \
-       gxid_proto.h       \
-       $(xinput_sources)
 
-EXTRA_PROGRAMS = gxid
-bin_PROGRAMS = @xinput_progs@
+libgdkinclude_HEADERS =        \
+       gdkx.h
+
 
-gxid_SOURCES = gxid.c
-gxid_LDADD = $(LDADDS)
+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 +=                  \
+       gdkinput-x11.c          \
+       gdkinput-xfree.c        \
+       gdkinput-none.c         \
+       gdksettings.c