Merge branch 'master' into harfbuzz-ng-external

Conflicts:
	pango/Makefile.am
	pango/pango-ot-buffer.c
	pango/pango-ot-info.c

Removed:
	pango/opentype/Makefile.am
	pango/opentype/hb-blob.c
	pango/opentype/hb-open-file-private.hh
	pango/opentype/hb-open-type-private.hh
	pango/opentype/hb-ot-layout-common-private.hh
	pango/opentype/hb-ot-layout-gdef-private.hh
	pango/opentype/hb-ot-layout-gpos-private.hh
	pango/opentype/hb-ot-layout-gsub-private.hh
	pango/opentype/hb-ot-layout-gsubgpos-private.hh
	pango/opentype/hb-ot-layout.cc
	pango/opentype/hb-ot-layout.h
	pango/opentype/hb-private.h

1 files changed, 112 insertions, 95 deletions

diff --git a/pango/Makefile.am b/pango/Makefile.am
index e1285b5d..7e033b42 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -4,8 +4,11 @@
 # which are more like other make's VPATH.
 GPATH = $(srcdir)
 
-EXTRA_DIST = 
-BUILT_GIRSOURCES =
+include $(INTROSPECTION_MAKEFILE)
+
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) --add-include-path=.
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=.
 
 SUBDIRS = mini-fribidi
 
@@ -36,7 +39,7 @@ endif
 # ------------------- libpango -------------------
 
 lib_LTLIBRARIES = libpango-1.0.la
-BUILT_GIRSOURCES += Pango-1.0.gir
+INTROSPECTION_GIRS += Pango-1.0.gir
 
 libpango_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
 libpango_1_0_la_LIBADD =		\
@@ -124,8 +127,7 @@ pangoinclude_HEADERS =	   \
 	pango-enum-types.h
 
 pango-enum-types.h: s-enum-types-h
-	$(AM_V_GEN) true
-s-enum-types-h: @REBUILD@ $(pango_headers) Makefile
+s-enum-types-h: $(pango_headers) Makefile.am
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 			--fprod "/* enumerations from \"@filename@\" */\n" \
@@ -137,8 +139,7 @@ s-enum-types-h: @REBUILD@ $(pango_headers) Makefile
 	&& echo timestamp > $(@F)
 
 pango-enum-types.c: s-enum-types-c
-	$(AM_V_GEN) true
-s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
+s-enum-types-c: $(pango_headers) Makefile.am
 	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#include <pango.h>" \
 			--fprod "\n/* enumerations from \"@filename@\" */" \
@@ -153,25 +154,17 @@ s-enum-types-c: @REBUILD@ $(pango_headers) Makefile
 pango-features.h:
 	$(AM_V_GEN) cd $(top_builddir) && ./config.status pango/pango-features.h
 
-Pango-1.0.gir: $(libpango_1_0_la_SOURCES)
-Pango-1.0.gir: $(pango_headers)
-Pango-1.0.gir: libpango-1.0.la
-Pango-1.0.gir: $(G_IR_SCANNER) Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER) -v --namespace Pango --nsversion=1.0 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=cairo-1.0 \
-            --library=libpango-1.0.la \
-	    --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg cairo \
-            --pkg freetype2 \
-	    -I$(top_srcdir) \
-	    $(PANGO_CFLAGS) \
-            $(libpango_1_0_la_SOURCES) \
+pango_introspection_files = \
+        $(libpango_1_0_la_SOURCES) \
 	    $(pango_headers) \
- 	    pango-enum-types.h
+	    pango-enum-types.h
+Pango-1.0.gir: libpango-1.0.la
+
+Pango_1_0_gir_PACKAGES = gobject-2.0 cairo freetype2
+Pango_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0
+Pango_1_0_gir_LIBS = libpango-1.0.la
+Pango_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS)
+Pango_1_0_gir_FILES = $(filter-out %-private.h, $(pango_introspection_files))
 
 # ------------------- libpangox -------------------
 
@@ -217,7 +210,7 @@ libpangox_1_0_la_SOURCES = 			\
 if HAVE_FREETYPE
 pangoinclude_HEADERS += $(pangoft2_headers)
 lib_LTLIBRARIES += libpangoft2-1.0.la
-BUILT_GIRSOURCES += PangoFT2-1.0.gir
+INTROSPECTION_GIRS += PangoFT2-1.0.gir
 endif
 
 pangoft2_headers = 		\
@@ -267,32 +260,25 @@ endif
 pangoft2-win32-res.o: pangoft2.rc
 	$(AM_V_GEN) $(WINDRES) $< $@
 
-PangoFT2-1.0.gir: $(pangoft2_headers)
-PangoFT2-1.0.gir: $(libpangoft2_1_0_la_SOURCES)
+pangoft2_introspection_files = \
+        $(pangoft2_headers) \
+        $(pangoft2_public_sources)
+
 PangoFT2-1.0.gir: libpangoft2-1.0.la
