walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix make distcheck

This commit is contained in:
Behdad Esfahbod 2011-08-24 19:16:13 +02:00
parent 24bcdbcc06
commit 74ef81a0b0
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Makefile.am
View File

@ -28,6 +28,8 @@ HBSOURCES = \
hb-open-file-private.hh \ hb-open-file-private.hh \
hb-open-type-private.hh \ hb-open-type-private.hh \
hb-ot-head-table.hh \ hb-ot-head-table.hh \
hb-ot-hhea-table.hh \
hb-ot-hmtx-table.hh \
hb-ot-maxp-table.hh \ hb-ot-maxp-table.hh \
hb-ot-name-table.hh \ hb-ot-name-table.hh \
hb-ot-tag.cc \ hb-ot-tag.cc \
@ -48,10 +50,6 @@ HBHEADERS = \
hb-version.h \ hb-version.h \
$(NULL) $(NULL)
MAINTAINERCLEANFILES += \
$(srcdir)/hb-version.h \
$(NULL)
if HAVE_OT if HAVE_OT
HBSOURCES += \ HBSOURCES += \
hb-ot-layout.cc \ hb-ot-layout.cc \
@ -92,14 +90,16 @@ endif
if HAVE_GOBJECT if HAVE_GOBJECT
HBCFLAGS += $(GOBJECT_CFLAGS) HBCFLAGS += $(GOBJECT_CFLAGS)
HBLIBS += $(GOBJECT_LIBS) HBLIBS += $(GOBJECT_LIBS)
HBSOURCES += hb-gobject-structs.cc hb-gobject-enums.cc HBSOURCES += hb-gobject-structs.cc
nodist_HBSOURCES = hb-gobject-enums.cc
HBHEADERS += hb-gobject.h HBHEADERS += hb-gobject.h
BUILT_SOURCES += hb-gobject-enums.cc BUILT_SOURCES += hb-gobject-enums.cc
EXTRA_DIST += hb-gobject-enums.cc.tmpl EXTRA_DIST += hb-gobject-enums.cc.tmpl
DISTCLEANFILES += hb-gobject-enums.cc
hb-gobject-enums.cc: hb-gobject-enums.cc.tmpl $(HBHEADERS) hb-gobject-enums.cc: hb-gobject-enums.cc.tmpl $(HBHEADERS)
$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template $^ ) > \ $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > "$@.tmp" && \
"$@.tmp" && mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false ) mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false )
endif endif
if HAVE_ICU if HAVE_ICU
@ -132,6 +132,7 @@ endif
CXXLINK = $(LINK) CXXLINK = $(LINK)
libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES)
libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) libharfbuzz_la_CPPFLAGS = $(HBCFLAGS)
libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) -no-undefined
libharfbuzz_la_LIBADD = $(HBLIBS) libharfbuzz_la_LIBADD = $(HBLIBS)

2
src/hb-gobject-enums.cc.tmpl
View File

@ -45,7 +45,7 @@
/*** END file-production ***/ /*** END file-production ***/
/*** BEGIN value-header ***/ /*** BEGIN value-header ***/
/* inline static -----> disable these for now... */ inline static /* TODO(behdad) disable these for now until we fix them... */
GType GType
@enum_name@_get_type (void) @enum_name@_get_type (void)
{ {