]> Pileus Git - ~andy/gtk/blobdiff - gdk/Makefile.am
projects / ~andy / gtk / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 cc5346b0f878a1975380d346b7dd31a7ce8c9012..7b40c5ffd7a4359c3cb20b25bb7c918d2d018c47 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -11,12 +11,13 @@ INTROSPECTION_COMPILER_ARGS = \
 
 SUBDIRS = $(GDK_BACKENDS) . tests
 
-DIST_SUBDIRS = win32 x11 quartz broadway tests
+DIST_SUBDIRS = win32 x11 quartz broadway wayland tests
 
 CLEANFILES =
 
 EXTRA_DIST +=                  \
        keynames.txt            \
+       keynames-translate.txt  \
        keyname-table.h         \
        gdkkeynames.c           \
        gen-keyname-table.pl    \
@@ -25,19 +26,19 @@ EXTRA_DIST +=                       \
        gdk.def                 \
        gdkmarshalers.list      \
        gdkwindowimpl.h         \
-       makeenums.pl            \
        makefile.msc            \
        gdk.symbols             \
        gdkenumtypes.c.template \
        gdkenumtypes.h.template \
+       gdkversionmacros.h.in   \
        abicheck.sh
 
-INCLUDES =                             \
+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)
 
@@ -74,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                           \
@@ -100,6 +103,8 @@ gdk_private_headers =                               \
        gdkdisplaymanagerprivate.h              \
        gdkdisplayprivate.h                     \
        gdkdndprivate.h                         \
+       gdkframeclockidle.h                     \
+       gdkframeclockprivate.h                  \
        gdkscreenprivate.h                      \
        gdkinternals.h                          \
        gdkintl.h                               \
@@ -113,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                          \
@@ -137,6 +146,7 @@ gdk_built_sources =                                 \
        gdkenumtypes.c                          \
        gdkmarshalers.h                         \
        gdkmarshalers.c                         \
+       gdkversionmacros.h                      \
        gdkenumtypes.h
 
 #
@@ -144,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 =               \
@@ -177,6 +187,10 @@ if USE_BROADWAY
 libgdk_3_la_LIBADD += broadway/libgdk-broadway.la
 endif # USE_BROADWAY
 
+if USE_WAYLAND
+libgdk_3_la_LIBADD += wayland/libgdk-wayland.la
+endif
+
 if HAVE_INTROSPECTION
 
 introspection_files =          \
@@ -191,23 +205,20 @@ Gdk_3_0_gir_SCANNERFLAGS =        \
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = libgdk-3.la
 Gdk_3_0_gir_FILES = $(introspection_files)
-Gdk_3_0_gir_CFLAGS = $(INCLUDES)
+Gdk_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
 Gdk_3_0_gir_EXPORT_PACKAGES = gdk-3.0
 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            \
@@ -244,7 +255,7 @@ GdkX11_3_0_gir_SCANNERFLAGS =               \
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = libgdk-3.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
-GdkX11_3_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
+GdkX11_3_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
 GdkX11_3_0_gir_EXPORT_PACKAGES = gdk-x11-3.0
 INTROSPECTION_GIRS += GdkX11-3.0.gir
 
@@ -301,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
@@ -334,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 )
 
@@ -345,7 +359,7 @@ stamp-gc-h: $(top_builddir)/config.status
        $(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
        echo timestamp > stamp-gc-h
 
-dist-hook: ../build/win32/vs9/gdk.vcproj
+dist-hook: ../build/win32/vs9/gdk.vcproj ../build/win32/vs10/gdk.vcxproj ../build/win32/vs10/gdk.vcxproj.filters
 
 ../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
        for F in $(libgdk_3_la_SOURCES); do \
@@ -356,6 +370,26 @@ dist-hook: ../build/win32/vs9/gdk.vcproj
        done >libgdk.sourcefiles
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
        rm libgdk.sourcefiles
+       
+../build/win32/vs10/gdk.vcxproj: ../build/win32/vs10/gdk.vcxprojin
+       for F in $(libgdk_3_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgdk.vs10.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxprojin >$@
+       rm libgdk.vs10.sourcefiles
+
+../build/win32/vs10/gdk.vcxproj.filters: ../build/win32/vs10/gdk.vcxproj.filtersin
+       for F in $(libgdk_3_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <ClCompile Include="..\..\..\gdk\'$$F'"><Filter>Source Files</Filter></ClCompile>' \
+                    ;; \
+               esac; \
+       done >libgdk.vs10.sourcefiles.filters
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gdk.vcxproj.filtersin >$@
+       rm libgdk.vs10.sourcefiles.filters
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 
Andy's GTK+ repository