Add Visual Studio 2008 project files

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

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e319e3bd139b42ae4a8feb385924b28313e0ed17..1a783c370aa530c4255b63b9d0cac3f1dfcc9f69 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -1,9 +1,19 @@
 ## Makefile.am for gtk+/gdk
 include $(top_srcdir)/Makefile.decl
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = \
+   --add-include-path=../gdk-pixbuf
+INTROSPECTION_COMPILER_ARGS = \
+   --includedir=$(srcdir) \
+   --includedir=. \
+   --includedir=../gdk-pixbuf
 
 SUBDIRS = $(gdktarget) . tests
 DIST_SUBDIRS = win32 x11 quartz directfb tests
 
+CLEANFILES =
+
 EXTRA_DIST +=                  \
        keynames.txt            \
        keyname-table.h         \
@@ -13,6 +23,7 @@ EXTRA_DIST +=                 \
        gdk.def                 \
        gdkmarshalers.list      \
        gdkmedialib.h           \
+       gdkwindowimpl.h         \
        makeenums.pl            \
        makefile.msc            \
        gdk.symbols             \
@@ -28,7 +39,6 @@ INCLUDES =                              \
        -I$(top_srcdir)                 \
        -I$(top_builddir)/gdk           \
        -I$(top_srcdir)/gdk-pixbuf      \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
        $(GTK_DEBUG_FLAGS)              \
        $(GDK_DEP_CFLAGS)
 
@@ -98,10 +108,14 @@ gdk_built_public_sources =                 \
        gdkenumtypes.h
 
 gdk_built_private_headers =                    \
-       gdkprivate.h                            \
-       gdkwindowimpl.h                         \
        gdkalias.h
 
+gdk_private_headers =   \
+       gdkinternals.h \
+       gdkintl.h \
+    gdkpoly-generic.h  \
+       gdkregion-generic.h
+
 gdk_c_sources =                 \
        $(medialib_sources)     \
        gdk.c                   \
@@ -118,19 +132,16 @@ gdk_c_sources =                 \
        gdkgc.c                 \
        gdkglobals.c            \
        gdkimage.c              \
-       gdkinternals.h          \
-       gdkintl.h               \
        gdkkeys.c               \
        gdkkeyuni.c             \
+       gdkoffscreenwindow.c    \
        gdkpango.c              \
        gdkpixbuf-drawable.c    \
        gdkpixbuf-render.c      \
        gdkpixmap.c             \
-       gdkpoly-generic.h       \
        gdkpolyreg-generic.c    \
        gdkrectangle.c          \
        gdkregion-generic.c     \
-       gdkregion-generic.h     \
        gdkrgb.c                \
        gdkscreen.c             \
        gdkselection.c          \
@@ -153,10 +164,11 @@ gdk_built_sources =                               \
 gdkincludedir = $(includedir)/gtk-2.0/gdk
 gdkinclude_HEADERS = $(gdk_public_h_sources) $(gdk_built_public_sources)
 
-# gdkmarshalers.c is not here because it is currently an empty file
 common_sources =                \
-       $(gdk_c_sources)        \
+       $(gdk_private_headers)      \
+    $(gdk_c_sources)   \
        gdkenumtypes.c          \
+       gdkmarshalers.c         \
        gdkmarshalers.h
 
 libgdk_directfb_2_0_la_SOURCES = $(common_sources) 
@@ -180,6 +192,32 @@ libgdk_win32_2_0_la_LIBADD = win32/libgdk-win32.la $(GDK_DEP_LIBS) \
 libgdk_win32_2_0_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o gdk.def
 libgdk_win32_2_0_la_LDFLAGS = -Wl,win32/rc/gdk-win32-res.o -export-symbols $(srcdir)/gdk.def $(LDADD)
 
+if HAVE_INTROSPECTION
+
+introspection_files = \
+               $(gdk_public_h_sources) \
+               $(gdk_c_sources) \
+        gdkenumtypes.c \
+        gdkenumtypes.h \
+        $(srcdir)/x11/*.c
+
+Gdk-2.0.gir: $(gdktargetlib) Makefile
+Gdk_2_0_gir_SCANNERFLAGS = --strip-prefix=Gdk --add-include-path=../gdk-pixbuf
+Gdk_2_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
+Gdk_2_0_gir_LIBS = $(gdktargetlib)
+Gdk_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_files))
+Gdk_2_0_gir_CFLAGS = $(INCLUDES)
+INTROSPECTION_GIRS += Gdk-2.0.gir
+
+girdir = $(datadir)/gir-1.0
+dist_gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES += $(dist_gir_DATA) $(typelibs_DATA)
+endif
+
 if OS_WIN32
 install-def-file: gdk.def
        $(INSTALL) $(srcdir)/gdk.def $(DESTDIR)$(libdir)/gdk-win32-2.0.def
@@ -194,7 +232,7 @@ if MS_LIB_AVAILABLE
 noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
 
 gdk-win32-$(GTK_API_VERSION).lib: libgdk-win32-$(GTK_API_VERSION).la gdk.def
-       lib -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
 
 install-ms-lib:
        $(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
@@ -270,11 +308,11 @@ gdkenumtypes.c: @REBUILD@ $(gdk_public_h_sources) gdkenumtypes.c.template
 # Marshaller generation
 #
 gdkmarshalers.h: @REBUILD@ gdkmarshalers.list
-       $(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
+       $(GLIB_GENMARSHAL) --prefix=_gdk_marshal $(srcdir)/gdkmarshalers.list --header > gdkmarshalers-h.tmp \
        && mv gdkmarshalers-h.tmp gdkmarshalers.h \
        || ( rm -f gdkmarshalers-h.tmp && exit 1)
 gdkmarshalers.c: @REBUILD@ gdkmarshalers.list
-       (echo "#include \"gdkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gdk_marshal $(srcdir)/gdkmarshalers.list --body) > gdkmarshalers-c.tmp     \
+       (echo "#include \"gdkalias.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 )
 
@@ -285,6 +323,18 @@ stamp-gc-h: $(top_builddir)/config.status
        cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h
        echo timestamp > stamp-gc-h
 
+dist-hook: ../build/win32/vs9/gdk.vcproj
+
+../build/win32/vs9/gdk.vcproj: ../build/win32/vs9/gdk.vcprojin
+       for F in $(libgdk_win32_2_0_la_SOURCES); do \
+               case $$F in \
+               *.c) echo '   <File RelativePath="..\..\..\gdk\'$$F'" />' \
+                    ;; \
+               esac; \
+       done >libgdk.sourcefiles
+       $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gdk.vcprojin >$@
+       rm libgdk.sourcefiles
+
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
 
 install-data-local: install-ms-lib install-def-file
@@ -305,3 +355,5 @@ files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
          echo $$p; \
        done
+
+-include $(top_srcdir)/git.mk