summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--config/.gitignore1
-rw-r--r--configure.ac5
-rw-r--r--maintMakefile10
-rw-r--r--w32/Makefile.am2
5 files changed, 12 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 6e3f5a2..dd8a490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Makefile
Makefile.in
aclocal.m4
autom4te.cache
+config.cache
config.h
config.h.in
config.log
diff --git a/config/.gitignore b/config/.gitignore
index 1a0de75..d11a488 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -1,3 +1,4 @@
+ar-lib
compile
config.guess
config.rpath
diff --git a/configure.ac b/configure.ac
index ad07a7e..59333d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,9 @@ AC_CONFIG_HEADERS([config.h])
# Automake setup
# We have to enable "foreign" because ChangeLog is auto-generated
-AM_INIT_AUTOMAKE([1.11.1 silent-rules foreign -Wall -Werror])
+# We cannot enable -Werror because gettext 0.18.1 has invalid content
+# When we update gettext to 0.18.3 or better we can add it again.
+AM_INIT_AUTOMAKE([1.11.1 silent-rules foreign -Wall])
# Checks for programs.
AC_USE_SYSTEM_EXTENSIONS
@@ -49,7 +51,6 @@ AC_ISC_POSIX
AC_MINIX
# Enable gettext, in "external" mode.
-
AM_GNU_GETTEXT_VERSION([0.18.1])
AM_GNU_GETTEXT([external])
diff --git a/maintMakefile b/maintMakefile
index 69cb586..7f34860 100644
--- a/maintMakefile
+++ b/maintMakefile
@@ -141,13 +141,13 @@ ChangeLog: .check-git-HEAD
## Updating files. ##
## ---------------- ##
-WGET = wget --passive-ftp -nv
+WGET = wget --passive-ftp -np -nv
ftp-gnu = ftp://ftp.gnu.org/gnu
move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \
echo $(target) is unchanged; rm -f $(target).t; \
else \
- mv $(target).t $(target); \
+ mv -f $(target).t $(target); \
fi
# ------------------- #
@@ -159,8 +159,7 @@ move_if_change = if test -r $(target) && cmp -s $(target).t $(target); then \
# http://translation.sf.net/maint/
# ftp://tiger.informatik.hu-berlin.de/pub/po/maint/
-po_wget_flags = --recursive --level=1 --no-directories --no-parent \
- --no-check-certificate
+po_wget_flags = --recursive --level=1 --no-directories --no-check-certificate
po_repo = http://translationproject.org/latest/$(PACKAGE)
.PHONY: do-po-update po-update
do-po-update:
@@ -169,7 +168,8 @@ do-po-update:
&& mkdir "$$tmppo" \
&& (cd "$$tmppo" \
&& $(WGET) $(po_wget_flags) -A '*.po' $(po_repo)) \
- && cp "$$tmppo"/*.po $(top_srcdir)/po && rm -rf "$$tmppo"
+ && cp "$$tmppo"/*.po $(top_srcdir)/po \
+ && rm -rf "$$tmppo"
cd po && $(MAKE) update-po
$(MAKE) po-check
diff --git a/w32/Makefile.am b/w32/Makefile.am
index be757fe..88ca826 100644
--- a/w32/Makefile.am
+++ b/w32/Makefile.am
@@ -15,6 +15,8 @@
# You should have received a copy of the GNU General Public License along with
# this program. If not, see <http://www.gnu.org/licenses/>.
+AUTOMAKE_OPTIONS = subdir-objects
+
noinst_LIBRARIES = libw32.a
libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \