Switch from recursive to non-recursive use of Gnulib.

[pspp] / Smake

diff --git a/Smake b/Smake
index 40eac89dd16873a7f753b82d48ec150fead27da4..597baea4f256a131385bb5559c77ae734dd6aae2 100644 (file)
--- a/Smake
+++ b/Smake
@@ -47,6 +47,7 @@ GNULIB_MODULES = \
        environ \
        fatal-signal \
        fcntl \
+       fnmatch \
        fpieee \
        fprintf-posix \
        full-read \
@@ -135,6 +136,7 @@ GNULIB_MODULES = \
        unitypes \
        unlocked-io \
        vasprintf-posix \
+       verify \
        version-etc \
        version-etc-fsf \
        vfprintf-posix \
@@ -334,7 +336,8 @@ prep_ph:
        touch build-aux/config.rpath
        $(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;                         \
@@ -402,6 +405,7 @@ clean: clean-icons
        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