summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2000-12-18 18:58:24 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-12-18 18:58:24 +0000
commit1a603d00f370167b75a965416080f45824d5b515 (patch)
tree6023e2c3a5b27341215e51d50823ef8d559ac068
parentcf11e920312b335c5eaa21021a1176fe9f913d9b (diff)
downloadpango-1a603d00f370167b75a965416080f45824d5b515.tar.gz
Fix build breakage, reported by Alex Larsson and Yasushi Shoji
2000-12-18 Havoc Pennington <hp@redhat.com> Fix build breakage, reported by Alex Larsson and Yasushi Shoji * pango/pangox.h: don't include pango.h, just individual headers * configure.in: check for perl, add --disable-rebuilds configure option, automatically disable rebuilds if no perl * pango/Makefile.am: use located perl to run makeenums.pl, and don't try to rebuild if we did --disable-rebuilds (EXTRA_DIST): add built headers * modules/*/*.[hc]: don't include pango.h, include specific headers
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLog.pre-1-015
-rw-r--r--ChangeLog.pre-1-1015
-rw-r--r--ChangeLog.pre-1-215
-rw-r--r--ChangeLog.pre-1-415
-rw-r--r--ChangeLog.pre-1-615
-rw-r--r--ChangeLog.pre-1-815
-rw-r--r--configure.in15
-rw-r--r--modules/arabic/arabic-x.c2
-rw-r--r--modules/arabic/arabic.c2
-rw-r--r--modules/arabic/arconv.h1
-rw-r--r--modules/arabic/langboxfont.c1
-rw-r--r--modules/arabic/langboxfont.h1
-rw-r--r--modules/arabic/mulefont.c1
-rw-r--r--modules/arabic/mulefont.h2
-rw-r--r--modules/arabic/naqshfont.c1
-rw-r--r--modules/arabic/naqshfont.h1
-rw-r--r--modules/basic/basic-ft2.c2
-rw-r--r--modules/basic/basic-win32.c1
-rw-r--r--modules/basic/basic-x.c2
-rw-r--r--modules/basic/basic.c2
-rw-r--r--modules/hangul/hangul-x.c2
-rw-r--r--modules/hangul/hangul.c2
-rw-r--r--modules/indic/bengali-x.c2
-rw-r--r--modules/indic/bengali.c2
-rw-r--r--modules/indic/devanagari-x.c2
-rw-r--r--modules/indic/devanagari.c2
-rw-r--r--modules/indic/gujarati-x.c2
-rw-r--r--modules/indic/gujarati.c2
-rw-r--r--modules/indic/gurmukhi-x.c2
-rw-r--r--modules/indic/gurmukhi.c2
-rw-r--r--modules/indic/myanmar-x.c2
-rw-r--r--modules/indic/myanmar.c2
-rw-r--r--modules/tamil/tamil-x.c3
-rw-r--r--modules/tamil/tamil.c3
-rw-r--r--modules/thai/thai-x.c2
-rw-r--r--modules/thai/thai.c2
-rw-r--r--pango/Makefile.am9
-rw-r--r--pango/pangox.h2
39 files changed, 150 insertions, 34 deletions
diff --git a/ChangeLog b/ChangeLog
index 841b9f3e..0daecd00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 841b9f3e..0daecd00 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 841b9f3e..0daecd00 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 841b9f3e..0daecd00 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 841b9f3e..0daecd00 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 841b9f3e..0daecd00 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 841b9f3e..0daecd00 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,18 @@
+2000-12-18 Havoc Pennington <hp@redhat.com>
+
+ Fix build breakage, reported by Alex Larsson and Yasushi Shoji
+
+ * pango/pangox.h: don't include pango.h, just individual headers
+
+ * configure.in: check for perl, add --disable-rebuilds configure
+ option, automatically disable rebuilds if no perl
+
+ * pango/Makefile.am: use located perl to run makeenums.pl,
+ and don't try to rebuild if we did --disable-rebuilds
+ (EXTRA_DIST): add built headers
+
+ * modules/*/*.[hc]: don't include pango.h, include specific headers
+
2000-12-15 Havoc Pennington <hp@pobox.com>
* pango/pango-glyph.h: move pango_shape and pango_reorder_items in
diff --git a/configure.in b/configure.in
index a4cffeeb..a3dd9f5b 100644
--- a/configure.in
+++ b/configure.in
@@ -25,6 +25,21 @@ changequote([,])dnl
AC_PATH_XTRA
+AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
+
+# define a MAINT-like variable REBUILD which is set if Perl
+# is found, so autogenerated sources can be rebuilt
+
+AC_CHECK_PROGS(PERL, perl5 perl)
+
+REBUILD=\#
+if test "x$enable_rebuilds" = "xyes" && \
+ test -n "$PERL" && \
+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
+ REBUILD=
+fi
+AC_SUBST(REBUILD)
+
if test x$no_x = xyes ; then
AC_MSG_ERROR([X development libraries not found])
fi
diff --git a/modules/arabic/arabic-x.c b/modules/arabic/arabic-x.c
index 8115e606..ebacdfbd 100644
--- a/modules/arabic/arabic-x.c
+++ b/modules/arabic/arabic-x.c
@@ -9,7 +9,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "pango.h"
+#include "pango-engine.h"
#include "pangox.h"
#include "arconv.h"
diff --git a/modules/arabic/arabic.c b/modules/arabic/arabic.c
index 8115e606..ebacdfbd 100644
--- a/modules/arabic/arabic.c
+++ b/modules/arabic/arabic.c
@@ -9,7 +9,7 @@
#include <stdio.h>
#include <glib.h>
#include <string.h>
-#include "pango.h"
+#include "pango-engine.h"
#include "pangox.h"
#include "arconv.h"
diff --git a/modules/arabic/arconv.h b/modules/arabic/arconv.h
index a0180e4c..57ee7d57 100644
--- a/modules/arabic/arconv.h
+++ b/modules/arabic/arconv.h
@@ -9,7 +9,6 @@
#define __arconv_h_
#include <glib.h>
-#include "pango.h"
#include "pangox.h"
/*
diff --git a/modules/arabic/langboxfont.c b/modules/arabic/langboxfont.c
index 2cf84f57..831b76e3 100644
--- a/modules/arabic/langboxfont.c
+++ b/modules/arabic/langboxfont.c
@@ -8,7 +8,6 @@
#include <stdio.h>
#include <glib.h>
-#include "pango.h"
#include "pangox.h"
/* #define DEBUG */
diff --git a/modules/arabic/langboxfont.h b/modules/arabic/langboxfont.h
index 59be6e8c..75381e37 100644
--- a/modules/arabic/langboxfont.h
+++ b/modules/arabic/langboxfont.h
@@ -6,7 +6,6 @@
*/
#ifndef __lboxfont_h_
#define __lboxfont_h_
-#include "pango.h"
#include "pangox.h"
#include "arconv.h"
diff --git a/modules/arabic/mulefont.c b/modules/arabic/mulefont.c
index 084f19ac..2843e73c 100644
--- a/modules/arabic/mulefont.c
+++ b/modules/arabic/mulefont.c
@@ -8,7 +8,6 @@
#include <stdio.h>
#include <glib.h>
-#include "pango.h"
#include "pangox.h"
diff --git a/modules/arabic/mulefont.h b/modules/arabic/mulefont.h
index 6851ae7d..34c6507b 100644
--- a/modules/arabic/mulefont.h
+++ b/modules/arabic/mulefont.h
@@ -6,7 +6,7 @@
*/
#ifndef __mulefont_h_
#define __mulefont_h_
-#include "pango.h"
+#include "pango-layout.h"
#include "pangox.h"
#include "arconv.h"
diff --git a/modules/arabic/naqshfont.c b/modules/arabic/naqshfont.c
index d4885245..3b1f70d6 100644
--- a/modules/arabic/naqshfont.c
+++ b/modules/arabic/naqshfont.c
@@ -9,7 +9,6 @@
#include <stdio.h>
#include <glib.h>
-#include "pango.h"
#include "pangox.h"
/* #define DEBUG */
diff --git a/modules/arabic/naqshfont.h b/modules/arabic/naqshfont.h
index 4abde1e3..4d45d57b 100644
--- a/modules/arabic/naqshfont.h
+++ b/modules/arabic/naqshfont.h
@@ -6,7 +6,6 @@
*/
#ifndef __nqfont_h_
#define __nqfont_h_
-#include "pango.h"
#include "pangox.h"
#include "arconv.h"
diff --git a/modules/basic/basic-ft2.c b/modules/basic/basic-ft2.c
index b252eed0..d09c4c41 100644
--- a/modules/basic/basic-ft2.c
+++ b/modules/basic/basic-ft2.c
@@ -21,7 +21,7 @@
#include <glib.h>
-#include "pango.h"
+#include "pango-layout.h"
#include "pangoft2.h"
#include "pango-utils.h"
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index b4599e61..b5ae67d2 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -20,7 +20,6 @@
*/
#include <glib.h>
-#include "pango.h"
#include "pangowin32.h"
#include "pango-utils.h"
diff --git a/modules/basic/basic-x.c b/modules/basic/basic-x.c
index 4169fe6c..627bc531 100644
--- a/modules/basic/basic-x.c
+++ b/modules/basic/basic-x.c
@@ -21,8 +21,8 @@
#include <glib.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
#include "pango-utils.h"
typedef struct _CharRange CharRange;
diff --git a/modules/basic/basic.c b/modules/basic/basic.c
index 4169fe6c..627bc531 100644
--- a/modules/basic/basic.c
+++ b/modules/basic/basic.c
@@ -21,8 +21,8 @@
#include <glib.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
#include "pango-utils.h"
typedef struct _CharRange CharRange;
diff --git a/modules/hangul/hangul-x.c b/modules/hangul/hangul-x.c
index 5309b05d..7583981c 100644
--- a/modules/hangul/hangul-x.c
+++ b/modules/hangul/hangul-x.c
@@ -22,8 +22,8 @@
#include <glib.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
static PangoEngineRange hangul_ranges[] = {
diff --git a/modules/hangul/hangul.c b/modules/hangul/hangul.c
index 5309b05d..7583981c 100644
--- a/modules/hangul/hangul.c
+++ b/modules/hangul/hangul.c
@@ -22,8 +22,8 @@
#include <glib.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
static PangoEngineRange hangul_ranges[] = {
diff --git a/modules/indic/bengali-x.c b/modules/indic/bengali-x.c
index 0b9a93f6..823c895d 100644
--- a/modules/indic/bengali-x.c
+++ b/modules/indic/bengali-x.c
@@ -41,9 +41,9 @@
#include <glib.h>
#include <stdio.h>
-#include "pango.h"
#include "pangox.h"
#include "pango-indic.h"
+#include "pango-engine.h"
#define SCRIPT_STRING "Bengali"
#define ISCII_BASED
diff --git a/modules/indic/bengali.c b/modules/indic/bengali.c
index 0b9a93f6..823c895d 100644
--- a/modules/indic/bengali.c
+++ b/modules/indic/bengali.c
@@ -41,9 +41,9 @@
#include <glib.h>
#include <stdio.h>
-#include "pango.h"
#include "pangox.h"
#include "pango-indic.h"
+#include "pango-engine.h"
#define SCRIPT_STRING "Bengali"
#define ISCII_BASED
diff --git a/modules/indic/devanagari-x.c b/modules/indic/devanagari-x.c
index 8bddb184..34348255 100644
--- a/modules/indic/devanagari-x.c
+++ b/modules/indic/devanagari-x.c
@@ -38,8 +38,8 @@
#include <glib.h>
#include <stdio.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
#define RANGE_START 0x900
#define RANGE_SIZE 0x80
diff --git a/modules/indic/devanagari.c b/modules/indic/devanagari.c
index 8bddb184..34348255 100644
--- a/modules/indic/devanagari.c
+++ b/modules/indic/devanagari.c
@@ -38,8 +38,8 @@
#include <glib.h>
#include <stdio.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
#define RANGE_START 0x900
#define RANGE_SIZE 0x80
diff --git a/modules/indic/gujarati-x.c b/modules/indic/gujarati-x.c
index 082640da..c8e53170 100644
--- a/modules/indic/gujarati-x.c
+++ b/modules/indic/gujarati-x.c
@@ -26,7 +26,6 @@
#include <glib.h>
#include <stdio.h>
-#include "pango.h"
#include "pangox.h"
#define RANGE_START 0xA80
@@ -37,6 +36,7 @@
#include "pango-indic.h"
#include "pango-indic-script.h"
+#include "pango-engine.h"
static gboolean is_prefixing_vowel (gunichar i);
static gboolean is_vowel_sign (gunichar i);
diff --git a/modules/indic/gujarati.c b/modules/indic/gujarati.c
index 082640da..c8e53170 100644
--- a/modules/indic/gujarati.c
+++ b/modules/indic/gujarati.c
@@ -26,7 +26,6 @@
#include <glib.h>
#include <stdio.h>
-#include "pango.h"
#include "pangox.h"
#define RANGE_START 0xA80
@@ -37,6 +36,7 @@
#include "pango-indic.h"
#include "pango-indic-script.h"
+#include "pango-engine.h"
static gboolean is_prefixing_vowel (gunichar i);
static gboolean is_vowel_sign (gunichar i);
diff --git a/modules/indic/gurmukhi-x.c b/modules/indic/gurmukhi-x.c
index e20c9e0a..179a3d11 100644
--- a/modules/indic/gurmukhi-x.c
+++ b/modules/indic/gurmukhi-x.c
@@ -30,9 +30,9 @@
#include <stdio.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
#include "pango-indic.h"
+#include "pango-engine.h"
#define RANGE_START 0xa00
#define RANGE_SIZE 0x80
diff --git a/modules/indic/gurmukhi.c b/modules/indic/gurmukhi.c
index e20c9e0a..179a3d11 100644
--- a/modules/indic/gurmukhi.c
+++ b/modules/indic/gurmukhi.c
@@ -30,9 +30,9 @@
#include <stdio.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
#include "pango-indic.h"
+#include "pango-engine.h"
#define RANGE_START 0xa00
#define RANGE_SIZE 0x80
diff --git a/modules/indic/myanmar-x.c b/modules/indic/myanmar-x.c
index 4e6bf4f3..214ebac5 100644
--- a/modules/indic/myanmar-x.c
+++ b/modules/indic/myanmar-x.c
@@ -36,9 +36,9 @@
#include <stdio.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
#include "pango-indic.h"
+#include "pango-engine.h"
#define RANGE_START 0x1000
#define RANGE_SIZE 0x80
diff --git a/modules/indic/myanmar.c b/modules/indic/myanmar.c
index 4e6bf4f3..214ebac5 100644
--- a/modules/indic/myanmar.c
+++ b/modules/indic/myanmar.c
@@ -36,9 +36,9 @@
#include <stdio.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
#include "pango-indic.h"
+#include "pango-engine.h"
#define RANGE_START 0x1000
#define RANGE_SIZE 0x80
diff --git a/modules/tamil/tamil-x.c b/modules/tamil/tamil-x.c
index a8f098d9..f6ee22d0 100644
--- a/modules/tamil/tamil-x.c
+++ b/modules/tamil/tamil-x.c
@@ -7,9 +7,10 @@
#include <stdio.h>
#include <glib.h>
-#include "pango.h"
#include "pangox.h"
#include "taconv.h"
+#include "pango-engine.h"
+#include <string.h>
static PangoEngineRange tamil_range[] = {
{ 0x0b80, 0x0bff, "*" },
diff --git a/modules/tamil/tamil.c b/modules/tamil/tamil.c
index a8f098d9..f6ee22d0 100644
--- a/modules/tamil/tamil.c
+++ b/modules/tamil/tamil.c
@@ -7,9 +7,10 @@
#include <stdio.h>
#include <glib.h>
-#include "pango.h"
#include "pangox.h"
#include "taconv.h"
+#include "pango-engine.h"
+#include <string.h>
static PangoEngineRange tamil_range[] = {
{ 0x0b80, 0x0bff, "*" },
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index b32721b4..40dcd78f 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -31,8 +31,8 @@
#include <glib.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
#define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
#define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00)
diff --git a/modules/thai/thai.c b/modules/thai/thai.c
index b32721b4..40dcd78f 100644
--- a/modules/thai/thai.c
+++ b/modules/thai/thai.c
@@ -31,8 +31,8 @@
#include <glib.h>
#include <string.h>
-#include "pango.h"
#include "pangox.h"
+#include "pango-engine.h"
#define ucs2tis(wc) (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
#define tis2uni(c) ((gunichar)(c) - 0xA0 + 0x0E00)
diff --git a/pango/Makefile.am b/pango/Makefile.am
index c1f57ffd..fb423bfd 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -104,11 +104,11 @@ pangoinclude_HEADERS = \
$(pango_headers) \
$(pango_built_headers)
-pango-enum-types.h: $(pango_headers) makeenums.pl
- makeenums.pl include $(pango_headers) > pango-enum-types.h
+pango-enum-types.h: @REBUILD@ $(pango_headers) makeenums.pl
+ $(PERL) ./makeenums.pl include $(pango_headers) > pango-enum-types.h
-pango-enum-types.c: $(pango_headers) makeenums.pl
- makeenums.pl cfile $(pango_headers) > pango-enum-types.c
+pango-enum-types.c: @REBUILD@ $(pango_headers) makeenums.pl
+ $(PERL) ./makeenums.pl cfile $(pango_headers) > pango-enum-types.c
#
# As a temporary hack, we pull in libpangox here so that we can link
@@ -122,6 +122,7 @@ pango_querymodules_LDADD = libpangox.la libpango.la $(GLIB_LIBS) $(FRIBIDI_LIBS)
endif
EXTRA_DIST = \
+ $(pango_built_headers) \
makeenums.pl \
module-defs.c.win32 \
pango.def \
diff --git a/pango/pangox.h b/pango/pangox.h
index 9a3172fc..222fddc2 100644
--- a/pango/pangox.h
+++ b/pango/pangox.h
@@ -24,7 +24,7 @@
#define __PANGOX_H__
#include <glib.h>
-#include <pango/pango.h>
+#include <pango/pango-layout.h>
#ifdef __cplusplus
extern "C" {