diff options
| author | Akira TAGOH <akira@tagoh.org> | 2012-03-16 11:55:47 +0900 |
|---|---|---|
| committer | Akira TAGOH <akira@tagoh.org> | 2012-03-16 11:55:47 +0900 |
| commit | f2813ffc689fb6972ff4d5d414c3abfa3e0be26f (patch) | |
| tree | bd134a91206974a1fd47233a20a3aca099946f8b | |
| parent | a5b609196fe9cf688e5b4f7b7cd31fb2dc15b154 (diff) | |
Revert "Fix a build fail on some environment"
This reverts commit b75eb63982a54c0fb4576d8a655ef734908d3604.
| -rw-r--r-- | fc-case/Makefile.am | 10 | ||||
| -rw-r--r-- | fc-glyphname/Makefile.am | 4 | ||||
| -rw-r--r-- | fc-lang/Makefile.am | 4 |
3 files changed, 10 insertions, 8 deletions
diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am index 9138c19..de657af 100644 --- a/fc-case/Makefile.am +++ b/fc-case/Makefile.am @@ -33,8 +33,10 @@ noinst_PROGRAMS=fc-case noinst_HEADERS=$(TARG) -fc_case_SOURCES= \ - fc-case.c +fc_case_SRCS= \ + fc-case.c \ + fccaseint.h \ + fccaseread.c CASEFOLDING=CaseFolding.txt SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt @@ -46,8 +48,8 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING) - -rm $(TARG) - $(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am index 13b3d7b..697b5c3 100644 --- a/fc-glyphname/Makefile.am +++ b/fc-glyphname/Makefile.am @@ -41,8 +41,8 @@ $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME) - -rm $(TARG) - $(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am index 09292bb..d2eca5b 100644 --- a/fc-lang/Makefile.am +++ b/fc-lang/Makefile.am @@ -40,8 +40,8 @@ $(TARG):$(ORTH) fc-lang.c $(STMPL) @echo Warning: cannot rebuild $(TARG) when cross-compiling else $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL) - -rm $(TARG) - $(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ + $(AM_V_GEN) $(RM) $(TARG); \ + ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \ mv $(TARG).tmp $(TARG) endif |