[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp ChangeLog Makefile.am NEWS Smake configure...
|
From: |
Ben Pfaff |
|
Subject: |
[Pspp-cvs] pspp ChangeLog Makefile.am NEWS Smake configure... |
|
Date: |
Mon, 19 Mar 2007 20:51:02 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 07/03/19 20:51:02
Modified files:
. : ChangeLog Makefile.am NEWS Smake configure.ac
doc : automake.mk
po : de.po pspp.pot
src/language/expressions: automake.mk
src/language/lexer: automake.mk
src/libpspp : automake.mk
Log message:
* Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.10 (or
later), which works better with systems that have a non-empty
$(EXEEXT).
(SUBDIRS): Drop intl.
(DISTCLEANFILES): Drop intl/plural.c.
* Throughout Makefile.am and the automake.mk files: Change
mkinstalldirs to $(MKDIR_P), to support the corresponding Automake
change.
* Smake (GNULIB_MODULES): Use gettext-h instead of gettext module.
(all): Don't create intl directory.
(gettextize): Don't use --intl flag.
* configure.ac: Require Autoconf 2.60 or later. Use external
gettext. Drop intl/Makefile from config files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/ChangeLog?cvsroot=pspp&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/pspp/Makefile.am?cvsroot=pspp&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/pspp/NEWS?cvsroot=pspp&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/pspp/Smake?cvsroot=pspp&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/pspp/configure.ac?cvsroot=pspp&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/pspp/doc/automake.mk?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.124&r2=1.125
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/expressions/automake.mk?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/lexer/automake.mk?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/libpspp/automake.mk?cvsroot=pspp&r1=1.22&r2=1.23
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- ChangeLog 26 Feb 2007 04:52:23 -0000 1.72
+++ ChangeLog 19 Mar 2007 20:51:01 -0000 1.73
@@ -1,3 +1,27 @@
+2007-03-19 Ben Pfaff <address@hidden>
+
+ Work toward modernizing the build system by updating our Automake
+ and Autoconf dependencies and requiring libintl to be available
+ externally (if desired) instead of including a copy in the
+ distribution.
+
+ * Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.10 (or
+ later), which works better with systems that have a non-empty
+ $(EXEEXT).
+ (SUBDIRS): Drop intl.
+ (DISTCLEANFILES): Drop intl/plural.c.
+
+ * Throughout Makefile.am and the automake.mk files: Change
+ mkinstalldirs to $(MKDIR_P), to support the corresponding Automake
+ change.
+
+ * Smake (GNULIB_MODULES): Use gettext-h instead of gettext module.
+ (all): Don't create intl directory.
+ (gettextize): Don't use --intl flag.
+
+ * configure.ac: Require Autoconf 2.60 or later. Use external
+ gettext. Drop intl/Makefile from config files.
+
2007-02-25 Ben Pfaff <address@hidden>
Thanks to Jason Stover for verifying that this patch helps under
Index: Makefile.am
===================================================================
RCS file: /cvsroot/pspp/pspp/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- Makefile.am 16 Feb 2007 19:24:25 -0000 1.20
+++ Makefile.am 19 Mar 2007 20:51:01 -0000 1.21
@@ -1,13 +1,12 @@
## Process this file with automake to produce Makefile.in -*- makefile -*-
-AUTOMAKE_OPTIONS = gnits 1.7 subdir-objects
+AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
-SUBDIRS = intl gl po
-DISTCLEANFILES = ./intl/plural.c ./po/stamp-po
+SUBDIRS = gl po
+DISTCLEANFILES = ./po/stamp-po
BUILT_SOURCES =
-AM_CPPFLAGS=-I$(top_srcdir)/intl -I$(top_builddir)/intl \
- -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
AM_CFLAGS=
@@ -19,7 +18,7 @@
CC_FOR_BUILD = @CC_FOR_BUILD@
EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
.q.c:
- @$(top_srcdir)/mkinstalldirs `dirname address@hidden
+ @$(MKDIR_P) `dirname address@hidden
./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
$(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
Index: NEWS
===================================================================
RCS file: /cvsroot/pspp/pspp/NEWS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NEWS 2 Mar 2007 01:11:37 -0000 1.17
+++ NEWS 19 Mar 2007 20:51:01 -0000 1.18
@@ -1,5 +1,5 @@
PSPP NEWS -- history of user-visible changes.
-Time-stamp: <2007-03-01 17:11:36 blp>
+Time-stamp: <2007-03-01 17:13:42 blp>
Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -17,6 +17,9 @@
may replace any usage of it by SELECT IF following TEMPORARY, which
has the same effect.
+ For developers, the build system now requires Autoconf 2.60 and
+ Automake 1.10.
+
Changes since 0.4.0 to 0.4.1:
Added support for very long string variables > 255 bytes.
Index: Smake
===================================================================
RCS file: /cvsroot/pspp/pspp/Smake,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- Smake 17 Mar 2007 13:28:18 -0000 1.52
+++ Smake 19 Mar 2007 20:51:01 -0000 1.53
@@ -19,7 +19,7 @@
getline \
getlogin_r \
getopt \
- gettext \
+ gettext-h \
intprops \
inttostr \
linebreak \
@@ -69,8 +69,6 @@
--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
@@ -81,7 +79,7 @@
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 \
Index: configure.ac
===================================================================
RCS file: /cvsroot/pspp/pspp/configure.ac,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- configure.ac 26 Feb 2007 04:52:23 -0000 1.55
+++ configure.ac 19 Mar 2007 20:51:01 -0000 1.56
@@ -1,10 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
dnl Initialize.
-AX_PREREQ(2.57)
+AX_PREREQ(2.60)
AC_INIT(pspp, 0.4.2,address@hidden)
AC_CONFIG_HEADERS([config.h])
-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE
dnl Checks for programs.
AC_GNU_SOURCE
@@ -23,8 +23,8 @@
PSPP_PERL
dnl Internationalization macros.
-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])
dnl Checks for libraries.
AC_SYS_LARGEFILE
@@ -100,7 +100,7 @@
PSPP_CHECK_PREREQS
-AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])
AC_OUTPUT
Index: doc/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/doc/automake.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/automake.mk 1 Mar 2007 21:26:28 -0000 1.4
+++ doc/automake.mk 19 Mar 2007 20:51:01 -0000 1.5
@@ -35,5 +35,5 @@
$(doc_pspp_TEXINFOS)
doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
- @$(top_srcdir)/mkinstalldirs doc
+ @$(MKDIR_P) doc
@PERL@ $(top_srcdir)/doc/get-commands.pl
$(top_srcdir)/src/language/command.def > $@
Index: po/de.po
===================================================================
RCS file: /cvsroot/pspp/pspp/po/de.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- po/de.po 17 Mar 2007 12:29:39 -0000 1.40
+++ po/de.po 19 Mar 2007 20:51:02 -0000 1.41
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-03-17 21:13+0900\n"
+"POT-Creation-Date: 2007-03-19 13:38-0700\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -1367,6 +1367,20 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1386,20 +1400,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3018,6 +3018,22 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3042,22 +3058,6 @@
"match the number following (%d)."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -4601,6 +4601,18 @@
msgid "%d"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr "Spezial"
+
#: src/ui/gui/psppire.glade:9
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -4651,18 +4663,6 @@
msgid "Variable(s):"
msgstr "Variableansicht"
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr "Spezial"
-
#: src/ui/gui/sort-cases-dialog.c:367
msgid "Criteria"
msgstr ""
Index: po/pspp.pot
===================================================================
RCS file: /cvsroot/pspp/pspp/po/pspp.pot,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -b -r1.124 -r1.125
--- po/pspp.pot 17 Mar 2007 12:29:40 -0000 1.124
+++ po/pspp.pot 19 Mar 2007 20:51:02 -0000 1.125
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-03-17 21:13+0900\n"
+"POT-Creation-Date: 2007-03-19 13:38-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -1362,6 +1362,20 @@
"Data fields must be listed in order of increasing record number."
msgstr ""
+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:260
#, c-format
msgid "Output calls for %d records but %u specified on RECORDS subcommand."
@@ -1381,20 +1395,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:74
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3012,6 +3012,22 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+
#: src/language/stats/npar.q:101
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3036,22 +3052,6 @@
"match the number following (%d)."
msgstr ""
-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -4578,6 +4578,18 @@
msgid "%d"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr ""
+
#: src/ui/gui/psppire.glade:9
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -4624,18 +4636,6 @@
msgid "Variable(s):"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr ""
-
#: src/ui/gui/sort-cases-dialog.c:367
msgid "Criteria"
msgstr ""
Index: src/language/expressions/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/expressions/automake.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/language/expressions/automake.mk 14 Dec 2006 10:45:19 -0000
1.4
+++ src/language/expressions/automake.mk 19 Mar 2007 20:51:02 -0000
1.5
@@ -29,7 +29,7 @@
SUFFIXES = .h.pl .inc.pl
-generate_from_pl = $(top_srcdir)/mkinstalldirs `dirname address@hidden && \
+generate_from_pl = $(MKDIR_P) `dirname address@hidden && \
$(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i
$(top_srcdir)/src/language/expressions/operations.def
.h.pl.h:
Index: src/language/lexer/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/lexer/automake.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/language/lexer/automake.mk 16 Feb 2007 19:24:25 -0000 1.7
+++ src/language/lexer/automake.mk 19 Mar 2007 20:51:02 -0000 1.8
@@ -16,7 +16,7 @@
src/language/lexer/q2c$(EXEEXT_FOR_BUILD):
$(top_srcdir)/src/language/lexer/q2c.c
- @$(top_srcdir)/mkinstalldirs `dirname address@hidden
+ @$(MKDIR_P) `dirname address@hidden
$(CC_FOR_BUILD) $(top_srcdir)/src/language/lexer/q2c.c -o
$(top_builddir)/src/language/lexer/q2c
Index: src/libpspp/automake.mk
===================================================================
RCS file: /cvsroot/pspp/pspp/src/libpspp/automake.mk,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/libpspp/automake.mk 22 Feb 2007 11:26:37 -0000 1.22
+++ src/libpspp/automake.mk 19 Mar 2007 20:51:02 -0000 1.23
@@ -63,7 +63,7 @@
nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
src/libpspp/version.c: $(top_srcdir)/AUTHORS
- @$(top_srcdir)/mkinstalldirs src/libpspp
+ @$(MKDIR_P) src/libpspp
echo "/* -*- mode: c; buffer-read-only: t -*-" > $@
echo " Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
echo "#include \"version.h\"" >> $@
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp ChangeLog Makefile.am NEWS Smake configure...,
Ben Pfaff <=