X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=0314c9b7cd063be9bd53686df0c215e076a7f3e9;hb=refs%2Fheads%2Fspv2;hp=e976e46379d1af3a535f7c0fc2515b3f90bb979e;hpb=36066cdc33572b2297f2df8743c4c00c0f04bf45;p=pspp

diff --git a/Smake b/Smake
index e976e46379..0314c9b7cd 100644
--- a/Smake
+++ b/Smake
@@ -19,7 +19,7 @@ GNULIB_MODULES = \
 	count-one-bits \
 	crc \
 	crypto/md4 \
-	crypto/md5 \
+	crypto/rijndael \
 	dirname \
 	dtoastr \
 	environ \
@@ -33,6 +33,7 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
+	getpass \
 	gettext \
 	gettimeofday \
         getopt-gnu \
@@ -75,6 +76,7 @@ GNULIB_MODULES = \
 	stpcpy \
 	strerror \
 	strftime \
+	strsep \
 	strtod \
 	strtok_r \
 	sys_stat \
@@ -301,39 +303,11 @@ all: prep_ph  icons
 icons: $(ICONS) src/ui/gui/icons/icon-names.c
 
 src/ui/gui/icons/icon-names.c: $(MAKEFILE_LIST)
-	$(RM) $@
+	$(RM) -f $@
 	printf '/* This is a generated file. Do not edit. */\n' >> $@
-	printf '#include "icon-names.h"\n' >> $@
-	echo >> $@
-	printf 'static const char *action_icon_name[] =' >> $@
-	printf '\n{\n' >> $@
-	for i in $(ACTION_ICONS) ; do \
-	 echo $$i; \
-	done | sed -e 's%[a-zA-Z/]*/[1-9]*x[1-9]*/\([^ ]*\)\.png%\1%g' | sort -u | while read f ; do \
-	 printf '  "%s", \n' $$f >> $@ ; \
-	done ; \
-	printf '};\n\n' >> $@ ; \
-	printf 'const struct icon_context action_icon_context = {\n' >> $@
-	printf '  action_icon_name,\n' >> $@
-	printf "  sizeof (action_icon_name) / sizeof (action_icon_name[0]),\n" >> $@ 
-	printf "  \"actions\"\n" >> $@
-	printf '};\n' >> $@ ; \
-	echo >> $@
-	printf 'static const char *category_icon_name[] =' >> $@
-	printf '\n{\n' >> $@
-	for i in $(CATEGORY_ICONS) ; do \
-	 echo $$i; \
-	done | sed -e 's%[a-zA-Z/]*/[1-9]*x[1-9]*/\([^ ]*\)\.png%\1%g' | sort -u | while read f ; do \
-	 printf '  "%s", \n' $$f >> $@ ; \
-	done ; \
-	printf '};\n\n' >> $@ ; \
-	printf 'const struct icon_context category_icon_context = {\n' >> $@
-	printf '  category_icon_name,\n' >> $@
-	printf "  sizeof (category_icon_name) / sizeof (category_icon_name[0]),\n" >> $@ 
-	printf "  \"categories\"\n" >> $@
-	printf '};\n' >> $@ ; \
-	echo >> $@
-
+	printf '#include "icon-names.h"\n\n' >> $@
+	build-aux/icon-list action actions $(ACTION_ICONS) >> $@
+	build-aux/icon-list category categories $(CATEGORY_ICONS) >> $@
 
 src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
 	$(RM) $@
@@ -346,7 +320,8 @@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
 	echo >> $@
 	printf 'icon_srcs = ' >> $@
 	for i in  $(ICONS); do \
-	  printf ' \\\n\t '$$i | sed -e 's/\.png$$/.svg/' -e 's%/icons/%/artwork/%' >> $@ ; \
+	  printf ' \\\n\t ' >> $@ ;\
+	  printf $$i | awk '{ gsub(".png",".svg")gsub("icons","artwork");printf $$0}' >> $@ ; \
 	done
 	echo ' ' >> $@
 	echo >> $@
@@ -368,13 +343,13 @@ prep_ph:
 		echo >&2 "libtoolize not found";		\
 		exit 1;						\
 	fi;							\
-	$$LIBTOOLIZE --force --automake
+	$$LIBTOOLIZE --force --automake --copy
 
 aclocal.m4:
 	aclocal -I m4 -I gl/m4
 
 configure: configure.ac aclocal.m4
-	autoconf
+	autoconf || rm $@  # autoconf 2.69 has (what I think is) a bug.  It will create configure even when failure is detected.
 
 config.h.in: configure.ac
 	autoheader
@@ -405,8 +380,7 @@ _debug: all
 
 
 
-PO_FILES = po/ChangeLog \
-po/Rules-quot po/boldquot.sed		\
+PO_FILES = po/Rules-quot po/boldquot.sed \
 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
@@ -426,7 +400,8 @@ clean:
 	rm -f doc/stamp-vti
 	rm -f config.h.in~
 	rm -f config.h.in
-	find . -name Makefile.in -exec rm -f {} \; 
+	rm -f gl/Makefile.in
+	rm -f Makefile.in
 	rm -f compile
 	rm -f ltmain.sh
 	rm -f reloc-ldflags install-reloc