diff --git a/ac3dec/Makefile.am b/ac3dec/Makefile.am
index db62bcd..f175c31 100644
--- 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 4f3d0a6..ffed19e 100644
--- 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 21c4bde..28b9d04 100644
--- 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 857f5f6..79eda1b 100644
--- 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 bb85783..503b328 100644
--- 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 b4cdb7b..5bad155 100644
--- 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 0669ee3..e982426 100644
--- 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 25b755f..54d1a64 100644
--- 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 d8b699f..cd85e49 100644
--- 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 c28b853..4a3a921 100644
--- 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 3a3284d..5a8df57 100644
--- 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