* added cvsignore files

* fixed build process for automake 1.5


git-svn-id: svn+ssh://jackaudio.org/trunk/jack@39 0c269be4-1314-0410-8aa9-9f06e86f4224

7 files changed, 55 insertions, 13 deletions

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..40d5a88
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,16 @@
+config.log
+aclocal.m4
+config.status
+*.lo
+*.o
+libtool
+jackd
+jack_simple_client
+jack_monitor_client
+*.la
+*.pc
+Makefile
+Makefile.in
+jack_fltk_client
+configure
+
diff --git a/Makefile.am b/Makefile.am
index 9159142..866be3d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,12 +10,12 @@ EXTRA_PROGRAMS = jack_fltk_client
 
 bin_PROGRAMS = jackd jack_simple_client jack_monitor_client @XTRA@
 
-EXTRA_CFLAGS = -DADDON_DIR=\"$(ADDON_DIR)\" @GLIB_CFLAGS@
+AM_CFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\" @GLIB_CFLAGS@
 
-CFLAGS += $(EXTRA_CFLAGS)
+AM_CXXFLAGS = $(JACK_CFLAGS) -DADDON_DIR=\"$(ADDON_DIR)\" @GLIB_CFLAGS@
 
 jackd_SOURCES = jackd.c engine.c
-jackd_LDFLAGS = -L. -ljack -lltdl -lpthread
+jackd_LDFLAGS = -L. -ljack -lltdl -lpthread $(GLIB_LIBS)
 
 jack_simple_client_SOURCES = simple_client.c
 jack_simple_client_LDFLAGS = -L. -ljack -lltdl -lpthread
@@ -29,10 +29,11 @@ jack_fltk_client_LDFLAGS = -L. -L/usr/X11R6/lib -lfltk -lX11 -lXext -ljack -lltd
 lib_LTLIBRARIES    = libjack.la jack_alsa.la
 
 libjack_la_SOURCES = client.c pool.c driver.c
+libjack_la_LDFLAGS = $(GLIB_LIBS)
 
 jack_alsa_la_LDFLAGS = -module
 jack_alsa_la_SOURCES = alsa_driver.c hammerfall.c generic_hw.c memops.c 
-jack_alsa_la_LIBADD = -lasound
+jack_alsa_la_LIBADD = -lasound $(GLIB_LIBS)
 
 EXTRA_DIST = jack
 
diff --git a/TODO b/TODO
index 9cc9801..89e8068 100644
--- a/TODO
+++ b/TODO
@@ -16,5 +16,7 @@ TO THINK ABOUT:
 multiple port buffer shm segments (i.e. dynamically
          increase the total number of ports in the system)
 
-
-
+wingo (apwingo@eos.ncsu.edu) adds:
+ - remove glib dependency from api. using it internally is one thing,
+   but the return value of one function (list_ports()) should not
+   introduce this dependency.
diff --git a/autogen.sh b/autogen.sh
index f763969..5c47242 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,26 @@
 #!/bin/sh
 
-libtoolize --force && aclocal $ACLOCAL_FLAGS && automake --add-missing --foreign && autoconf
+libtoolize --force || {
+    echo "libtool failed, exiting..."
+    exit 1
+}
+
+aclocal $ACLOCAL_FLAGS || {
+    echo "aclocal \$ACLOCAL_FLAGS where \$ACLOCAL_FLAGS= failed, exiting..."
+    exit 1
+}
+
+automake --add-missing --foreign || {
+    echo "automake --add-missing --foreign failed, exiting..."
+    exit 1
+}
+
+autoconf || {
+    echo "autoconf failed, exiting..."
+    exit 1
+}
+
+echo "now run ./configure."
 
 exit 0
 
diff --git a/configure.in b/configure.in
index ec4375d..d5f4a51 100644
--- a/configure.in
+++ b/configure.in
@@ -25,16 +25,14 @@ AM_INIT_AUTOMAKE(jack,${JACK_VERSION})
 
 AM_PATH_GLIB(1.0.0,,[AC_MSG_ERROR([*** JACK requires glib, but it doesn't appear to be installed])])
 
-CFLAGS="-g -Wall -D_REENTRANT"
-OPT_CFLAGS="-D_REENTRANT -O6 -Wall -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
+JACK_CFLAGS="-g -Wall -D_REENTRANT"
+JACK_OPT_CFLAGS="-D_REENTRANT -O6 -Wall -fomit-frame-pointer -ffast-math -fstrength-reduce -funroll-loops -fmove-all-movables"
 
 AC_ARG_ENABLE(optimize,
      [  --enable-optimize       ask the compiler for its best optimizations.],
-     [ if test "x$enable_optimize" != "xno" ; then CFLAGS="$OPT_CFLAGS" ; fi ])
+     [ if test "x$enable_optimize" != "xno" ; then JACK_CFLAGS="$JACK_OPT_CFLAGS" ; fi ])
 
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
-CXXFLAGS="$CFLAGS"
-LIBS="$LIBS $GLIB_LIBS"
+AC_SUBST(JACK_CFLAGS)
 
 XTRA=""
 
diff --git a/doc/.cvsignore b/doc/.cvsignore
new file mode 100644
index 0000000..3432c3f
--- /dev/null
+++ b/doc/.cvsignore
@@ -0,0 +1,2 @@
+*.html
+
diff --git a/jack/.cvsignore b/jack/.cvsignore
new file mode 100644
index 0000000..22a4e72
--- /dev/null
+++ b/jack/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+