Merge branch 'native-layout-incubator'

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

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d55c031c843ebabe3382496d452fc0e8a41f5faa..ce39a1c6b4d2726b2cd169203ed07f24d55a2a0d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
-include $(INTROSPECTION_MAKEFILE)
+-include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = \
        --add-include-path=../gdk-pixbuf \
@@ -212,6 +212,7 @@ gtk_public_h_sources =          \
        gtkenums.h              \
        gtkeventbox.h           \
        gtkexpander.h           \
+       gtkextendedlayout.h     \
        gtkfilechooser.h        \
        gtkfilechooserbutton.h  \
        gtkfilechooserdialog.h  \
@@ -259,6 +260,7 @@ gtk_public_h_sources =          \
        gtkmountoperation.h     \
        gtknotebook.h           \
        gtkobject.h             \
+       gtkoffscreenwindow.h    \
        gtkorientable.h         \
        gtkpagesetup.h          \
        gtkpaned.h              \
@@ -465,6 +467,7 @@ gtk_base_c_sources =            \
        gtkentrycompletion.c    \
        gtkeventbox.c           \
        gtkexpander.c           \
+       gtkextendedlayout.c     \
        gtkfilechooser.c        \
        gtkfilechooserbutton.c  \
        gtkfilechooserdefault.c \
@@ -526,6 +529,7 @@ gtk_base_c_sources =            \
        gtkmountoperation.c     \
        gtknotebook.c           \
        gtkobject.c             \
+       gtkoffscreenwindow.c    \
        gtkorientable.c         \
        gtkpagesetup.c          \
        gtkpaned.c              \
@@ -644,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               \
@@ -941,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
@@ -969,7 +985,8 @@ TEST_DEPS = $(DEPS) gtk.immodules
 LDADDS =                                                               \
        $(gtktargetlib)                                                 \
        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la  \
-       $(top_builddir)/gdk/$(gdktargetlib)
+       $(top_builddir)/gdk/$(gdktargetlib)                             \
+       $(GTK_DEP_LIBS)
 
 if HAVE_INTROSPECTION
 introspection_files = \
@@ -978,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 = \
@@ -990,10 +1007,10 @@ Gtk_2_0_gir_LIBS = $(gtktargetlib)
 Gtk_2_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
 INTROSPECTION_GIRS += Gtk-2.0.gir
 
-girdir = $(INTROSPECTION_GIRDIR)
+girdir = $(datadir)/gir-1.0
 dist_gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
@@ -1024,7 +1041,7 @@ gtk-update-icon-cache.exe.manifest:
        (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
         echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
         echo '  <assemblyIdentity version="1.0.0.0"' ; \
-        echo '     processorArchitecture="'$(LIB_EXE_MACHINE_FLAG)'"' ; \
+        echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
         echo '     name="gtk-update-icon-cache.exe"' ; \
         echo '     type="win32"/>' ; \
         echo '  <!-- Identify the application security requirements. -->' ; \
@@ -1046,7 +1063,10 @@ gtk_query_immodules_2_0_LDADD = $(LDADDS)
 
 gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
-gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
+gtk_update_icon_cache_LDADD = \
+       $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+       $(GDK_PIXBUF_DEP_LIBS)
+
 
 gtk_update_icon_cache_SOURCES = \
        updateiconcache.c