(parse_rank_function) Fix msg() bug found by -Wformat.

[pspp-builds.git] / Smake

diff --git a/Smake b/Smake
index e21e51c7279e0ef4eae44ef64d4c7052d6e8c154..040b51df8352db7f18a171bdd4e72c97853c9159 100644 (file)
--- a/Smake
+++ b/Smake
@@ -1,5 +1,5 @@
 Makefile po/Makefile.in: Makefile.in configure install-sh config.h.in po/Makefile.in.in po/POTFILES.in
-       ./configure
+       ./configure $(CONFIGUREFLAGS)
 
 configure:  configure.ac aclocal.m4
        autoconf
@@ -10,10 +10,20 @@ config.h.in: configure.ac
 aclocal.m4:
        aclocal -I m4
 
+# We want all src/*.c files which do not have corresponding src/*.q
+
+src_q_files=$(wildcard src/*.q)
+src_c_files=$(wildcard src/*.c)
+src_cq_files=$(patsubst %.q, %.c, $(src_q_files))
+src_files=$(filter-out $(src_cq_files), $(src_c_files)) $(src_q_files)
+
+
 .PHONY: po/POTFILES.in
 po/POTFILES.in: 
        @$(RM) po/potfile-temp
-       ls -1 src/*.[cq] > po/potfile-temp
+       for f in $(src_files) ; do \
+       if [ $$f = "src/version.c" ] ; then continue ; fi ; \
+       echo $$f >> po/potfile-temp ; done
        @if ( ! test -e $@ ) || ( ! diff  -q po/potfile-temp $@ ) ; then  mv po/potfile-temp $@ ; else $(RM) po/potfile-temp ; fi
 
 install-sh Makefile.in: intl Makefile.am aclocal.m4 config.h.in ABOUT-NLS
@@ -22,12 +32,12 @@ install-sh Makefile.in: intl Makefile.am aclocal.m4 config.h.in ABOUT-NLS
 po/Makefile.in.in intl ABOUT-NLS:
        touch -f Makefile.am Makefile.am-stamp
        touch -f configure.ac configure.ac-stamp
-       cp -a configure.ac configure.ac-bak
-       cp -a Makefile.am Makefile.am-bak
+       cp -pR configure.ac configure.ac-bak
+       cp -pR Makefile.am Makefile.am-bak
        gettextize -f -c --no-changelog --intl
-       cp -a Makefile.am-bak Makefile.am
+       cp -pR Makefile.am-bak Makefile.am
        touch -f Makefile.am-stamp Makefile.am
-       cp -a configure.ac-bak configure.ac
+       cp -pR configure.ac-bak configure.ac
        touch -f configure.ac-stamp configure.ac
        $(RM) configure.ac-bak configure.ac-stamp
        $(RM) Makefile.am-bak Makefile.am-stamp
@@ -36,7 +46,7 @@ po/Makefile.in.in intl ABOUT-NLS:
 
 .PHONY: clean
 clean:
-       $(RM) config.sub config.guess
+       $(RM) config.sub config.guess config.rpath
        $(RM) ABOUT-NLS
        $(RM) -r autom4te.cache
        $(RM) aclocal.m4