Set GPATH to fix srcdir != builddir problems with GNU make.

Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>

        * docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
        builddir problems with GNU make.

10 files changed, 46 insertions, 169 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c35be31..c342e34a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 2c35be31..c342e34a 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 2c35be31..c342e34a 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 2c35be31..c342e34a 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 2c35be31..c342e34a 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 2c35be31..c342e34a 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 2c35be31..c342e34a 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Sun Aug 12 10:33:02 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* docs/Makefile.am pango/Makefile.am: Set GPATH to fix srcdir !=
+	builddir problems with GNU make.
+
 2001-08-10  Hans Breuer  <hans@breuer.org>
 
 	* pango/pangowin32.c (pango_win32_render) : restore
diff --git a/docs/Makefile.am b/docs/Makefile.am
index cca3dac1..6cbba4c3 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -68,6 +68,13 @@ dist-hook-local:
 # Everything below here is generic #
 ####################################
 
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH, when it comes to
+# whether a source that is a target of one rule is then
+# searched for in VPATH/GPATH.
+#
+GPATH = $(srcdir)
+
 TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
 
 EXTRA_DIST = 				\
diff --git a/docs/tmpl/win32-fonts.sgml b/docs/tmpl/win32-fonts.sgml
index ac456cb2..2d554078 100644
--- a/docs/tmpl/win32-fonts.sgml
+++ b/docs/tmpl/win32-fonts.sgml
@@ -29,18 +29,6 @@ Win32 Fonts and Rendering
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_win32_load_font ##### -->
-<para>
-
-</para>
-
-@lfps: 
-@n_fonts: 
-@Returns: 
-<!-- # Unused Parameters # -->
-@lfp: 
-
-
 <!-- ##### FUNCTION pango_win32_render ##### -->
 <para>
 
@@ -75,144 +63,6 @@ Win32 Fonts and Rendering
 @y: 
 
 