-PangoFT2-1.0.gir: Pango-1.0.gir $(G_IR_SCANNER) Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoFT2 --nsversion=1.0 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=Pango-1.0 \
-            --include=freetype2-2.0 \
-            --include=fontconfig-2.0 \
-            --library=libpangoft2-1.0.la \
-	    --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg freetype2 \
-            --pkg pangoft2 \
-	    -I$(top_srcdir) \
-            $(pangoft2_headers) \
-            $(pangoft2_public_sources)
+PangoFT2-1.0.gir: Pango-1.0.gir
+
+PangoFT2_1_0_gir_PACKAGES = gobject-2.0 freetype2 pangoft2
+PangoFT2_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango-1.0 freetype2-2.0 fontconfig-2.0
+PangoFT2_1_0_gir_LIBS = libpangoft2-1.0.la
+PangoFT2_1_0_gir_CFLAGS = -I$(top_srcdir)
+PangoFT2_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoft2_introspection_files)))
 
 # ------------------- libpangoxft -------------------
 
 if HAVE_XFT
 pangoinclude_HEADERS += $(pangoxft_headers)
 lib_LTLIBRARIES += libpangoxft-1.0.la
-BUILT_GIRSOURCES += PangoXft-1.0.gir
+INTROSPECTION_GIRS += PangoXft-1.0.gir
 endif
 
 pangoxft_headers = pangoxft.h pangoxft-render.h
@@ -323,33 +309,25 @@ libpangoxft_1_0_la_SOURCES =   	\
 	pangoxft-private.h	\
 	pangoxft-render.c
 
+pangoxft_introspection_files = \
+    $(pangoxft_headers) \
+    $(libpangoxft_1_0_la_SOURCES)
 
-PangoXft-1.0.gir: $(pangoxft_headers)
-PangoXft-1.0.gir: $(libpangoxft_1_0_la_SOURCES)
 PangoXft-1.0.gir: libpangoxft-1.0.la
-PangoXft-1.0.gir: Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER) Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=xft-2.0 \
-            --include=xlib-2.0 \
-            --include=PangoFT2-1.0 \
-            --library=libpangoxft-1.0.la \
-	    --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg freetype2 \
-	    -I$(top_srcdir) \
-	    $(PANGO_CFLAGS) \
-            $(pangoxft_headers) \
-            $(libpangoxft_1_0_la_SOURCES)
+PangoXft-1.0.gir: PangoFT2-1.0.gir
+
+PangoXft_1_0_gir_PACKAGES = gobject-2.0 freetype2
+PangoXft_1_0_gir_INCLUDES = GObject-2.0 PangoFT2-1.0 xft-2.0 xlib-2.0
+PangoXft_1_0_gir_LIBS = libpangoxft-1.0.la
+PangoXft_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS)
+PangoXft_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangoxft_introspection_files)))
 
 # ------------------- libpangocairo -------------------
 
 if HAVE_CAIRO
 pangoinclude_HEADERS += $(pangocairo_headers)
 lib_LTLIBRARIES += libpangocairo-1.0.la
-BUILT_GIRSOURCES += PangoCairo-1.0.gir
+INTROSPECTION_GIRS += PangoCairo-1.0.gir
 endif
 
 pangocairo_headers = pangocairo.h
@@ -362,18 +340,23 @@ libpangocairo_1_0_la_LIBADD =			\
 	$(libm)
 libpangocairo_1_0_la_DEPENDENCIES =		\
 	libpango-$(PANGO_API_VERSION).la
-libpangocairo_1_0_la_SOURCES =  \
+pangocairo_core_sources = \
 	pangocairo-context.c    \
 	pangocairo-font.c	\
 	pangocairo-fontmap.c    \
 	pangocairo-render.c	\
 	pangocairo-private.h
 
+libpangocairo_1_0_la_SOURCES = $(pangocairo_core_sources)
+
 if HAVE_CAIRO_WIN32
 if PLATFORM_WIN32
-libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
-libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
+libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def -Wl,pangocairo-win32-res.o
+libpangocairo_1_0_la_DEPENDENCIES += pangocairo-win32-res.o pangocairo.def
 endif
+pangocairo-win32-res.o: pangocairo.rc
+	$(AM_V_GEN) $(WINDRES) $< $@
+
 
 libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
 libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la 
@@ -413,26 +396,18 @@ libpangocairo_1_0_la_LIBADD += $(INCLUDED_ATSUI_MODULES)
 PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoATSUI-1.0
 endif
 
-PangoCairo-1.0.gir: $(libpangocairo_1_0_la_SOURCES)
-PangoCairo-1.0.gir: $(pangocairo_headers)
+pangocairo_introspection_files = \
+    $(libpangocairo_1_0_la_SOURCES) \
+    $(pangocairo_headers)
+
 PangoCairo-1.0.gir: libpangocairo-1.0.la
-PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir $(G_IR_SCANNER) Makefile
-	$(AM_V_GEN) $(G_IR_SCANNER) -v --namespace PangoCairo --nsversion=1.0 \
-	    --add-include-path=$(srcdir) --add-include-path=. \
-            --include=GObject-2.0 \
-            --include=cairo-1.0 \
-            --include=Pango-1.0 \
-	    --add-include-path=. \
-	    --include=$(PANGOCAIRO_FONT_BACKEND_GI_MODULE) \
-            --library=libpangocairo-1.0.la \
-	    --libtool="$(LIBTOOL)" \
-            --output $@ \
-            --pkg gobject-2.0 \
-            --pkg cairo \
-	    -I$(top_srcdir) \
-	    $(PANGO_CFLAGS) \
-            $(libpangocairo_1_0_la_SOURCES) \
-	    $(pangocairo_headers)
+PangoCairo-1.0.gir: Pango-1.0.gir $(PANGOCAIRO_FONT_BACKEND_GI_MODULE).gir
+
+PangoCairo_1_0_gir_PACKAGES = gobject-2.0 cairo
+PangoCairo_1_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Pango-1.0 $(PANGOCAIRO_FONT_BACKEND_GI_MODULE)
+PangoCairo_1_0_gir_LIBS = libpangocairo-1.0.la
+PangoCairo_1_0_gir_CFLAGS = -I$(top_srcdir) $(PANGO_CFLAGS)
+PangoCairo_1_0_gir_FILES = $(filter-out %-private.h, $(addprefix $(srcdir)/,$(pangocairo_introspection_files)))
 
 # ------------------- libpangowin32 -------------------
 
@@ -543,14 +518,11 @@ pangocairo-$(PANGO_API_VERSION).lib: libpangocairo-$(PANGO_API_VERSION).la $(src
 
 if HAVE_INTROSPECTION
 
-girdir = $(GIRDIR)
-gir_DATA = $(BUILT_GIRSOURCES)
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(TYPELIBDIR)
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(G_IR_COMPILER)
-	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $(builddir)/$(@F)
+typelibsdir = $(libdir)/girepository-1.0
+typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 endif # HAVE_INTROSPECTION
 
@@ -579,9 +551,11 @@ pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
 endif
 pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 
-EXTRA_DIST +=					\
+EXTRA_DIST =					\
 	pango-enum-types.h			\
 	module-defs.h				\
+	module-defs.h.win32			\
+	module-defs-lang.c.win32		\
 	module-defs-fc.c.win32			\
 	module-defs-win32.c.win32		\
 	pango.def				\
@@ -596,6 +570,8 @@ EXTRA_DIST +=					\
 	pangoft2.rc.in				\
 	pangowin32.rc				\
 	pangowin32.rc.in			\
+	pangocairo.rc				\
+	pangocairo.rc.in			\
 	pangox.rc				\
 	pangox.rc.in				\
 	pangoxft.rc				\
@@ -628,7 +604,9 @@ CLEANFILES =			\
 	pango-enum-types.h	\
 	s-enum-types-h		\
 	pango-enum-types.c	\
-	s-enum-types-c
+	s-enum-types-c      \
+    $(INTROSPECTION_GIRS) \
+    $(INTROSPECTION_GIRS:.gir=.typelib)
 
 MOSTLYCLEANFILES = 		\
 	*.list			\
@@ -651,4 +629,43 @@ uninstall-local: uninstall-ms-lib uninstall-def-files
 
 TESTS = check.defs
 
+dist-hook: \
+	../build/win32/vs9/pango.vcproj \
+	../build/win32/vs9/pangoft2.vcproj \
+	../build/win32/vs9/pangocairo.vcproj
+
+# pangowin32.vcproj is not automatically built, it is not being changed
+
+../build/win32/vs9/pango.vcproj: $(top_srcdir)/build/win32/vs9/pango.vcprojin mini-fribidi/libmini-fribidi.sourcefiles
+	-rm $@
+	for F in $(libpango_1_0_la_SOURCES); do \
+		case $$F in \
+		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
+		     ;; \
+		esac; \
+	done >libpango.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vcprojin >$@
+
+../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin opentype/libharfbuzz.sourcefiles
+	-rm $@
+	for F in $(libpangoft2_1_0_la_SOURCES); do \
+		case $$F in \
+		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
+		     ;; \
+		esac; \
+	done >libpangoft2.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangoft2.vcprojin >$@
+
+../build/win32/vs9/pangocairo.vcproj: $(top_srcdir)/build/win32/vs9/pangocairo.vcprojin
+# Backend-specific sources for the libpangocairo DLL are explicitly
+# listed in the vcprojin file
+	-rm $@
+	for F in $(pangocairo_core_sources); do \
+		case $$F in \
+		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
+		     ;; \
+		esac; \
+	done >libpangocairo.sourcefiles
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangocairo.vcprojin >$@
+
 -include $(top_srcdir)/git.mk