autoconf & automake clean up.

diff --git a/ac3dec/Makefile.am b/ac3dec/Makefile.am
index db62bcd529e3d5db20529f411116511dcb2e1e4f..f175c3117723cc1e1adbee402ab9e4b8f31e1c5e 100644 (file)
--- a/ac3dec/Makefile.am
+++ b/ac3dec/Makefile.am
@@ -1,8 +1,6 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -Werror -O3 -g
-
 bin_PROGRAMS = ac3dec 
 
 ac3dec_LDADD= -L./libac3 -lac3

diff --git a/ac3dec/test/Makefile.am b/ac3dec/test/Makefile.am
index 4f3d0a691fa61b8b10f6a59eed8c55b9d79e3616..ffed19e9b6cb0feb4033b47ee4a4f9fe1ae85dee 100644 (file)
--- a/ac3dec/test/Makefile.am
+++ b/ac3dec/test/Makefile.am
@@ -23,12 +23,12 @@ imdct_test_LDADD = ../libac3/imdct.o -lm
 #crc_timing_LDADD = ../crc.o -lm
 
 check:
-       #rm -f bitstream_test.out
-       #./bitstream_test > bitstream_test.out
-       #diff bitstream_test.out bitstream_test.out.ref
-       #rm -f imdct_test.out
-       #./imdct_test > imdct_test.out
-       #diff imdct_test.out imdct_test.out.ref
+#      rm -f bitstream_test.out
+#      ./bitstream_test > bitstream_test.out
+#      diff bitstream_test.out bitstream_test.out.ref
+#      rm -f imdct_test.out
+#      ./imdct_test > imdct_test.out
+#      diff imdct_test.out imdct_test.out.ref
        rm -f dither_test.out
        ./dither_test > dither_test.out
        diff dither_test.out dither_test.out.ref

diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am
index 21c4bdeec0d1a7b76ca125dc6f81179ea312a751..28b9d04e1c88f43fb74a0b9f5f309d8472570968 100644 (file)
--- a/envy24control/Makefile.am
+++ b/envy24control/Makefile.am
@@ -1,13 +1,11 @@
+AM_CFLAGS = @GTK_CFLAGS@
 bin_PROGRAMS = envy24control
 man_MANS = envy24control.1
 envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c \
                         mixer.c patchbay.c hardware.c driverevents.c volume.c
-envy24control_LDFLAGS = $(GTK_LIBS)
+envy24control_LDFLAGS = @GTK_LIBS@
 EXTRA_DIST = cvscompile envy24control.1 depcomp
 
-clean:
-       rm -rf .deps *~
-
 alsa-dist: distdir
        @rm -rf ../distdir/envy24control
        @mkdir -p ../distdir/envy24control

diff --git a/envy24control/configure.in b/envy24control/configure.in
index 857f5f6a77831e6d2c3a3bb9d548fd85f4b5657b..79eda1b05bbfb49f3b87454156d757b26b64c6c8 100644 (file)
--- a/envy24control/configure.in
+++ b/envy24control/configure.in
@@ -5,7 +5,5 @@ AC_PROG_INSTALL
 AC_HEADER_STDC
 AM_PATH_GTK(1.0.1)
 AM_PATH_ALSA(0.9.0)
-CFLAGS="$CFLAGS $GTK_CFLAGS $ALSA_FLAGS"
-LDFLAGS="$LDFLAGS $GTK_LIBS $ALSA_LIBS"
 
 AC_OUTPUT(Makefile)

diff --git a/sb16_csp/Makefile.am b/sb16_csp/Makefile.am
index bb85783450c84828117ef7499bfd93a232f1f4e6..503b328df5581a683dd3d3745c7c1fe9f1555c51 100644 (file)
--- a/sb16_csp/Makefile.am
+++ b/sb16_csp/Makefile.am
@@ -1,8 +1,6 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -g
-
 bin_PROGRAMS = cspctl
 man_MANS = cspctl.1
 

diff --git a/sb16_csp/configure.in b/sb16_csp/configure.in
index b4cdb7ba239fddf2ef296ff60faaddf6218659d6..5bad1551642c57b28f1afc57b1b4fb65220ca1f9 100644 (file)
--- a/sb16_csp/configure.in
+++ b/sb16_csp/configure.in
@@ -46,7 +46,7 @@ else
   fi
 fi
 
-CFLAGS="$CFLAGS $ALSA_FLAGS"
+CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 
 AC_OUTPUT(Makefile)

diff --git a/seq/sbiload/Makefile.am b/seq/sbiload/Makefile.am
index 0669ee39d0c83c7db4f90c88f99fe54ec5df3f12..e9824266a4939748637ff78035ad77dcad250244 100644 (file)
--- a/seq/sbiload/Makefile.am
+++ b/seq/sbiload/Makefile.am
@@ -1,8 +1,6 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -g
-
 bin_PROGRAMS = sbiload
 #man_MANS = sbiload.1
 

diff --git a/seq/sbiload/configure.in b/seq/sbiload/configure.in
index 25b755f626c0c2d8529beff40339210427eb522d..54d1a6480de5df8fb9b8beded55a9e290e3d1617 100644 (file)
--- a/seq/sbiload/configure.in
+++ b/seq/sbiload/configure.in
@@ -46,7 +46,7 @@ else
   fi
 fi
 
-CFLAGS="$CFLAGS $ALSA_FLAGS"
+CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 
 AC_OUTPUT(Makefile)

diff --git a/sscape_ctl/Makefile.am b/sscape_ctl/Makefile.am
index d8b699fbe38d09a5cc11a82b801a241cdf11229b..cd85e49a0bd22f44bd0857f0b4227f14ec6ced64 100644 (file)
--- a/sscape_ctl/Makefile.am
+++ b/sscape_ctl/Makefile.am
@@ -1,8 +1,6 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = -Wall -g
-
 bin_PROGRAMS = sscape_ctl
 
 sscape_ctl_SOURCES = sscape_ctl.c

diff --git a/sscape_ctl/configure.in b/sscape_ctl/configure.in
index c28b8535472d0870b427db6920d92183237080e3..4a3a9210572eb2dac034be6a9e980bf75d789400 100644 (file)
--- a/sscape_ctl/configure.in
+++ b/sscape_ctl/configure.in
@@ -46,7 +46,7 @@ else
   fi
 fi
 
-CFLAGS="$CFLAGS $ALSA_FLAGS"
+CFLAGS="$CFLAGS $ALSA_CFLAGS"
 LDFLAGS="$LDFLAGS $ALSA_LIBS"
 
 AC_OUTPUT(Makefile)

diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am
index 3a3284d874f130c52176c8e901132e1fa54dde9d..5a8df57ff00574adf090b7e9f67a3aaab1a06389 100644 (file)
--- a/vxloader/Makefile.am
+++ b/vxloader/Makefile.am
@@ -1,7 +1,7 @@
 # # Process this file with automake to produce Makefile.in.
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-CFLAGS = @CFLAGS@ -DDATAPATH=\"$(datadir)/alsa/firmware\"
+AM_CFLAGS = -DDATAPATH=\"$(datadir)/alsa/firmware\"
 
 SUBDIRS = firmware