From e4da25863f437b76530d1cfd9b404e951890d8bc Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 17 May 2005 16:10:38 +0000 Subject: [PATCH] Fix handling of $CFLAGS and $LIBS Removes ALSA_CFLAGS and ALSA_LIBS in configure.in, they are added to CFLAGS and LDADD in src/Makefile.am already. Signed-off-by: Mikael Magnusson --- ld10k1/configure.in | 2 -- ld10k1/src/Makefile.am | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ld10k1/configure.in b/ld10k1/configure.in index 503a47c..697540d 100644 --- a/ld10k1/configure.in +++ b/ld10k1/configure.in @@ -9,8 +9,6 @@ AC_HEADER_STDC AC_DISABLE_STATIC AC_PROG_LIBTOOL AM_PATH_ALSA(1.0.9, [], []) -CFLAGS="$CFLAGS $ALSA_CFLAGS -Wall" -LIBS="$LIBS $ALSA_LIBS" effectsdir='$(pkgdatadir)/effects' AC_SUBST(effectsdir) diff --git a/ld10k1/src/Makefile.am b/ld10k1/src/Makefile.am index 243011c..c1a20dc 100644 --- a/ld10k1/src/Makefile.am +++ b/ld10k1/src/Makefile.am @@ -13,6 +13,8 @@ ld10k1_LDADD = $(ALSA_LIBS) lib_LTLIBRARIES = liblo10k1.la liblo10k1_la_SOURCES = comm.c liblo10k1.c liblo10k1ef.c liblo10k1lf.c #liblo10k1_la_HEADERS = comm.h liblo10k1.h liblo10k1ef.h ld10k1_error.h ld10k1_fnc.h liblo10k1lf.h +liblo10k1_la_CFLAGS = $(ALSA_CFLAGS) +liblo10k1_la_LIBADD = $(ALSA_LIBS) lo10k1_SOURCES = lo10k1.c lo10k1_CFLAGS = $(ALSA_CFLAGS) -DEFFECTSDIR='"$(effectsdir)"' -- 2.47.1