X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=4bdd8957fe53aecbf4f02ef63c3e719249c87fea;hb=refs%2Fheads%2Fctables11;hp=f5b5711f9091a412971d8dcb6fa80ffac60313f0;hpb=774738ce9ebb613f6febb42bf4c2ec5fff04d6a4;p=pspp

diff --git a/Smake b/Smake
index f5b5711f90..4bdd8957fe 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,7 +57,8 @@ GNULIB_MODULES = \
 	fwriteerror \
 	getline \
 	getpass \
-	gettext \
+	gettext-h \
+	gettime \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
@@ -66,6 +69,7 @@ GNULIB_MODULES = \
 	intprops \
 	inttostr \
 	localcharset \
+	localename \
         mbchar \
         mbiter \
 	memcasecmp \
@@ -97,13 +101,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 +136,7 @@ GNULIB_MODULES = \
 	unitypes \
 	unlocked-io \
 	vasprintf-posix \
+	verify \
 	version-etc \
 	version-etc-fsf \
 	vfprintf-posix \
@@ -146,11 +154,11 @@ GNULIB_MODULES = \
 	xvasprintf
 
 APP_ICONS = \
-src/ui/gui/icons/16x16/apps/pspp.png \
-src/ui/gui/icons/32x32/apps/pspp.png \
-src/ui/gui/icons/48x48/apps/pspp.png \
-src/ui/gui/icons/256x256/apps/pspp.png \
-src/ui/gui/icons/scalable/apps/pspp.svg
+src/ui/gui/icons/16x16/apps/org.fsf.pspp.png \
+src/ui/gui/icons/32x32/apps/org.fsf.pspp.png \
+src/ui/gui/icons/48x48/apps/org.fsf.pspp.png \
+src/ui/gui/icons/256x256/apps/org.fsf.pspp.png \
+src/ui/gui/icons/scalable/apps/org.fsf.pspp.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/48x48/categories/align-left.png \
@@ -287,6 +295,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) $@
@@ -325,7 +336,8 @@ prep_ph:
 	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  \
+		--doc-base=gl/doc --aux-dir=build-aux \
+		--makefile-name=automake.mk --automake-subdir \
 		--libtool $(GNULIB_MODULES)
 	if (glibtoolize --version) >/dev/null 2>&1; then	\
 		LIBTOOLIZE=glibtoolize;				\
@@ -377,7 +389,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
@@ -393,6 +405,7 @@ clean:
 	rm -f config.h.in~
 	rm -f config.h.in
 	rm -f gl/Makefile.in
+	rm -f gl/automake.mk
 	rm -f Makefile.in
 	rm -f build-aux/compile
 	rm -f build-aux/ltmain.sh