X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=8061b698f7ed4996909a370d02a43b2c6ea38fbe;hb=refs%2Fheads%2Fctables17;hp=3cf37f5df12a5e59bf5631a07c22b60b113c9dc0;hpb=21f20b8cb6460fd5ac9db7fde038bc00cfa80831;p=pspp

diff --git a/Smake b/Smake
index 3cf37f5df1..8061b698f7 100644
--- a/Smake
+++ b/Smake
@@ -24,6 +24,8 @@ all: everything
 GNULIB = ../gnulib
 GNULIB_TOOL = $(GNULIB)/gnulib-tool
 
+PYTHON3 = python3
+
 GNULIB_MODULES = \
 	assert \
 	byteswap \
@@ -136,6 +138,7 @@ GNULIB_MODULES = \
 	unitypes \
 	unlocked-io \
 	vasprintf-posix \
+	verify \
 	version-etc \
 	version-etc-fsf \
 	vfprintf-posix \
@@ -153,11 +156,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.gnu.pspp.png \
+src/ui/gui/icons/32x32/apps/org.gnu.pspp.png \
+src/ui/gui/icons/48x48/apps/org.gnu.pspp.png \
+src/ui/gui/icons/256x256/apps/org.gnu.pspp.png \
+src/ui/gui/icons/scalable/apps/org.gnu.pspp.svg
 
 CATEGORY_ICONS = \
 src/ui/gui/icons/48x48/categories/align-left.png \
@@ -315,11 +318,11 @@ src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
 	echo >> $@
 
 
-src/ui/gui/resources.xml: $(ICONS)
+src/ui/gui/resources.xml: $(MAKEFILE_LIST)
 	printf '<?xml version="1.0" encoding="UTF-8"?>\n' > $@
 	printf '<gresources>\n' >> $@
-	printf ' <gresource prefix="gnu/pspp">\n' >> $@
-	for x in $^; do \
+	printf ' <gresource prefix="org/gnu/pspp">\n' >> $@
+	for x in $(ICONS); do \
 	  z=`echo "$$x" | sed -e 's%src/ui/gui/%%'` ; \
 	  printf "  <file>$$z</file>\n" >> $@ ; \
 	done
@@ -335,7 +338,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;				\
@@ -403,6 +407,7 @@ clean: clean-icons
 	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
@@ -416,12 +421,6 @@ clean: clean-icons
 .PHONY: all gettextize clean
 
 
-# The "convert" program from imagemagick can be used to create png from svg but doesn't properly deal
-# 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 -background transparent $1 $3
-
 # Graphical layout of icons and our portfolio
 # ===========================================
 #
@@ -453,33 +452,35 @@ clean: clean-icons
 #  => all others are in scaled (just one design svg)
 #
 
+SVG2PNG = PYTHON3='$(PYTHON3)' build-aux/svg2png
+
 # Rule for icons with size dependent graphical design
 src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 
 # Rules for icons which are simply scaled - Attention multitarget would trigger only once...
 src/ui/gui/icons/16x16/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 src/ui/gui/icons/22x22/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 src/ui/gui/icons/24x24/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 src/ui/gui/icons/32x32/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 src/ui/gui/icons/48x48/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 src/ui/gui/icons/96x96/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 src/ui/gui/icons/256x256/%.png : src/ui/gui/artwork/scalable/%.svg build-aux/svg2png src/ui/gui/icons/COPYING_CCBYSA3
 	mkdir -p $(dir $@)
-	build-aux/svg2png "$<" "$(lastword $^)" "$@"
+	$(SVG2PNG) "$<" "$(lastword $^)" "$@"
 
 # Copy svg
 src/ui/gui/icons/%.svg: src/ui/gui/artwork/%.svg