X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=21e7ff18f777046c37cc1724e4cd06411e44ec10;hb=refs%2Fheads%2Fctables7;hp=bded601daf899fdd56298496c73284316f9c0d2a;hpb=32af4826ef82cd3ea8b92ddac2e10ae019fe1bce;p=pspp

diff --git a/Smake b/Smake
index bded601daf..21e7ff18f7 100644
--- a/Smake
+++ b/Smake
@@ -43,9 +43,11 @@ GNULIB_MODULES = \
 	crypto/rijndael \
 	dirname \
 	dtoastr \
+	dtotimespec \
 	environ \
 	fatal-signal \
 	fcntl \
+	fnmatch \
 	fpieee \
 	fprintf-posix \
 	full-read \
@@ -55,10 +57,13 @@ GNULIB_MODULES = \
 	fwriteerror \
 	getline \
 	getpass \
-	gettext \
+	gettext-h \
+	gettime \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
+	havelib \
+	iconv \
 	include_next \
 	isfinite \
 	isinf \
@@ -66,6 +71,7 @@ GNULIB_MODULES = \
 	intprops \
 	inttostr \
 	localcharset \
+	localename \
         mbchar \
         mbiter \
 	memcasecmp \
@@ -97,13 +103,16 @@ GNULIB_MODULES = \
 	strcasestr \
 	stpcpy \
 	strerror \
-	strftime \
+	nstrftime \
 	strsep \
 	strtod \
 	strtok_r \
 	sys_stat \
 	tempname \
 	termios \
+	timespec \
+	timespec-add \
+	timespec-sub \
 	trunc \
 	unicase/u8-casecmp \
 	unicase/u8-casefold \
@@ -129,6 +138,7 @@ GNULIB_MODULES = \
 	unitypes \
 	unlocked-io \
 	vasprintf-posix \
+	verify \
 	version-etc \
 	version-etc-fsf \
 	vfprintf-posix \
@@ -138,6 +148,7 @@ GNULIB_MODULES = \
 	vsprintf-posix \
 	xalloc \
 	xalloc-die \
+	xbinary-io \
 	xmalloca \
 	xmemdup0 \
 	xsize \
@@ -286,6 +297,9 @@ everything: prep_ph  icons
 	$(MAKE) -f Smake Makefile.in configure
 
 icons: $(ICONS)
+clean-icons:
+	rm -f $(ICONS)
+.PHONY: icons clean-icons
 
 src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
 	$(RM) $@
@@ -321,6 +335,7 @@ prep_ph:
 	test -e ChangeLog || touch ChangeLog
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
+	touch build-aux/config.rpath
 	$(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
 		--doc-base=gl/doc --aux-dir=build-aux  \
@@ -375,7 +390,7 @@ po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header			\
 po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po	\
 po/Makevars.template po/pspp.pot
 
-clean:
+clean: clean-icons
 	rm -f config.sub config.guess config.rpath
 	rm -fr autom4te.cache
 	rm -f aclocal.m4