projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatic inference of measeurement level works.
[pspp]
/
Smake
diff --git
a/Smake
b/Smake
index 577e31ef47f319277ba2fdf2e72de3ae977757fb..72c1d34f0b5a6cbc14e6875325fba62c25e68611 100644
(file)
--- a/
Smake
+++ b/
Smake
@@
-43,9
+43,11
@@
GNULIB_MODULES = \
crypto/rijndael \
dirname \
dtoastr \
crypto/rijndael \
dirname \
dtoastr \
+ dtotimespec \
environ \
fatal-signal \
fcntl \
environ \
fatal-signal \
fcntl \
+ fnmatch \
fpieee \
fprintf-posix \
full-read \
fpieee \
fprintf-posix \
full-read \
@@
-55,7
+57,8
@@
GNULIB_MODULES = \
fwriteerror \
getline \
getpass \
fwriteerror \
getline \
getpass \
- gettext \
+ gettext-h \
+ gettime \
gettimeofday \
getopt-gnu \
gitlog-to-changelog \
gettimeofday \
getopt-gnu \
gitlog-to-changelog \
@@
-66,6
+69,7
@@
GNULIB_MODULES = \
intprops \
inttostr \
localcharset \
intprops \
inttostr \
localcharset \
+ localename \
mbchar \
mbiter \
memcasecmp \
mbchar \
mbiter \
memcasecmp \
@@
-97,13
+101,16
@@
GNULIB_MODULES = \
strcasestr \
stpcpy \
strerror \
strcasestr \
stpcpy \
strerror \
- strftime \
+
n
strftime \
strsep \
strtod \
strtok_r \
sys_stat \
tempname \
termios \
strsep \
strtod \
strtok_r \
sys_stat \
tempname \
termios \
+ timespec \
+ timespec-add \
+ timespec-sub \
trunc \
unicase/u8-casecmp \
unicase/u8-casefold \
trunc \
unicase/u8-casecmp \
unicase/u8-casefold \
@@
-129,6
+136,7
@@
GNULIB_MODULES = \
unitypes \
unlocked-io \
vasprintf-posix \
unitypes \
unlocked-io \
vasprintf-posix \
+ verify \
version-etc \
version-etc-fsf \
vfprintf-posix \
version-etc \
version-etc-fsf \
vfprintf-posix \
@@
-138,6
+146,7
@@
GNULIB_MODULES = \
vsprintf-posix \
xalloc \
xalloc-die \
vsprintf-posix \
xalloc \
xalloc-die \
+ xbinary-io \
xmalloca \
xmemdup0 \
xsize \
xmalloca \
xmemdup0 \
xsize \
@@
-145,8
+154,11
@@
GNULIB_MODULES = \
xvasprintf
APP_ICONS = \
xvasprintf
APP_ICONS = \
-src/ui/gui/icons/48x48/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 \
CATEGORY_ICONS = \
src/ui/gui/icons/48x48/categories/align-left.png \
@@
-283,6
+295,9
@@
everything: prep_ph icons
$(MAKE) -f Smake Makefile.in configure
icons: $(ICONS)
$(MAKE) -f Smake Makefile.in configure
icons: $(ICONS)
+clean-icons:
+ rm -f $(ICONS)
+.PHONY: icons clean-icons
src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
$(RM) $@
src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
$(RM) $@
@@
-301,11
+316,11
@@
src/ui/gui/icons/manifest: $(MAKEFILE_LIST)
echo >> $@
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 '<?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
z=`echo "$$x" | sed -e 's%src/ui/gui/%%'` ; \
printf " <file>$$z</file>\n" >> $@ ; \
done
@@
-318,9
+333,11
@@
prep_ph:
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
touch m4/Makefile.am
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
touch m4/Makefile.am
+ touch build-aux/config.rpath
$(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
--source-base=gl --lib=libgl --tests-base=tests \
$(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; \
--libtool $(GNULIB_MODULES)
if (glibtoolize --version) >/dev/null 2>&1; then \
LIBTOOLIZE=glibtoolize; \
@@
-372,7
+389,7
@@
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
po/insert-header.sin po/quot.sed po/remove-potcdate.sin po/stamp-po \
po/Makevars.template po/pspp.pot
-clean:
+clean:
clean-icons
rm -f config.sub config.guess config.rpath
rm -fr autom4te.cache
rm -f aclocal.m4
rm -f config.sub config.guess config.rpath
rm -fr autom4te.cache
rm -f aclocal.m4
@@
-388,6
+405,7
@@
clean:
rm -f config.h.in~
rm -f config.h.in
rm -f gl/Makefile.in
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
rm -f Makefile.in
rm -f build-aux/compile
rm -f build-aux/ltmain.sh