From 4b4c2c415ca1b8f2cfc6854ddce572657a32c978 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Thu, 3 Jun 2004 11:27:20 +0000 Subject: [PATCH] hopefully fixed all configure problems now SVN-Revision: 1399 --- .cvsignore | 13 +++++++++++++ ChangeLog | 21 +++++++++++++++++++++ Makefile.am | 8 +++----- autogen.sh | 2 +- data/.cvsignore | 2 ++ intl/.cvsignore | 2 ++ m4/.cvsignore | 3 +++ po/.cvsignore | 6 ++++++ src/.cvsignore | 6 ++++++ 9 files changed, 57 insertions(+), 6 deletions(-) create mode 100644 .cvsignore create mode 100644 data/.cvsignore create mode 100644 intl/.cvsignore create mode 100644 m4/.cvsignore create mode 100644 po/.cvsignore create mode 100644 src/.cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 000000000..5a11bab46 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,13 @@ +Makefile.in +aclocal.m4 +config.log +config.status +config.guess +config.rpath +config.sub +configure +depcomp +install-sh +missing +mkinstalldirs + diff --git a/ChangeLog b/ChangeLog index 20a6c95ae..c950a9403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2004-06-02 gettextize + + * Makefile.am (SUBDIRS): Add intl, + (EXTRA_DIST): Add config.rpath mkinstalldirs. + * configure.ac (AC_OUTPUT): Add intl/Makefile, + +2004-06-02 gettextize + + * Makefile.am (EXTRA_DIST): Add config.rpath mkinstalldirs. + +2004-06-02 gettextize + + * Makefile.am (EXTRA_DIST): Add config.rpath. + +2004-06-02 gettextize + + * Makefile.am (SUBDIRS): Add m4. + (ACLOCAL_AMFLAGS): New variable. + (EXTRA_DIST): Add config.rpath. + * configure.ac (AC_OUTPUT): Add po/Makefile.in, + - SuperTux changes - http://super-tux.sf.net/ diff --git a/Makefile.am b/Makefile.am index e119f0e0f..449a573a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = src data - -EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py $(wildcard mk/autoconf/*.m4) autogen.sh - -# EOF # +SUBDIRS = intl m4 src data po +EXTRA_DIST = config.rpath mkinstalldirs config.rpath mkinstalldirs config.rpath config.rpath LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh +ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index f9a92f0d6..7e64cbd35 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ # we need a minimum of automake 1.6 and automake 1.8 seems to be buggy export WANT_AUTOMAKE=1.6 -aclocal -I mk/autoconf +aclocal -I m4 automake --copy --add-missing autoconf diff --git a/data/.cvsignore b/data/.cvsignore new file mode 100644 index 000000000..282522db0 --- /dev/null +++ b/data/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/intl/.cvsignore b/intl/.cvsignore new file mode 100644 index 000000000..550bd25cd --- /dev/null +++ b/intl/.cvsignore @@ -0,0 +1,2 @@ +Makefile + diff --git a/m4/.cvsignore b/m4/.cvsignore new file mode 100644 index 000000000..22a4e7292 --- /dev/null +++ b/m4/.cvsignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in + diff --git a/po/.cvsignore b/po/.cvsignore new file mode 100644 index 000000000..2bfb3bdf3 --- /dev/null +++ b/po/.cvsignore @@ -0,0 +1,6 @@ +Makefile +Makefile.in +POTFILES +*.gmo +stamp-po + diff --git a/src/.cvsignore b/src/.cvsignore new file mode 100644 index 000000000..bbf2c2f06 --- /dev/null +++ b/src/.cvsignore @@ -0,0 +1,6 @@ +.deps +Makefile +Makefile.in +supertux +supertux.exe + -- 2.11.0