Clean up Makefile's a bit

This commit is contained in:
Behdad Esfahbod 2009-11-18 09:35:40 -05:00
parent 192927225c
commit d2fb683796
5 changed files with 16 additions and 12 deletions

View File

@ -37,12 +37,10 @@ ARCHITECTURE=@ARCHITECTURE@
noinst_PROGRAMS=fc-arch
noinst_MANS=fc-arch.man
EXTRA_DIST=$(TMPL)
$(TARG):fc-arch${EXEEXT} $(STMPL) ${top_srcdir}/src/fcint.h ../config.h
rm -f $(TARG)
$(AM_V_GEN) $(RM) $(TARG); \
./fc-arch${EXEEXT} $(ARCHITECTURE) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)

View File

@ -34,8 +34,6 @@ TARG=fccase.h
noinst_PROGRAMS=fc-case
noinst_MANS=fc-case.man
noinst_HEADERS=$(TARG)
fc_case_SRCS= \
@ -49,8 +47,9 @@ SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt
EXTRA_DIST=$(TMPL) $(CASEFOLDING)
$(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
rm -f $(TARG)
./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG)
$(AM_V_GEN) $(RM) $(TARG); \
./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)
ALIAS_FILES = fcalias.h fcaliastail.h

View File

@ -41,7 +41,8 @@ EXTRA_DIST=$(TMPL) $(GLYPHNAME)
$(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
$(AM_V_GEN) $(RM) $(TARG); \
./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && mv $(TARG).tmp $(TARG)
./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)
ALIAS_FILES = fcalias.h fcaliastail.h

View File

@ -39,7 +39,7 @@ noinst_MANS=fc-lang.man
EXTRA_DIST=$(TMPL) $(ORTH)
$(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
rm -f $(TARG)
$(AM_V_GEN) $(RM) $(TARG); \
./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
mv $(TARG).tmp $(TARG)

View File

@ -83,14 +83,20 @@ noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h
ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h
BUILT_SOURCES = $(ALIAS_FILES) ../fc-lang/fclang.h ../fc-arch/fcarch.h ../fc-glyphname/fcglyphname.h
BUILT_SOURCES = $(ALIAS_FILES) \
../fc-arch/fcarch.h \
../fc-case/fccase.h \
../fc-glyphname/fcglyphname.h \
../fc-lang/fclang.h
../fc-lang/fclang.h:
cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) 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 \