X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=0e87e1e578b9144b65f6b8f82dfa69016f8fb3e2;hb=59acd528255dd713da4737629c69f5a2d6b528b3;hp=e21e51c7279e0ef4eae44ef64d4c7052d6e8c154;hpb=e22db86f67a3b77124af022bbd734922c62c424c;p=pspp

diff --git a/Smake b/Smake
index e21e51c727..0e87e1e578 100644
--- a/Smake
+++ b/Smake
@@ -10,10 +10,18 @@ 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 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 +30,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