Pedantic fixes

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b6b74ce1e86c4939fe1cd738af697ca2f07a6abf..2cd935379b399c0d9e6a362c2d639026cb2b05c9 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -75,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                           \
@@ -101,6 +103,8 @@ gdk_private_headers =                               \
        gdkdisplaymanagerprivate.h              \
        gdkdisplayprivate.h                     \
        gdkdndprivate.h                         \
+       gdkframeclockidle.h                     \
+       gdkframeclockprivate.h                  \
        gdkscreenprivate.h                      \
        gdkinternals.h                          \
        gdkintl.h                               \
@@ -121,10 +125,13 @@ gdk_c_sources =                           \
        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                          \
@@ -204,7 +211,6 @@ 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             \
@@ -230,7 +236,6 @@ x11_introspection_files =           \
        x11/gdkxftdefaults.c            \
        x11/gdkxid.c                    \
        x11/xsettings-client.c          \
-       x11/xsettings-common.c          \
        x11/gdkx.h                      \
        x11/gdkx11cursor.h              \
        x11/gdkx11display.h             \
@@ -341,7 +346,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 )