* Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.10 (or

[pspp] / Smake

diff --git a/Smake b/Smake
index 4559ad4a88f20668a5771d3d5f064d82f26f5af2..c31240a12595225809d215e6168868cb7137c1da 100644 (file)
--- a/Smake
+++ b/Smake
@@ -19,12 +19,11 @@ GNULIB_MODULES = \
        getline \
        getlogin_r \
        getopt \
-       gettext \
+       gettext-h \
        intprops \
        inttostr \
        linebreak \
        localcharset \
-       minmax \
         mbchar \
        memcasecmp \
        memchr \
@@ -70,8 +69,6 @@ all: po/POTFILES.in
                --doc-base=gl/doc --import $(GNULIB_MODULES)
        echo '*' > gl/.cvsignore
        echo '*' > gl/m4/.cvsignore
-       test -d intl || mkdir intl
-       echo '*' > intl/.cvsignore
        libtoolize --force --automake
        autopoint --force
        aclocal -I m4 -I gl/m4
@@ -82,7 +79,7 @@ all: po/POTFILES.in
 gettextize:
        test -d m4 || mkdir m4
        touch m4/Makefile.am
-       gettextize -f -c --intl --no-changelog
+       gettextize --force --no-changelog
 
 po/POTFILES.in:
        for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \