use AM_CFLAGS and AM_LDFLAGS for the recent automake.

diff --git a/src/Makefile.am b/src/Makefile.am
index da73e6c..624caa2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@ libasound_la_LIBADD = control/libcontrol.la \
                      compat/libcompat.la alisp/libalisp.la -lm -ldl -lpthread
 
 libasound_la_LDFLAGS = -version-info $(COMPATNUM)
-LDFLAGS = $(VSYMS)
+AM_LDFLAGS = $(VSYMS)
 
 control/libcontrol.la:
        $(MAKE) -C control libcontrol.la

diff --git a/src/pcm/scopes/Makefile.am b/src/pcm/scopes/Makefile.am
index 808fca2..b707946 100644 (file)
--- a/src/pcm/scopes/Makefile.am
+++ b/src/pcm/scopes/Makefile.am
@@ -1,5 +1,5 @@
 
-CFLAGS = -g -O2 -W -Wall
+AM_CFLAGS = -g -O2 -W -Wall
 
 pkglib_LTLIBRARIES = liblevel.la
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 46a8297..d6cfb94 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,6 +16,6 @@ queue_timer_LDADD=../src/libasound.la
 code_CFLAGS=-Wall -pipe -g -O2
 
 INCLUDES=-I$(top_srcdir)/include
-CFLAGS=-static -Wall -pipe -g
+AM_CFLAGS=-static -Wall -pipe -g
 
 EXTRA_DIST=seq-decoder.c seq-sender.c midifile.h midifile.c midifile.3