X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=a8a28a6472c8540d985ade8fb1cd765af6c41ccc;hb=refs%2Fheads%2Fpxd;hp=a148027f2a7669ce9cfd6125e8e3351e25abd8af;hpb=e7e9816e897551cf832ab2191ff70e88bac5bc27;p=pspp

diff --git a/Smake b/Smake
index a148027f2a..a8a28a6472 100644
--- a/Smake
+++ b/Smake
@@ -19,7 +19,8 @@ GNULIB_MODULES = \
 	count-one-bits \
 	crc \
 	crypto/md4 \
-	crypto/md5 \
+	crypto/rijndael \
+	crypto/sha1 \
 	dirname \
 	dtoastr \
 	environ \
@@ -33,6 +34,7 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
+	getpass \
 	gettext \
 	gettimeofday \
         getopt-gnu \
@@ -75,6 +77,7 @@ GNULIB_MODULES = \
 	stpcpy \
 	strerror \
 	strftime \
+	strsep \
 	strtod \
 	strtok_r \
 	sys_stat \
@@ -301,39 +304,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) $@
@@ -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
@@ -438,14 +413,11 @@ clean:
 # with the alpha channels.  Therefore, it is not recommended for production pspp builds, but might
 # be useful to get something working on a platform which doesn't have a working gimp.
 
-#svg2png=convert $1 $3
-
-svg2png=gimp -i -b '(let* ((image  (car  (gimp-file-load 1  "$1"  "$1"))))  (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $2)"))  (gimp-file-save 1 image (car  (gimp-image-get-active-drawable image)) "$3" "$3")) (gimp-quit 1)'
-
+#svg2png=convert -background transparent $1 $3
 
-src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3
+src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	$(call svg2png,$<,$(lastword $^),$@)
+	build-aux/svg2png "$<" "$(lastword $^)" "$@"
 
 
 src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg