Merge branch 'native-layout-incubator'

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index c29509f0cb0b8813de49a6f3217e80797bf6e585..ce39a1c6b4d2726b2cd169203ed07f24d55a2a0d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -648,9 +648,9 @@ gtk_public_h_sources += \
        gtkclist.h              \
        gtkcombo.h              \
        gtkctree.h              \
-       gtkcurve.h              \
+       gtkcurve.h              \
        gtkfilesel.h            \
-       gtkgamma.h              \
+       gtkgamma.h              \
        gtkinputdialog.h        \
        gtkitemfactory.h        \
        gtklist.h               \
@@ -945,6 +945,18 @@ install-mac-key-theme:
 uninstall-mac-key-theme:
 endif
 
+dist-hook: ../build/win32/vs9/gtk.vcproj
+
+../build/win32/vs9/gtk.vcproj: ../build/win32/vs9/gtk.vcprojin
+       for F in $(gtk_base_c_sources) $(gtk_os_win32_c_sources) $(gtk_use_win32_c_sources); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gtk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgtk.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk.vcprojin >$@
+       rm libgtk.sourcefiles
+
 # Install a RC file for the default GTK+ theme, and key themes
 install-data-local: install-ms-lib install-def-file install-mac-key-theme
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-2.0
@@ -983,7 +995,7 @@ introspection_files = \
     gtktypebuiltins.h \
     gtktypebuiltins.c
 
-Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) Makefile
+Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
 Gtk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
 Gtk_2_0_gir_INCLUDES = Atk-1.0 Gdk-2.0
 Gtk_2_0_gir_CFLAGS = \