diff options
| -rw-r--r-- | fc-arch/Makefile.am | 4 | ||||
| -rw-r--r-- | fc-case/Makefile.am | 7 | ||||
| -rw-r--r-- | fc-glyphname/Makefile.am | 3 | ||||
| -rw-r--r-- | fc-lang/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
5 files changed, 16 insertions, 12 deletions
diff --git a/fc-arch/Makefile.am b/fc-arch/Makefile.am index f3b4e501..806c730b 100644 --- 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 191758c0..bf019845 100644 --- 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 996ef065..bcb4d074 100644 --- 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 a7290f46..923a4fff 100644 --- 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 2034a8bb..8b6379dc 100644 --- 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 \ |