- fixed configure to reflect the ALSA configure options.

- fixed "make clean".

diff --git a/alsa/Makefile.am b/alsa/Makefile.am
index 99ee20721f0e5c49f17d62e3405db949ce33d55a..c46f317573da235e48132ac4924df3f4e514ff58 100644 (file)
--- a/alsa/Makefile.am
+++ b/alsa/Makefile.am
@@ -8,10 +8,4 @@ noinst_HEADERS = alsa-oss-emul.h
 libaoss_la_SOURCES = alsa-oss.c
 libaoss_la_LIBADD = -ldl -lalsatoss
 
-libalsatoss_la_CFLAGS = @ALSA_CFLAGS@
 libalsatoss_la_SOURCES = pcm.c mixer.c
-libalsatoss_la_LDFLAGS = @ALSA_LDFLAGS@
-libalsatoss_la_LIBADD = @ALSA_LIBS@
-
-clean:
-       rm -f aoss

diff --git a/configure.in b/configure.in
index 7bb3a1bdf5baddebe00fc058eccb24622f862c31..778e48cf30353b3000da5776ed118e4c015050af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -22,19 +22,7 @@ fi
 AM_CONDITIONAL(WITH_AOSS, test x$with_aoss = xyes)
 
 if test "$with_aoss" = "yes"; then
-  OLD_CFLAGS=$CFLAGS ; CFLAGS=""
-  OLD_LDFLAGS=$LDFLAGS ; LDFLAGS=""
-  OLD_LIBS=$LIBS ; LIBS=""
   AM_PATH_ALSA(0.9.0)
-  ALSA_CFLAGS=$CFLAGS
-  ALSA_LDFLAGS=$LDFLAGS
-  ALSA_LIBS=$LIBS
-  AC_SUBST(ALSA_CFLAGS)
-  AC_SUBST(ALSA_LDFLAGS)
-  AC_SUBST(ALSA_LIBS)
-  CFLAGS=$OLD_CFLAGS
-  LDFLAGS=$OLD_LDFLAGS
-  LIBS=$OLD_LIBS
 fi
 
 AC_OUTPUT(Makefile alsa/Makefile alsa/aoss oss-redir/Makefile test/Makefile \