X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=5a11401aa9f954580853d8b283bc7486beb64980;hb=bff93a49a8f7d82aa5fed643e5bbd1d1c830680f;hp=d8ddb389faa05115c992966bc2413019b4bde81e;hpb=c2b953d03cc404e6edfd57f9dce96493b5ea834a;p=pspp

diff --git a/Smake b/Smake
index d8ddb389fa..5a11401aa9 100644
--- a/Smake
+++ b/Smake
@@ -1,5 +1,7 @@
 # -*- makefile -*-
 
+all: everything
+
 # Adjust these to reflect where you've installed gnulib.
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
@@ -76,6 +78,7 @@ GNULIB_MODULES = \
 	stpcpy \
 	strerror \
 	strftime \
+	strsep \
 	strtod \
 	strtok_r \
 	sys_stat \
@@ -180,7 +183,16 @@ src/ui/gui/icons/mimetypes/48x48/application-x-spss-sav.png \
 src/ui/gui/icons/mimetypes/48x48/application-x-spss-sps.png \
 src/ui/gui/icons/mimetypes/48x48/application-x-spss-zsav.png \
 
-MISC_ICONS = src/ui/gui/icons/splash.png
+
+src/ui/gui/artwork/splash-t.svg: src/ui/gui/artwork/splash.svg
+	cp $< $@
+
+src/ui/gui/artwork/splash-r.svg: src/ui/gui/artwork/splash.svg
+	sed -e '/inkscape:label="Overlay"/s/inline/none/' $< > $@
+
+
+MISC_ICONS = src/ui/gui/icons/splash-t.png \
+	src/ui/gui/icons/splash-r.png
 
 
 ACTION_ICONS = \
@@ -296,45 +308,17 @@ src/ui/gui/icons/actions/16x16/help-about.png
 
 ICONS=$(CATEGORY_ICONS) $(ACTION_ICONS) $(MIMETYPE_ICONS) $(APP_ICONS) $(MISC_ICONS)
 
-all: prep_ph  icons
+everything: prep_ph  icons
 	$(MAKE) -f Smake Makefile.in configure
 
 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) $@
@@ -347,7 +331,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 >> $@
@@ -375,7 +360,7 @@ 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
@@ -406,8 +391,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
@@ -427,7 +411,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