projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced sprintf with c_snprintf where appropriate
[pspp]
/
Smake
diff --git
a/Smake
b/Smake
index 22c0f692de0638be8e8d5405da76d573837086e2..1fd4ac3d1434a03552186771269fe4abd8705597 100644
(file)
--- a/
Smake
+++ b/
Smake
@@
-7,16
+7,21
@@
GNULIB_TOOL = $(GNULIB)/gnulib-tool
GNULIB_MODULES = \
assert \
byteswap \
GNULIB_MODULES = \
assert \
byteswap \
+ c-snprintf \
+ c-strcase \
+ c-strcasestr \
c-ctype \
c-strtod \
c-ctype \
c-strtod \
+ clean-temp \
close \
configmake \
count-one-bits \
crc \
crypto/md4 \
close \
configmake \
count-one-bits \
crc \
crypto/md4 \
+ crypto/md5 \
dirname \
dirname \
+ dtoastr \
environ \
environ \
- exit \
fatal-signal \
fcntl \
fpieee \
fatal-signal \
fcntl \
fpieee \
@@
-27,10
+32,11
@@
GNULIB_MODULES = \
ftello \
fwriteerror \
getline \
ftello \
fwriteerror \
getline \
- getopt \
- gettext-h \
+ gettext \
gettimeofday \
gettimeofday \
+ getopt-gnu \
gitlog-to-changelog \
gitlog-to-changelog \
+ include_next \
isfinite \
isinf \
isnan \
isfinite \
isinf \
isnan \
@@
-38,18
+44,19
@@
GNULIB_MODULES = \
inttostr \
localcharset \
mbchar \
inttostr \
localcharset \
mbchar \
+ mbiter \
memcasecmp \
memchr \
memcasecmp \
memchr \
- memcmp \
- memmove \
mempcpy \
mempcpy \
- mem
set
\
+ mem
rchr
\
minmax \
mkdtemp \
mkstemp \
printf-posix \
printf-safe \
progname \
minmax \
mkdtemp \
mkstemp \
printf-posix \
printf-safe \
progname \
+ rawmemchr \
+ read-file \
regex \
relocatable-prog \
rename \
regex \
relocatable-prog \
rename \
@@
-61,23
+68,30
@@
GNULIB_MODULES = \
stdbool \
stdint \
stpcpy \
stdbool \
stdint \
stpcpy \
- strcase \
- strcspn \
strerror \
strftime \
strtod \
strtok_r \
strerror \
strftime \
strtod \
strtok_r \
- strtol \
- strtoul \
sys_stat \
tempname \
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 \
version-etc \
unlocked-io \
vasprintf-posix \
version-etc \
@@
-95,21
+109,32
@@
GNULIB_MODULES = \
xstrndup \
xvasprintf
xstrndup \
xvasprintf
-all:
+all: prep_ph
+ $(MAKE) -f Smake Makefile.in configure
+
+.PHONY: prep_ph
+prep_ph:
test -e ChangeLog || touch ChangeLog
test -d m4 || mkdir m4
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 \
+ $(GNULIB_TOOL) --
add-
import --no-changelog --m4-base=gl/m4 \
--source-base=gl --lib=libgl --tests-base=tests \
--source-base=gl --lib=libgl --tests-base=tests \
- --doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
- echo '*' > gl/.cvsignore
- echo '*' > gl/m4/.cvsignore
+ --doc-base=gl/doc --aux-dir=build-aux \
+ --libtool $(GNULIB_MODULES)
libtoolize --force --automake
libtoolize --force --automake
+
+aclocal.m4:
aclocal -I m4 -I gl/m4
aclocal -I m4 -I gl/m4
+
+configure: configure.ac aclocal.m4
autoconf
autoconf
+
+config.h.in: configure.ac
autoheader
autoheader
- automake --add-missing --copy --no-force
+
+Makefile.in: Makefile.am config.h.in aclocal.m4
+ automake --add-missing --copy --no-force --include-deps
+
gettextize:
test -d m4 || mkdir m4
gettextize:
test -d m4 || mkdir m4