-<!-- ##### ENUM PangoWin32UnicodeSubrange ##### -->
-<para>
-
-</para>
-
-@PANGO_WIN32_U_BASIC_LATIN: 
-@PANGO_WIN32_U_LATIN_1_SUPPLEMENT: 
-@PANGO_WIN32_U_LATIN_EXTENDED_A: 
-@PANGO_WIN32_U_LATIN_EXTENDED_B: 
-@PANGO_WIN32_U_IPA_EXTENSIONS: 
-@PANGO_WIN32_U_SPACING_MODIFIER_LETTERS: 
-@PANGO_WIN32_U_COMBINING_DIACRITICAL_MARKS: 
-@PANGO_WIN32_U_BASIC_GREEK: 
-@PANGO_WIN32_U_GREEK_SYMBOLS_AND_COPTIC: 
-@PANGO_WIN32_U_CYRILLIC: 
-@PANGO_WIN32_U_ARMENIAN: 
-@PANGO_WIN32_U_HEBREW_EXTENDED: 
-@PANGO_WIN32_U_BASIC_HEBREW: 
-@PANGO_WIN32_U_BASIC_ARABIC: 
-@PANGO_WIN32_U_ARABIC_EXTENDED: 
-@PANGO_WIN32_U_DEVANAGARI: 
-@PANGO_WIN32_U_BENGALI: 
-@PANGO_WIN32_U_GURMUKHI: 
-@PANGO_WIN32_U_GUJARATI: 
-@PANGO_WIN32_U_ORIYA: 
-@PANGO_WIN32_U_TAMIL: 
-@PANGO_WIN32_U_TELUGU: 
-@PANGO_WIN32_U_KANNADA: 
-@PANGO_WIN32_U_MALAYALAM: 
-@PANGO_WIN32_U_THAI: 
-@PANGO_WIN32_U_LAO: 
-@PANGO_WIN32_U_GEORGIAN_EXTENDED: 
-@PANGO_WIN32_U_BASIC_GEORGIAN: 
-@PANGO_WIN32_U_HANGUL_JAMO: 
-@PANGO_WIN32_U_LATIN_EXTENDED_ADDITIONAL: 
-@PANGO_WIN32_U_GREEK_EXTENDED: 
-@PANGO_WIN32_U_GENERAL_PUNCTUATION: 
-@PANGO_WIN32_U_SUPERSCRIPTS_AND_SUBSCRIPTS: 
-@PANGO_WIN32_U_CURRENCY_SYMBOLS: 
-@PANGO_WIN32_U_COMBINING_DIACRITICAL_MARKS_FOR_SYMBOLS: 
-@PANGO_WIN32_U_LETTERLIKE_SYMBOLS: 
-@PANGO_WIN32_U_NUMBER_FORMS: 
-@PANGO_WIN32_U_ARROWS: 
-@PANGO_WIN32_U_MATHEMATICAL_OPERATORS: 
-@PANGO_WIN32_U_MISCELLANEOUS_TECHNICAL: 
-@PANGO_WIN32_U_CONTROL_PICTURES: 
-@PANGO_WIN32_U_OPTICAL_CHARACTER_RECOGNITION: 
-@PANGO_WIN32_U_ENCLOSED_ALPHANUMERICS: 
-@PANGO_WIN32_U_BOX_DRAWING: 
-@PANGO_WIN32_U_BLOCK_ELEMENTS: 
-@PANGO_WIN32_U_GEOMETRIC_SHAPES: 
-@PANGO_WIN32_U_MISCELLANEOUS_SYMBOLS: 
-@PANGO_WIN32_U_DINGBATS: 
-@PANGO_WIN32_U_CJK_SYMBOLS_AND_PUNCTUATION: 
-@PANGO_WIN32_U_HIRAGANA: 
-@PANGO_WIN32_U_KATAKANA: 
-@PANGO_WIN32_U_BOPOMOFO: 
-@PANGO_WIN32_U_HANGUL_COMPATIBILITY_JAMO: 
-@PANGO_WIN32_U_CJK_MISCELLANEOUS: 
-@PANGO_WIN32_U_ENCLOSED_CJK: 
-@PANGO_WIN32_U_CJK_COMPATIBILITY: 
-@PANGO_WIN32_U_HANGUL: 
-@PANGO_WIN32_U_HANGUL_SUPPLEMENTARY_A: 
-@PANGO_WIN32_U_HANGUL_SUPPLEMENTARY_B: 
-@PANGO_WIN32_U_CJK_UNIFIED_IDEOGRAPHS: 
-@PANGO_WIN32_U_PRIVATE_USE_AREA: 
-@PANGO_WIN32_U_CJK_COMPATIBILITY_IDEOGRAPHS: 
-@PANGO_WIN32_U_ALPHABETIC_PRESENTATION_FORMS: 
-@PANGO_WIN32_U_ARABIC_PRESENTATION_FORMS_A: 
-@PANGO_WIN32_U_COMBINING_HALF_MARKS: 
-@PANGO_WIN32_U_CJK_COMPATIBILITY_FORMS: 
-@PANGO_WIN32_U_SMALL_FORM_VARIANTS: 
-@PANGO_WIN32_U_ARABIC_PRESENTATION_FORMS_B: 
-@PANGO_WIN32_U_SPECIALS: 
-@PANGO_WIN32_U_HALFWIDTH_AND_FULLWIDTH_FORMS: 
-@PANGO_WIN32_U_LAST_PLUS_ONE: 
-
-<!-- ##### FUNCTION pango_win32_unicode_classify ##### -->
-<para>
-
-</para>
-
-@wc: 
-@Returns: 
-
-
-<!-- ##### TYPEDEF PangoWin32Subfont ##### -->
-<para>
-
-</para>
-
-
-<!-- ##### MACRO PANGO_WIN32_MAKE_GLYPH ##### -->
-<para>
-
-</para>
-
-@subfont: 
-@index: 
-
-
-<!-- ##### MACRO PANGO_WIN32_GLYPH_SUBFONT ##### -->
-<para>
-
-</para>
-
-@glyph: 
-
-
-<!-- ##### MACRO PANGO_WIN32_GLYPH_INDEX ##### -->
-<para>
-
-</para>
-
-@glyph: 
-
-
-<!-- ##### FUNCTION pango_win32_list_subfonts ##### -->
-<para>
-
-</para>
-
-@font: 
-@subrange: 
-@subfont_ids: 
-@Returns: 
-
-
-<!-- ##### FUNCTION pango_win32_has_glyph ##### -->
-<para>
-
-</para>
-
-@font: 
-@glyph: 
-@Returns: 
-
-
 <!-- ##### FUNCTION pango_win32_get_unknown_glyph ##### -->
 <para>
 
@@ -289,22 +139,3 @@ Win32 Fonts and Rendering
 @Returns: 
 
 
-<!-- ##### FUNCTION pango_win32_font_subfont_logfont ##### -->
-<para>
-
-</para>
-
-@font: 
-@subfont_id: 
-@Returns: 
-
-
-<!-- ##### FUNCTION pango_win32_fontmap_dump ##### -->
-<para>
-
-</para>
-
-@indent: 
-@fontmap: 
-
-
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 9615fc25..5e1641aa 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -1,5 +1,9 @@
 ## Process this file with automake to create Makefile.in.
 
+# We set GPATH here; this gives us semantics for GNU make
+# which are more like other make's VPATH.
+GPATH = $(srcdir)
+
 if HAVE_FREETYPE
 OPENTYPE_SUBDIR=opentype
 endif