X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=e620df9cf64f4c4f01ce069013393205a58a8e30;hb=00fd6a404453624eeb7158958b94a6bdf9c41f98;hp=8c6669d0d1ad2335a8e3b5849823f2f29d8deae4;hpb=b5cebf00d5edaada965b3dc75c745942d9483059;p=pspp

diff --git a/Smake b/Smake
index 8c6669d0d1..e620df9cf6 100644
--- a/Smake
+++ b/Smake
@@ -7,8 +7,12 @@ GNULIB_TOOL = $(GNULIB)/gnulib-tool
 GNULIB_MODULES = \
 	assert \
 	byteswap \
+	c-snprintf \
+	c-strcase \
+	c-strcasestr \
 	c-ctype \
 	c-strtod \
+	c-xvasprintf \
 	clean-temp \
 	close \
 	configmake \
@@ -29,10 +33,11 @@ GNULIB_MODULES = \
         ftello \
 	fwriteerror \
 	getline \
-	gettext-h \
+	gettext \
 	gettimeofday \
         getopt-gnu \
 	gitlog-to-changelog \
+	include_next \
 	isfinite \
 	isinf \
 	isnan \
@@ -40,43 +45,60 @@ GNULIB_MODULES = \
 	inttostr \
 	localcharset \
         mbchar \
+        mbiter \
 	memcasecmp \
 	memchr \
+	memchr2 \
 	mempcpy \
+	memrchr \
 	minmax \
 	mkdtemp \
 	mkstemp \
+	pipe2 \
 	printf-posix \
 	printf-safe \
 	progname \
+	rawmemchr \
+	read-file \
 	regex \
 	relocatable-prog \
 	rename \
 	round \
+	select \
 	snprintf \
 	snprintf-posix \
 	sprintf-posix \
 	stdarg \
 	stdbool \
 	stdint \
+	strcasestr \
 	stpcpy \
-	strcase \
 	strerror \
 	strftime \
 	strtod \
 	strtok_r \
-	strtol \
-	strtoul \
 	sys_stat \
 	tempname \
 	trunc \
+	unicase/u8-casecmp \
+	unicase/u8-casefold \
+	unicase/u8-tolower \
+	unicase/u8-toupper \
+	unictype/ctype-print \
+	unictype/category-of \
+	unigbrk/uc-is-grapheme-break \
+	unilbrk/u8-possible-linebreaks \
+	uninorm/nfkd \
 	unistd \
-	unictype/property-id-continue \
-	unictype/property-id-start \
+	unistr/u8-check \
 	unistr/u8-cpy \
+	unistr/u8-mblen \
 	unistr/u8-mbtouc \
+	unistr/u8-mbtoucr \
 	unistr/u8-strlen \
+	unistr/u8-strmbtouc \
 	unistr/u8-strncat \
+	unistr/u8-uctomb \
 	uniwidth/u8-strwidth \
 	unitypes \
 	unlocked-io \
@@ -96,22 +118,90 @@ GNULIB_MODULES = \
 	xstrndup \
 	xvasprintf
 
-all: 
+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 \
+
+
+ICONS=$(MIMETYPE_ICONS) $(APP_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
 	test -d m4 || mkdir m4
 	touch m4/Makefile.am
-	$(MAKE) -f Smake gnulib
-	libtoolize --force --automake
+	$(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  \
+		--libtool $(GNULIB_MODULES)
+	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
+
+configure: configure.ac aclocal.m4
 	autoconf
+
+config.h.in: configure.ac
 	autoheader
-	automake --add-missing --copy --no-force
 
-gnulib:
-	$(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 --import \
-		--libtool $(GNULIB_MODULES)
+Makefile.in: Makefile.am config.h.in aclocal.m4 src/ui/gui/icons/manifest
+	automake --add-missing --copy --no-force --include-deps
 
 
 gettextize:
@@ -134,6 +224,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			\
@@ -161,3 +253,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)'
+