projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New widget PsppireValChooser.
[pspp-builds.git]
/
Smake
diff --git
a/Smake
b/Smake
index fd936cd1505477a87b1718205ca4b7e2bcbc8d31..4cbe44ece9a3060f9549b2fe7e345591b5f48623 100644
(file)
--- a/
Smake
+++ b/
Smake
@@
-5,17
+5,22
@@
GNULIB = ../gnulib
GNULIB_TOOL = $(GNULIB)/gnulib-tool
GNULIB_MODULES = \
GNULIB_TOOL = $(GNULIB)/gnulib-tool
GNULIB_MODULES = \
- argp \
assert \
byteswap \
assert \
byteswap \
+ c-strcase \
+ c-strcasestr \
c-ctype \
c-strtod \
c-ctype \
c-strtod \
+ clean-temp \
close \
close \
+ configmake \
count-one-bits \
count-one-bits \
+ crc \
crypto/md4 \
crypto/md4 \
+ crypto/md5 \
dirname \
dirname \
+ dtoastr \
environ \
environ \
- exit \
fatal-signal \
fcntl \
fpieee \
fatal-signal \
fcntl \
fpieee \
@@
-25,13
+30,12
@@
GNULIB_MODULES = \
fseeko \
ftello \
fwriteerror \
fseeko \
ftello \
fwriteerror \
- gethostname \
getline \
getline \
- getlogin_r \
- getopt \
- gettext-h \
+ gettext \
gettimeofday \
gettimeofday \
+ getopt-gnu \
gitlog-to-changelog \
gitlog-to-changelog \
+ include_next \
isfinite \
isinf \
isnan \
isfinite \
isinf \
isnan \
@@
-41,15
+45,16
@@
GNULIB_MODULES = \
mbchar \
memcasecmp \
memchr \
mbchar \
memcasecmp \
memchr \
- memcmp \
- memmove \
mempcpy \
mempcpy \
- mem
set
\
+ mem
rchr
\
minmax \
minmax \
+ mkdtemp \
mkstemp \
printf-posix \
printf-safe \
progname \
mkstemp \
printf-posix \
printf-safe \
progname \
+ rawmemchr \
+ read-file \
regex \
relocatable-prog \
rename \
regex \
relocatable-prog \
rename \
@@
-62,25
+67,36
@@
GNULIB_MODULES = \
stdint \
stpcpy \
strcase \
stdint \
stpcpy \
strcase \
- strcspn \
strerror \
strftime \
strerror \
strftime \
- strsep \
strtod \
strtok_r \
strtol \
strtoul \
sys_stat \
tempname \
strtod \
strtok_r \
strtol \
strtoul \
sys_stat \
tempname \
- tmpfile \
trunc \
trunc \
- unilbrk/ulc-width-linebreaks \
+ unictype/ctype-print \
+ unictype/property-id-continue \
+ unictype/property-id-start \
+ unigbrk/uc-is-grapheme-break \
+ unilbrk/u8-possible-linebreaks \
unistd \
unistd \
+ unistr/u8-check \
unistr/u8-cpy \
unistr/u8-cpy \
+ unistr/u8-mblen \
+ unistr/u8-mbtouc \
+ unistr/u8-mbtoucr \
unistr/u8-strlen \
unistr/u8-strlen \
+ unistr/u8-strmbtouc \
unistr/u8-strncat \
unistr/u8-strncat \
+ unistr/u8-uctomb \
+ uniwidth/u8-strwidth \
+ unitypes \
unlocked-io \
vasprintf-posix \
unlocked-io \
vasprintf-posix \
+ version-etc \
+ version-etc-fsf \
vfprintf-posix \
vprintf-posix \
vsnprintf \
vfprintf-posix \
vprintf-posix \
vsnprintf \
@@
-97,20
+113,21
@@
GNULIB_MODULES = \
all:
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
all:
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
- echo '*' > m4/.cvsignore
touch m4/Makefile.am
touch m4/Makefile.am
- $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
- --source-base=gl --lib=libgl --tests-base=tests \
- --doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
- echo '*' > gl/.cvsignore
- echo '*' > gl/m4/.cvsignore
+ $(MAKE) -f Smake gnulib
libtoolize --force --automake
libtoolize --force --automake
- autopoint --force
aclocal -I m4 -I gl/m4
autoconf
autoheader
automake --add-missing --copy --no-force
aclocal -I m4 -I gl/m4
autoconf
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)
+
+
gettextize:
test -d m4 || mkdir m4
touch m4/Makefile.am
gettextize:
test -d m4 || mkdir m4
touch m4/Makefile.am
@@
-139,7
+156,6
@@
po/Makevars.template po/pspp.pot
clean:
rm -f config.sub config.guess config.rpath
clean:
rm -f config.sub config.guess config.rpath
- rm -f ABOUT-NLS
rm -fr autom4te.cache
rm -f aclocal.m4
rm -f missing mkinstalldirs
rm -fr autom4te.cache
rm -f aclocal.m4
rm -f missing mkinstalldirs