X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=2e2dc4c179b03c638e8f3304fa878ebff25a4f60;hb=0c88e75ba323baad4440ef0ab66bc35df2f1aecc;hp=22699f65e3a2d4fc9e7efc986e4f4ea447d80a10;hpb=23fd25fa0a2fb9d613f4f9445000e49cc3b83db1;p=pspp

diff --git a/Smake b/Smake
index 22699f65e3..2e2dc4c179 100644
--- a/Smake
+++ b/Smake
@@ -48,11 +48,13 @@ GNULIB_MODULES = \
         mbiter \
 	memcasecmp \
 	memchr \
+	memchr2 \
 	mempcpy \
 	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
+	pipe2 \
 	printf-posix \
 	printf-safe \
 	progname \
@@ -62,12 +64,14 @@ GNULIB_MODULES = \
 	relocatable-prog \
 	rename \
 	round \
+	select \
 	snprintf \
 	snprintf-posix \
 	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
+	strcasestr \
 	stpcpy \
 	strerror \
 	strftime \
@@ -78,9 +82,10 @@ GNULIB_MODULES = \
 	trunc \
 	unicase/u8-casecmp \
 	unicase/u8-casefold \
+	unicase/u8-tolower \
+	unicase/u8-toupper \
 	unictype/ctype-print \
-	unictype/property-id-continue \
-	unictype/property-id-start \
+	unictype/category-of \
 	unigbrk/uc-is-grapheme-break \
 	unilbrk/u8-possible-linebreaks \
 	uninorm/nfkd \
@@ -113,9 +118,62 @@ GNULIB_MODULES = \
 	xstrndup \
 	xvasprintf
 
-all: prep_ph
+APP_ICONS = \
+src/ui/gui/icons/apps/32x32/pspp.png \
+src/ui/gui/icons/apps/22x22/pspp.png \
+src/ui/gui/icons/apps/24x24/pspp.png \
+src/ui/gui/icons/apps/256x256/pspp.png \
+src/ui/gui/icons/apps/16x16/pspp.png \
+src/ui/gui/icons/apps/48x48/pspp.png
+
+
+MIMETYPE_ICONS = \
+src/ui/gui/icons/mimetypes/32x32/application-x-spss-por.png \
+src/ui/gui/icons/mimetypes/32x32/application-x-spss-sav.png \
+src/ui/gui/icons/mimetypes/32x32/application-x-spss-sps.png \
+src/ui/gui/icons/mimetypes/22x22/application-x-spss-por.png \
+src/ui/gui/icons/mimetypes/22x22/application-x-spss-sav.png \
+src/ui/gui/icons/mimetypes/22x22/application-x-spss-sps.png \
+src/ui/gui/icons/mimetypes/24x24/application-x-spss-por.png \
+src/ui/gui/icons/mimetypes/24x24/application-x-spss-sav.png \
+src/ui/gui/icons/mimetypes/24x24/application-x-spss-sps.png \
+src/ui/gui/icons/mimetypes/256x256/application-x-spss-por.png \
+src/ui/gui/icons/mimetypes/256x256/application-x-spss-sav.png \
+src/ui/gui/icons/mimetypes/256x256/application-x-spss-sps.png \
+src/ui/gui/icons/mimetypes/16x16/application-x-spss-por.png \
+src/ui/gui/icons/mimetypes/16x16/application-x-spss-sav.png \
+src/ui/gui/icons/mimetypes/16x16/application-x-spss-sps.png \
+src/ui/gui/icons/mimetypes/48x48/application-x-spss-por.png \
+src/ui/gui/icons/mimetypes/48x48/application-x-spss-sav.png \
+src/ui/gui/icons/mimetypes/48x48/application-x-spss-sps.png \
+
+MISC_ICONS = src/ui/gui/icons/splash.png
+
+
+ICONS=$(MIMETYPE_ICONS) $(APP_ICONS) $(MISC_ICONS)
+
+
+all: prep_ph  icons
 	$(MAKE) -f Smake Makefile.in configure
 
+icons: $(ICONS)
+
+src/ui/gui/icons/manifest:
+	$(RM) $@
+	printf '# This is a generated file. Do not edit.\n' >> $@
+	printf 'icons =' >> $@
+	for i in  $(ICONS); do \
+	  printf ' \\\n\t '$$i >> $@; \
+	done
+	echo >> $@
+	echo >> $@
+	printf 'icon_srcs = ' >> $@
+	for i in  $(ICONS); do \
+	  printf ' \\\n\t '$$i | sed -e 's/\.png$$/.svg/' -e 's%/icons/%/artwork/%' >> $@ ; \
+	done
+	echo ' ' >> $@
+	echo >> $@
+
 .PHONY: prep_ph
 prep_ph: 
 	test -e ChangeLog || touch ChangeLog
@@ -125,7 +183,15 @@ prep_ph:
 		--source-base=gl --lib=libgl --tests-base=tests \
 		--doc-base=gl/doc --aux-dir=build-aux  \
 		--libtool $(GNULIB_MODULES)
-	libtoolize --force --automake
+	if (glibtoolize --version) >/dev/null 2>&1; then	\
+		LIBTOOLIZE=glibtoolize;				\
+	elif (libtoolize --version) >/dev/null 2>&1; then	\
+		LIBTOOLIZE=libtoolize;				\
+	else							\
+		echo >&2 "libtoolize not found";		\
+		exit 1;						\
+	fi;							\
+	$$LIBTOOLIZE --force --automake
 
 aclocal.m4:
 	aclocal -I m4 -I gl/m4
@@ -136,7 +202,7 @@ configure: configure.ac aclocal.m4
 config.h.in: configure.ac
 	autoheader
 
-Makefile.in: Makefile.am config.h.in aclocal.m4
+Makefile.in: Makefile.am config.h.in aclocal.m4 src/ui/gui/icons/manifest
 	automake --add-missing --copy --no-force --include-deps
 
 
@@ -160,6 +226,8 @@ _debug: all
 	test -d _debug || mkdir _debug
 	cd _debug && ../configure $(CONFIGUREFLAGS) --enable-debug
 
+
+
 PO_FILES = po/ChangeLog \
 po/Rules-quot po/boldquot.sed		\
 po/cat-id-tbl.c po/en@boldquot.header po/en@quot.header			\
@@ -187,3 +255,8 @@ clean:
 	rm -f reloc-ldflags install-reloc
 
 .PHONY: all gettextize clean
+
+src/ui/gui/icons/%.png: src/ui/gui/artwork/%.svg src/ui/gui/icons/COPYING_CCBYSA3
+	mkdir -p $(dir $@)
+	gimp -i -b '(let* ((image  (car  (gimp-file-load 1  "$<"  "$<"))))  (gimp-image-attach-parasite image (list "gimp-comment" 0 "$(shell cat $(lastword $^))" ))  (gimp-file-save 1 image (car  (gimp-image-get-active-drawable image)) "$@" "$@")) (gimp-quit 1)'
+