gdk: Make gen-keyname-table.pl work again

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index cc5346b0f878a1975380d346b7dd31a7ce8c9012..0c8011558fd1ba57d453c5d818b65a08b7689c53 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,14 +26,13 @@ EXTRA_DIST +=                       \
        gdk.def                 \
        gdkmarshalers.list      \
        gdkwindowimpl.h         \
-       makeenums.pl            \
        makefile.msc            \
        gdk.symbols             \
        gdkenumtypes.c.template \
        gdkenumtypes.h.template \
        abicheck.sh
 
-INCLUDES =                             \
+AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"Gdk\"          \
        -DGDK_COMPILATION               \
        -I$(top_srcdir)                 \
@@ -177,6 +177,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,7 +195,7 @@ 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
 
@@ -244,7 +248,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
 
@@ -345,7 +349,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 +360,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