summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-22 12:15:56 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-22 12:16:27 +0100
commit0b7044418c81b751d9f059fbfcade470a7d5c882 (patch)
treef7234787dad9f0bf552bc1c023f1cf2e913da466
parentadbe0312ac90c46b4c841f6eabfda22ff672a4ad (diff)
Clean up Makefile.am
Avoid unnecessary substitution and use simply SUBDIRS += ... Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--Makefile.am17
1 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 668b1ef..69cfe0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,26 @@
+SUBDIRS = oss mix usb_stream arcam-av doc
if HAVE_JACK
-JACKDIR = jack
+SUBDIRS += jack
endif
if HAVE_PULSE
-PULSEDIR = pulse
+SUBDIRS += pulse
endif
if HAVE_SAMPLERATE
-SAMPLERATEDIR = rate
+SUBDIRS += rate
endif
if HAVE_AVCODEC
-A52DIR = a52
-LAVCRATEDIR = rate-lavc
+SUBDIRS += a52 rate-lavc
endif
if HAVE_MAEMO_PLUGIN
-MAEMODIR = maemo
+SUBDIRS += maemo
endif
if HAVE_PPH
-PPHDIR = pph
+SUBDIRS += pph
endif
if HAVE_SPEEXDSP
-SPEEXDIR = speex
+SUBDIRS += speex
endif
-SUBDIRS = oss mix $(PPHDIR) $(JACKDIR) $(PULSEDIR) $(SAMPLERATEDIR) $(A52DIR) $(LAVCRATEDIR) $(MAEMODIR) $(SPEEXDIR) usb_stream arcam-av doc
EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4