Fix a build fail on some environment
authorAkira TAGOH <akira@tagoh.org>
Sat, 10 Mar 2012 13:05:07 +0000 (22:05 +0900)
committerAkira TAGOH <akira@tagoh.org>
Sat, 10 Mar 2012 13:05:07 +0000 (22:05 +0900)
fc-case/Makefile.am
fc-glyphname/Makefile.am
fc-lang/Makefile.am

index de657af..9138c19 100644 (file)
@@ -33,10 +33,8 @@ noinst_PROGRAMS=fc-case
 
 noinst_HEADERS=$(TARG)
 
-fc_case_SRCS= \
-       fc-case.c \
-       fccaseint.h \
-       fccaseread.c
+fc_case_SOURCES= \
+       fc-case.c
 
 CASEFOLDING=CaseFolding.txt
 SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt
@@ -48,8 +46,8 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING)
        @echo Warning: cannot rebuild $(TARG) when cross-compiling
 else
 $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
-       $(AM_V_GEN) $(RM) $(TARG); \
-       ./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
+       -rm $(TARG)
+       $(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
        mv $(TARG).tmp $(TARG)
 endif
 
index 697b5c3..13b3d7b 100644 (file)
@@ -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)
-       $(AM_V_GEN) $(RM) $(TARG); \
-       ./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
+       -rm $(TARG)
+       $(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
        mv $(TARG).tmp $(TARG)
 endif
 
index d2eca5b..09292bb 100644 (file)
@@ -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)
-       $(AM_V_GEN) $(RM) $(TARG); \
-       ./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
+       -rm $(TARG)
+       $(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
        mv $(TARG).tmp $(TARG)
 endif