x11: Use _gdk_x11_get_xatom_for_display_printf()

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index c7f24af8ce7ecd49132ef14ee5bfbfd6dfe22c45..7b40c5ffd7a4359c3cb20b25bb7c918d2d018c47 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -17,6 +17,7 @@ CLEANFILES =
 
 EXTRA_DIST +=                  \
        keynames.txt            \
+       keynames-translate.txt  \
        keyname-table.h         \
        gdkkeynames.c           \
        gen-keyname-table.pl    \
@@ -29,14 +30,15 @@ EXTRA_DIST +=                       \
        gdk.symbols             \
        gdkenumtypes.c.template \
        gdkenumtypes.h.template \
+       gdkversionmacros.h.in   \
        abicheck.sh
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
        -DGDK_COMPILATION               \
-       -I$(top_srcdir)                 \
        -I$(top_builddir)               \
        -I$(top_builddir)/gdk           \
+       -I$(top_srcdir)                 \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
@@ -73,11 +75,13 @@ gdk_public_h_sources =                              \
        gdkdisplaymanager.h                     \
        gdkdnd.h                                \
        gdkevents.h                             \
+       gdkframetimings.h                       \
        gdkkeys.h                               \
        gdkkeysyms.h                            \
        gdkkeysyms-compat.h                     \
        gdkmain.h                               \
        gdkpango.h                              \
+       gdkframeclock.h                         \
        gdkpixbuf.h                             \
        gdkprivate.h                            \
        gdkproperty.h                           \
@@ -99,6 +103,8 @@ gdk_private_headers =                                \
        gdkdisplaymanagerprivate.h              \
        gdkdisplayprivate.h                     \
        gdkdndprivate.h                         \
+       gdkframeclockidle.h                     \
+       gdkframeclockprivate.h                  \
        gdkscreenprivate.h                      \
        gdkinternals.h                          \
        gdkintl.h                               \
@@ -112,16 +118,20 @@ gdk_c_sources =                           \
        gdkcairo.c                              \
        gdkcolor.c                              \
        gdkcursor.c                             \
+       gdkdeprecated.c                         \
        gdkdevice.c                             \
        gdkdevicemanager.c                      \
        gdkdisplay.c                            \
        gdkdisplaymanager.c                     \
        gdkdnd.c                                \
        gdkevents.c                             \
+       gdkframetimings.c                       \
        gdkglobals.c                            \
        gdkkeys.c                               \
        gdkkeyuni.c                             \
        gdkoffscreenwindow.c                    \
+       gdkframeclock.c                         \
+       gdkframeclockidle.c                     \
        gdkpango.c                              \
        gdkpixbuf-drawable.c                    \
        gdkrectangle.c                          \
@@ -136,6 +146,7 @@ gdk_built_sources =                                 \
        gdkenumtypes.c                          \
        gdkmarshalers.h                         \
        gdkmarshalers.c                         \
+       gdkversionmacros.h                      \
        gdkenumtypes.h
 
 #
@@ -143,7 +154,7 @@ gdk_built_sources =                                 \
 #
 
 gdkincludedir = $(includedir)/gtk-3.0/gdk
-gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h
+gdkinclude_HEADERS = $(gdk_public_h_sources) gdkenumtypes.h gdkversionmacros.h
 nodist_gdkinclude_HEADERS = gdkconfig.h
 
 common_sources =               \
@@ -200,17 +211,14 @@ INTROSPECTION_GIRS += Gdk-3.0.gir
 
 if USE_X11
 x11_introspection_files =              \
-       x11/checksettings.c             \
        x11/gdkapplaunchcontext-x11.c   \
        x11/gdkasync.c                  \
        x11/gdkcursor-x11.c             \
        x11/gdkdevice-core-x11.c        \
        x11/gdkdevicemanager-core-x11.c \
        x11/gdkdevicemanager-x11.c      \
-       x11/gdkdevicemanager-xi.c       \
        x11/gdkdevicemanager-xi2.c      \
        x11/gdkdevice-xi2.c             \
-       x11/gdkdevice-xi.c              \
        x11/gdkdisplay-x11.c            \
        x11/gdkdnd-x11.c                \
        x11/gdkeventsource.c            \
@@ -304,7 +312,9 @@ endif
 lib_LTLIBRARIES = libgdk-3.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
-EXTRA_DIST += $(gdk_built_sources)
+EXTRA_DIST += \
+       $(gdk_built_sources)    \
+       fallback-c89.c
 
 install-exec-hook:
 if DISABLE_EXPLICIT_DEPS
@@ -337,7 +347,8 @@ gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-       $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body > gdkmarshalers-c.tmp  \
+       $(AM_V_GEN) (echo "#include \"gdkmarshalers.h\""; \
+        $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp    \
        && mv gdkmarshalers-c.tmp gdkmarshalers.c \
        || ( rm -f gdkmarshalers-c.tmp && exit 1 )