x11: Move screen-specific API into gdkx11screen.h

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

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index a33987805c73546b9cb1c2f9a36824ef5f372139..f6982d413af5d8259082f931c2c44aea32d75642 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -1,89 +1,94 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
-libgdkincludedir = $(includedir)/gtk-2.0/gdk
+libgdkincludedir = $(includedir)/gtk-3.0/gdk
+libgdkx11includedir = $(includedir)/gtk-3.0/gdk/x11
 
-INCLUDES = @STRIP_BEGIN@               \
-       -DG_LOG_DOMAIN=\"Gdk\"          \
-       -DGDK_COMPILATION               \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/gdk             \
-       -I$(top_builddir)/gdk           \
-       -DG_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
-       @GTK_DEBUG_FLAGS@               \
-       @GDK_DEP_CFLAGS@                \
-@STRIP_END@
+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 = @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               \
-       gdkcolor-x11.c          \
-       gdkcursor-x11.c         \
+libgdk_x11_la_SOURCES =        \
+       MwmUtil.h               \
+       gdkapplaunchcontext-x11.c \
+       gdkasync.c              \
+       gdkasync.h              \
+       gdkcursor-x11.c         \
+       gdkdevice-core.h        \
+       gdkdevice-core.c        \
+       gdkdevicemanager-core.h \
+       gdkdevicemanager-core.c \
+       gdkdevicemanager-x11.c  \
+       gdkdisplaymanager-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             \
+       gdkdnd-x11.c            \
+       gdkeventsource.c        \
+       gdkeventsource.h        \
+       gdkeventtranslator.c    \
+       gdkeventtranslator.h    \
        gdkgeometry-x11.c       \
-       gdkglobals-x11.c        \
-       gdkim-x11.c             \
-       gdkimage-x11.c          \
-       gdkinput.c              \
        gdkkeys-x11.c           \
-       gdkmain-x11.c           \
-       gdkpango-x11.c          \
-       gdkpixmap-x11.c         \
-       gdkpixmap-x11.h         \
-       gdkproperty-x11.c       \
+       gdkmain-x11.c           \
+       gdkproperty-x11.c       \
        gdkscreen-x11.c         \
        gdkscreen-x11.h         \
-       gdkselection-x11.c      \
-       gdkvisual-x11.c         \
-       gdkwindow-x11.c         \
+       gdkselection-x11.c      \
+       gdktestutils-x11.c      \
+       gdkvisual-x11.c         \
+       gdkwindow-x11.c         \
        gdkwindow-x11.h         \
-       gdkxid.c                \
-       gdkx.h                  \
-       gdkprivate-x11.h        \
-       gdkinputprivate.h       \
+       gdkxftdefaults.c        \
+       gdkxid.c                \
+       gdkx.h                  \
+       gdkprivate-x11.h        \
        xsettings-client.h      \
        xsettings-client.c      \
        xsettings-common.h      \
-       xsettings-common.c      \
-       $(xinput_sources)
+       xsettings-common.c
+
+if XINPUT_XFREE
+libgdk_x11_la_SOURCES +=       \
+       gdkdevicemanager-xi.c   \
+       gdkdevicemanager-xi.h   \
+       gdkdevice-xi.c          \
+       gdkdevice-xi.h
+if XINPUT_2
+libgdk_x11_la_SOURCES +=       \
+       gdkdevicemanager-xi2.c  \
+       gdkdevicemanager-xi2.h  \
+       gdkdevice-xi2.c         \
+       gdkdevice-xi2.h
+endif
+endif
+
 
 libgdkinclude_HEADERS =        \
        gdkx.h
 
+libgdkx11include_HEADERS =     \
+       gdkx11cursor.h          \
+       gdkx11screen.h          \
+       gdkx11visual.h          \
+       gdkx11window.h
+
+noinst_PROGRAMS = checksettings
+checksettings_LDADD = libgdk-x11.la $(GLIB_LIBS)
+
+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
-
-###########################################
-# Hack to get gdkenumtypes.h built first
-###########################################
-                                       
-$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h
+EXTRA_DIST +=                  \
+       gdksettings.c
 
-$(top_srcdir)/gdk/gdkenumtypes.h:
-       @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h
+-include $(top_srcdir)/git.mk