X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=406e85e151db578f13a147b151ef5e3a284c272e;hb=bb8fdae8ad6f0a857569b3e09cf21f1af6b4a41b;hp=a71ef1dd953fd515027902ee7d171729c070673f;hpb=19d124dc4f9a68e1c9ddce58bf79a5e11d2ccbfd;p=fontconfig.git diff --git a/src/Makefile.am b/src/Makefile.am index a71ef1d..406e85e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # -# $Id$ +# fontconfig/src/Makefile.am # # Copyright © 2003 Keith Packard # @@ -13,9 +13,9 @@ # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. # -# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR # CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, # DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR @@ -52,7 +52,7 @@ if MS_LIB_AVAILABLE noinst_DATA = fontconfig.lib fontconfig.lib : libfontconfig.la - lib -name:libfontconfig-$(lt_current_minus_age).dll -def:fontconfig.def -out:$@ + lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@ install-ms-import-lib: $(INSTALL) fontconfig.lib $(DESTDIR)$(libdir) @@ -83,7 +83,20 @@ noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h -BUILT_SOURCES = $(ALIAS_FILES) +BUILT_SOURCES = $(ALIAS_FILES) \ + ../fc-arch/fcarch.h \ + ../fc-case/fccase.h \ + ../fc-glyphname/fcglyphname.h \ + ../fc-lang/fclang.h + +../fc-arch/fcarch.h: + cd ../fc-arch && $(MAKE) $(AM_MAKEFLAGS) fcarch.h +../fc-case/fccase.h: + cd ../fc-case && $(MAKE) $(AM_MAKEFLAGS) fccase.h +../fc-glyphname/fcglyphname.h: + cd ../fc-glyphname && $(MAKE) $(AM_MAKEFLAGS) fcglyphname.h +../fc-lang/fclang.h: + cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h libfontconfig_la_SOURCES = \ fcatomic.c \ @@ -94,6 +107,7 @@ libfontconfig_la_SOURCES = \ fcdbg.c \ fcdefault.c \ fcdir.c \ + fcformat.c \ fcfreetype.c \ fcfs.c \ fcinit.c \