Makefile.msvcproj, Makefile-newvs.am: Update from GLib

[platform/upstream/atk.git] / atk / Makefile.am

diff --git a/atk/Makefile.am b/atk/Makefile.am
index 53421bf..875f616 100644 (file)
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -4,6 +4,7 @@ GPATH = $(srcdir)
 
 include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
 
 CLEANFILES =
 
@@ -171,7 +172,7 @@ introspection_generated_sources = \
 
 Atk-1.0.gir: libatk-1.0.la Makefile
 Atk_1_0_gir_INCLUDES = GObject-2.0
-Atk_1_0_gir_CFLAGS = $(AM_CPPFLAGS)
+Atk_1_0_gir_CFLAGS = $(AM_CPPFLAGS) -I ..
 Atk_1_0_gir_LIBS = libatk-1.0.la
 Atk_1_0_gir_SCANNERFLAGS = --pkg-export atk --warn-all --c-include "atk/atk.h"
 Atk_1_0_gir_FILES = \
@@ -191,7 +192,7 @@ endif
 # ---------- Win32 stuff ----------
 
 if OS_WIN32
-libatk_1_0_la_LDFLAGS += -export-symbols atk.def -no-undefined -Wl,atk-win32-res.o
+libatk_1_0_la_LDFLAGS += -no-undefined -Wl,atk-win32-res.o
 libatk_1_0_la_DEPENDENCIES = atk-win32-res.o
 endif
 
@@ -204,6 +205,55 @@ DISTCLEANFILES = \
   stamp-atkmarshal.h stamp-atkmarshal.c \
   s-enum-types-h s-enum-types-c
 
+# ---------- MSVC Project Items ---------
+MSVCPROJS = atk
+
+atk_FILES = $(libatk_1_0_la_SOURCES)
+atk_EXCLUDES = atkdummy
+
+atk_HEADERS_DIR = $(libatkincludedir)
+atk_HEADERS_INST = $(libatkinclude_HEADERS) atkversion.h
+atk_HEADERS_EXCLUDES = $(top_builddir)/atk/atkversion.h
+
+include $(top_srcdir)/build/Makefile.msvcproj
+
+if HAVE_INTROSPECTION
+# Introspection Items for MSVC
+MSVC_INTROSPECT_GIRS = Atk-1.0.gir
+
+INTROSPECTION_INTERMEDIATE_ITEMS = \
+       $(top_builddir)/build/win32/Atk-1.0.gir.msvc.introspect \
+       $(top_builddir)/build/win32/Atk_1_0_gir_list
+
+Atk_1_0_gir_MSVC_EXPORT_PACKAGES = atk
+Atk_1_0_gir_MSVC_INCLUDE_GIRS = $(Atk_1_0_gir_INCLUDES)
+Atk_1_0_gir_MSVC_LIBS = atk-1.0
+Atk_1_0_gir_MSVC_FILES =               \
+       $(introspection_sources)        \
+       atkversion.h                    \
+       atk-enum-types.c                \
+       atk-enum-types.h
+
+Atk_1_0_gir_MSVC_CFLAGS =              \
+       -I../..                         \
+       -DG_DISABLE_DEPRECATED  \
+       -DATK_DISABLE_DEPRECATED        \
+       -DATK_COMPILATION       \
+       -DATK_LOCALEDIR="\\\"/dummy/share/locale\\\""
+
+Atk_1_0_gir_MSVC_SCANNERFLAGS = --warn-all --c-include "atk/atk.h"
+
+include $(top_srcdir)/build/Makefile.msvc-introspection
+
+else
+INTROSPECTION_INTERMEDIATE_ITEMS =
+endif
+
+dist-hook: \
+       $(top_builddir)/build/win32/vs9/atk.vcproj      \
+       $(top_builddir)/build/win32/vs9/atk.headers     \
+       $(INTROSPECTION_INTERMEDIATE_ITEMS)
+
 distclean-local:
        if test $(srcdir) = .; then :; else \
          rm -f atkmarshal.h atkmarshal.c atk-enum-types.h atk-enum-types.c; \