From 64faaf2bb5c36711bf7d250948b3f627dc1c15a8 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 22 Dec 2002 19:08:35 +0000
Subject: [PATCH]   * Moved generated autotools files to the autotools/
 directory.

---
 .cvsignore            |  8 +-------
 Makefile.am           |  2 +-
 autotools/.cvsignore  | 10 ++++++++++
 autotools/Makefile.am |  0
 bootstrap             |  5 +++--
 configure.ac          |  2 ++
 debian/.cvsignore     |  3 +++
 src/Makefile.am       |  2 +-
 8 files changed, 21 insertions(+), 11 deletions(-)
 create mode 100644 autotools/.cvsignore
 create mode 100644 autotools/Makefile.am

diff --git a/.cvsignore b/.cvsignore
index 202a515..dc761a8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,13 +1,12 @@
 .dirstamp
 configure
+configure-stamp
 config.h
 config.h.*
 config.log
 config.cache
 config.rpath
 config.status
-config.guess
-config.sub
 confdefs.h
 conftest.cc
 autom4te.cache
@@ -16,8 +15,3 @@ Makefile.in
 build-stamp
 stamp-h*
 aclocal.m4
-install-sh
-missing
-mkinstalldirs
-compile
-depcomp
diff --git a/Makefile.am b/Makefile.am
index 772038e..c2fb801 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 ###############################################################################
 
 SUBDIRS = src
-DIST_SUBDIRS = $(SUBDIRS) debian
+DIST_SUBDIRS = $(SUBDIRS) autotools debian
 
 EXTRA_DIST = doc/shapes.txt bootstrap
 AUTOMAKE_OPTIONS = foreign dist-bzip2
diff --git a/autotools/.cvsignore b/autotools/.cvsignore
new file mode 100644
index 0000000..8cfac4b
--- /dev/null
+++ b/autotools/.cvsignore
@@ -0,0 +1,10 @@
+.dirstamp
+Makefile
+Makefile.in
+compile
+config.guess
+config.sub
+depcomp
+install-sh
+missing
+mkinstalldirs
diff --git a/autotools/Makefile.am b/autotools/Makefile.am
new file mode 100644
index 0000000..e69de29
diff --git a/bootstrap b/bootstrap
index d9e5a03..2a1734c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,8 @@
 #! /bin/sh
 set -x
 
-rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh
+rm -f aclocal.m4 configure libtool ltconfig ltmain.sh config.log
+rm -f autotools/compile autotools/config.guess autotools/config.sub autotools/missing autotools/mkinstalldirs autotools/depcomp autotools/install-sh
 
 # Check for automake
 amvers="none"
@@ -37,7 +38,7 @@ then
   exit 1
 fi
 
-aclocal${amvers} || exit 1
+aclocal${amvers} -I autotools || exit 1
 autoheader || exit 1
 automake${amvers} --add-missing --copy || exit 1
 autoconf || exit 1
diff --git a/configure.ac b/configure.ac
index 1017486..38a404b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ AC_INIT(ttyvaders,0.0cvs-20021218)
 
 AC_PREREQ(2.50)
 AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_AUX_DIR(autotools)
 AC_CANONICAL_SYSTEM
 
 AM_INIT_AUTOMAKE(ttyvaders,0.0cvs-20021218)
@@ -29,6 +30,7 @@ AM_CONDITIONAL(USE_NCURSES, test "${enable_ncurses}" = "yes")
 AC_OUTPUT([
   Makefile
   src/Makefile
+  autotools/Makefile
   debian/Makefile
 ])
 
diff --git a/debian/.cvsignore b/debian/.cvsignore
index 46cd049..40da85b 100644
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -1,3 +1,6 @@
 .dirstamp
 Makefile
 Makefile.in
+files
+ttyvaders
+ttyvaders.substvars
diff --git a/src/Makefile.am b/src/Makefile.am
index e36609c..651b2aa 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@
 # Automake targets and declarations for ttyvaders
 ###############################################################################
 
-AM_CFLAGS = -g -O6 -fno-strength-reduce -fomit-frame-pointer
+AM_CFLAGS = -g -O2 -fno-strength-reduce -fomit-frame-pointer
 
 # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
 AM_CFLAGS += -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs