Update to changed cairo interface.

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

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 1c01de9bcff302c83afedbfe3c781f01a9d8f23a..13a05aaf5af54339987ac2e2787bd62a9490a993 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -2,35 +2,26 @@
 
 libgdkincludedir = $(includedir)/gtk-2.0/gdk
 
-INCLUDES = @STRIP_BEGIN@               \
+INCLUDES =                             \
        -DG_LOG_DOMAIN=\"Gdk\"          \
-       -DINSIDE_GDK_X11                \
+       -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \
        -DG_DISABLE_DEPRECATED          \
        -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       @GTK_DEBUG_FLAGS@               \
-       @GDK_DEP_CFLAGS@                \
-@STRIP_END@
+       -DGDK_DISABLE_DEPRECATED        \
+       $(GTK_DEBUG_FLAGS)              \
+       $(GDK_DEP_CFLAGS)
 
-LDADDS = @STRIP_BEGIN@                 \
-       @GDK_DEP_LIBS@          \
-@STRIP_END@
+LDADDS = $(GDK_DEP_LIBS)
 
 noinst_LTLIBRARIES = libgdk-x11.la
 
-if XINPUT_XFREE
-xinput_sources =          \
-       gdkinput-x11.c     \
-       gdkinput-xfree.c
-else
-xinput_sources =          \
-       gdkinput-none.c
-endif
-
 libgdk_x11_la_SOURCES =        \
        MwmUtil.h               \
+       gdkasync.c              \
+       gdkasync.h              \
        gdkcolor-x11.c          \
        gdkcursor-x11.c         \
        gdkdisplay-x11.c        \
@@ -48,13 +39,13 @@ 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          \
        gdkvisual-x11.c         \
        gdkwindow-x11.c         \
        gdkwindow-x11.h         \
@@ -65,8 +56,14 @@ libgdk_x11_la_SOURCES =      \
        xsettings-client.h      \
        xsettings-client.c      \
        xsettings-common.h      \
-       xsettings-common.c      \
-       $(xinput_sources)
+       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