diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-31 15:32:14 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-12-31 15:32:14 +0000 |
| commit | 54aa43e2a53a1aae1ccce74ccef55c1c6dcf0691 (patch) | |
| tree | 1e640e7732f26150b7e2a60f22987ab20400c83d | |
| parent | 094574aa444db745c1f0e0f2b31952d44352c721 (diff) | |
resolve conflicts
| -rw-r--r-- | lib/fontconfig/doc/Makefile.am | 16 | ||||
| -rw-r--r-- | lib/fontconfig/src/Makefile.am | 20 |
2 files changed, 26 insertions, 10 deletions
diff --git a/lib/fontconfig/doc/Makefile.am b/lib/fontconfig/doc/Makefile.am index d1311af5f..1ec8c0b3f 100644 --- a/lib/fontconfig/doc/Makefile.am +++ b/lib/fontconfig/doc/Makefile.am @@ -1,6 +1,4 @@ # -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:41:58 matthieu Exp $ -# # Copyright © 2003 Keith Packard # # Permission to use, copy, modify, distribute, and sell this software and its @@ -142,7 +140,7 @@ fontconfig-devel.txt: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml fontconfig-devel.pdf: local-fontconfig-devel.sgml $(DOC_FUNCS_SGML) version.sgml confdir.sgml $(RM) $@ - ../missing --run $(DOC2PDF) $< && mv local-$@ $@ \ + $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \ || echo Failed to generate $@ >&2; \ (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@) @@ -160,7 +158,7 @@ fontconfig-user.txt: local-fontconfig-user.sgml version.sgml confdir.sgml fontconfig-user.pdf: local-fontconfig-user.sgml version.sgml confdir.sgml $(RM) $@ - ../missing --run $(DOC2PDF) $< && mv local-$@ $@ \ + $(top_srcdir)/missing --run $(DOC2PDF) $< && mv local-$@ $@ \ || echo Failed to generate $@ >&2; \ (test -f $@ || echo $(DOC2PDF) is required to generate this file >> $@) @@ -170,7 +168,14 @@ confdir.sgml: ${DOC_SRC}/confdir.sgml.in CLEANFILES=confdir.sgml local-fontconfig-user.sgml local-fontconfig-devel.sgml +htmldoc_DATA = $(HTML_DIR)/* + +$(HTML_DIR)/*: $(HTML_DIR) + else + +htmldoc_DATA = $(srcdir)/$(HTML_DIR)/* + all-local: clean-local: endif @@ -179,6 +184,3 @@ htmldocdir=$(docdir)/$(HTML_DIR) doc_DATA = $(DOC_FILES) -htmldoc_DATA = $(HTML_DIR)/* - -$(HTML_DIR)/*: $(HTML_DIR) diff --git a/lib/fontconfig/src/Makefile.am b/lib/fontconfig/src/Makefile.am index f18192293..d73b0dc41 100644 --- a/lib/fontconfig/src/Makefile.am +++ b/lib/fontconfig/src/Makefile.am @@ -1,6 +1,4 @@ # -# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:23 matthieu Exp $ -# # Copyright © 2003 Keith Packard # # Permission to use, copy, modify, distribute, and sell this software and its @@ -25,6 +23,8 @@ if OS_WIN32 export_symbols = -export-symbols fontconfig.def +fontconfig_def_dependency = fontconfig.def + # gcc import library install/uninstall install-libtool-import-lib: @@ -39,6 +39,8 @@ else install-libtool-import-lib: uninstall-libtool-import-lib: +fontconfig_def_dependency = + endif if MS_LIB_AVAILABLE @@ -73,7 +75,7 @@ INCLUDES = \ -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ -DFONTCONFIG_PATH='"$(CONFDIR)"' -EXTRA_DIST = fontconfig.def.in makealias +EXTRA_DIST = makealias noinst_HEADERS=fcint.h @@ -112,6 +114,8 @@ libfontconfig_la_LDFLAGS = \ libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) +libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) + install-data-local: install-ms-import-lib install-libtool-import-lib uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib @@ -127,3 +131,13 @@ fcalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FILES) sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" $(PUBLIC_FILES) CLEANFILES := $(ALIAS_FILES) + +fontconfig.def: $(PUBLIC_FILES) + echo Generating $@ + (echo EXPORTS; \ + (cat $(PUBLIC_FILES) || echo 'FcERROR ()' ) | \ + grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/ /' | \ + sort; \ + echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \ + echo VERSION @LT_CURRENT@.@LT_REVISION@) >$@ + @ ! grep -q FcERROR $@ || ($(RM) $@; false) |