configure.in | 6 +++---
doc/Makefile.am | 1 -
fc-case/Makefile.am | 10 ++++------
fc-glyphname/Makefile.am | 4 ++--
fc-lang/Makefile.am | 4 ++--
new-version.sh | 2 +-
6 files changed, 12 insertions(+), 15 deletions(-)
New commits:
commit b75eb63982a54c0fb4576d8a655ef734908d3604
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Sat Mar 10 22:05:07 2012 +0900
Fix a build fail on some environment
diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index de657af..9138c19 100644
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -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
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 697b5c3..13b3d7b 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)
- $(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
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index d2eca5b..09292bb 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)
- $(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
commit a47899a853e4ed3405f398f43d03424095ae73f5
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Sat Mar 10 19:03:05 2012 +0900
Fix a build issue
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 06ec5e9..6c75c6c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -143,7 +143,6 @@ htmldoc_DATA = \
if USEDOCBOOK
BUILT_SOURCES += \
$(LOCAL_SGML_FILES) \
- func.refs \
$(NULL)
noinst_PROGRAMS += \
edit-sgml \
commit d6de5351922d79ccf38d2bc6b75f6ea2011dd421
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Mar 9 22:24:18 2012 +0900
Update to detect the uncommited changes properly
diff --git a/new-version.sh b/new-version.sh
index 9ab64dd..6cf609f 100644
--- a/new-version.sh
+++ b/new-version.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-if git status -a > /dev/null; then
+if [ "x`git status -s -uno`" != "x" ]; then
echo 'Uncommited changes in repository' 1>&2
exit 1
fi
commit 78d75c003c5f03a2aeebc628d70d3f75bd6f5707
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Fri Mar 9 22:12:35 2012 +0900
Update the version info
diff --git a/configure.in b/configure.in
index 06851a5..e754249 100644
--- a/configure.in
+++ b/configure.in
@@ -41,11 +41,11 @@ dnl libtool versioning
dnl bump revision when fixing bugs
dnl bump current and age, reset revision to zero when adding APIs
dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LIBT_CURRENT=5
-LIBT_REVISION=4
+LIBT_CURRENT=6
+LIBT_REVISION=0
AC_SUBST(LIBT_CURRENT)
AC_SUBST(LIBT_REVISION)
-LIBT_AGE=4
+LIBT_AGE=5
LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
AC_SUBST(LIBT_VERSION_INFO)
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
