Clean up Makefile's a bit

diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am
index f3b4e501c081b2d1a41249d5b2956fd3467d20eb..806c730b4dac677dd3959a52a518f01838cb8c7a 100644 (file)
--- a/fc-arch/Makefile.am
+++ b/fc-arch/Makefile.am
@@ -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)
 

diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index 191758c054ade4ed8201ab970762ada4b10ec0f5..bf01984544f77bf06346b10955aa4ffbf88dacb5 100644 (file)
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -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
 

diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 996ef0653666c0bdd6f07b30c6b44ebae374fa75..bcb4d074670a10cf14d062a34fab83628a9083e7 100644 (file)
--- a/fc-glyphname/Makefile.am
+++ b/fc-glyphname/Makefile.am
@@ -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
 

diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index a7290f4621a50c3b6d3ff0f06758d711eb2b0d8e..923a4fff6352da7ba15609943fd397c8dca11c6d 100644 (file)
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -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)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 2034a8bb7a5efea3d97c6523d5c844d844785a65..8b6379dc698900fbd2935b403b881d4a433bcfca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 \