diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-06-25 15:09:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-25 15:09:39 +0000 |
| commit | ac5989fb0fec8273fd4955611b6efb0317d138c1 (patch) | |
| tree | fdc7bce2f7529c43f1e8446ef84f7991f398e12a /pango/Makefile.am | |
| parent | 003e41182f16892fab9478530063b590e3852b74 (diff) | |
| download | pango-ac5989fb0fec8273fd4955611b6efb0317d138c1.tar.gz | |
pango/pango-markup.c: modules/arabic/arabic-xft.c (arabic_engine_shape):
Sat Jun 23 10:01:20 2001 Owen Taylor <otaylor@redhat.com>
* pango/pangowin32-fontmap.c (pango_win32_font_entry_get_coverage):
* pango/pangoft2-fontmap.c (pango_ft2_font_entry_get_coverage):
pango/pango-markup.c:
modules/arabic/arabic-xft.c (arabic_engine_shape):
modules/arabic/arabic-x.c (arabic_engine_shape):
pango/pango-context.c (pango_itemize):
pango/pangox.c (get_font_metrics_from_string):
pango/pangoft2.c (get_font_metrics_from_string):
Adapt to 64-bit changes in glib.
* pango/Makefile.am: Modify generation rules to
use glib-mkenums (ugh, loong command lines), and
to reduce rebuilding by using stamp files.
Diffstat (limited to 'pango/Makefile.am')
| -rw-r--r-- | pango/Makefile.am | 45 |
1 files changed, 35 insertions, 10 deletions
diff --git a/pango/Makefile.am b/pango/Makefile.am index 6b2028bc..5c0574e1 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -49,10 +49,10 @@ lib_LTLIBRARIES = libpango.la $(X_BUILD_LIBS) $(XFT_BUILD_LIBS) $(FT2_BUILD_LIBS bin_PROGRAMS = pango-querymodules -pango_built_headers= pango-enum-types.h -pango_built_cfiles= pango-enum-types.c +pango_built_headers = pango-enum-types.h +pango_built_cfiles = pango-enum-types.c -BUILT_SOURCES=$(pango_built_headers) $(pango_built_cfiles) +$(OBJECTS): $(pango_built_headers) libpango_la_SOURCES = \ break.c \ @@ -147,13 +147,34 @@ pangoinclude_HEADERS = \ $(XFT_HFILES) \ $(FT2_HFILES) -pango-enum-types.h: @REBUILD@ $(pango_headers) makeenums.pl - cd $(srcdir) \ - && $(PERL) ./makeenums.pl include $(pango_headers) > pango-enum-types.h +pango-enum-types.h: s-enum-types-h + @true + +s-enum-types-h: @REBUILD@ $(pango_headers) Makefile + ( cd $(srcdir) && glib-mkenums \ + --fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define PANGO_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "#endif /* __PANGO_ENUM_TYPES_H__ */" \ + $(pango_headers) ) > tmp-pango-enum-types.h \ + && (cmp -s tmp-pango-enum-types.h $(srcdir)/pango-enum-types.h || cp tmp-pango-enum-types.h $(srcdir)/pango-enum-types.h ) \ + && rm -f tmp-pango-enum-types.h \ + && echo timestamp > $(@F) + +pango-enum-types.c: s-enum-types-c + @true -pango-enum-types.c: @REBUILD@ $(pango_headers) makeenums.pl - cd $(srcdir) \ - && $(PERL) ./makeenums.pl cfile $(pango_headers) > pango-enum-types.c +s-enum-types-c: @REBUILD@ $(pango_headers) Makefile + ( cd $(srcdir) && glib-mkenums \ + --fhead "#include <pango.h>" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const GEnumValue values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_enum_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $(pango_headers) ) > tmp-pango-enum-types.c \ + && (cmp -s tmp-pango-enum-types.c $(srcdir)/pango-enum-types.c || cp tmp-pango-enum-types.c $(srcdir)/pango-enum-types.c ) \ + && rm -f tmp-pango-enum-types.c \ + && echo timestamp > $(@F) # # As a temporary hack, we pull in libpangox here so that we can link @@ -169,7 +190,6 @@ endif EXTRA_DIST = \ $(pango_built_headers) \ - makeenums.pl \ module-defs-ft2.c.win32 \ module-defs-win32.c.win32 \ module-defs.h \ @@ -201,3 +221,8 @@ $(INCLUDED_X_MODULES) $(INCLUDED_XFT_MODULES) $(INCLUDED_FT2_MODULES): included- .PHONY: included-modules endif +CLEANFILES = \ + pango-enum-types.h \ + s-pango-enum-types.h \ + pango-enum-types.c \ + s-pango-enum-types.c |