From f7064a97070022d977e1b0984505fca75b041598 Mon Sep 17 00:00:00 2001 From: Quantum Date: Fri, 20 Dec 2019 20:12:58 -0500 Subject: [PATCH] Use AM_CONDITIONAL to do conditional compilation --- Makefile.am | 25 ++++++++++++++++++++++--- configure.ac | 11 +++++++++++ input/alsa.c | 4 ---- input/portaudio.c | 4 ---- input/pulse.c | 4 ---- input/shmem.c | 4 ---- input/sndio.c | 4 ---- output/terminal_bcircle.c | 4 ---- output/terminal_ncurses.c | 4 ---- 9 files changed, 33 insertions(+), 31 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4f0fb44..fa82769 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,14 +9,33 @@ ACLOCAL_AMFLAGS = -I m4 M_CPPFLAGS = -DSYSTEM_LIBINIPARSER=@SYSTEM_LIBINIPARSER@ bin_PROGRAMS = cava -cava_SOURCES = cava.c config.c input/common.c input/alsa.c input/fifo.c input/portaudio.c \ - input/pulse.c input/sndio.c input/shmem.c output/terminal_bcircle.c \ - output/terminal_ncurses.c output/terminal_noncurses.c output/raw.c +cava_SOURCES = cava.c config.c input/common.c input/fifo.c \ + output/terminal_noncurses.c output/raw.c cava_LDFLAGS = -L/usr/local/lib -Wl,-rpath /usr/local/lib cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized +if ALSA + cava_SOURCES += input/alsa.c +endif + +if PORTAUDIO + cava_SOURCES += input/portaudio.c +endif + +if PULSE + cava_SOURCES += input/pulse.c +endif + +if SNDIO + cava_SOURCES += input/sndio.c +endif + +if NCURSES + cava_SOURCES += output/terminal_bcircle.c output/terminal_ncurses.c +endif + cava_font_dir = @FONT_DIR@ cava_font__DATA = cava.psf diff --git a/configure.ac b/configure.ac index 9169aa6..0239ca6 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,8 @@ AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) AC_MSG_NOTICE([WARNING: No alsa dev files found building without alsa support]) fi + AM_CONDITIONAL([ALSA], [test x$have_alsa = xyes]) + dnl ###################### dnl checking for pulse dev @@ -79,6 +81,8 @@ AC_CHECK_LIB(pulse-simple, pa_simple_new, have_pulse=yes, have_pulse=no) AC_MSG_NOTICE([WARNING: No pusleaudio dev files found building without pulseaudio support]) fi + AM_CONDITIONAL([PULSE], [test x$have_pulse = xyes]) + dnl ###################### dnl checking for portaudio dev dnl ###################### @@ -92,6 +96,8 @@ AC_CHECK_LIB(portaudio, Pa_Initialize, have_portaudio=yes, have_portaudio=no) AC_MSG_NOTICE([WARNING: No portaudio dev files found building without portaudio support]) fi + AM_CONDITIONAL([PORTAUDIO], [test x$have_portaudio = xyes]) + dnl ###################### dnl checking for sndio dev dnl ###################### @@ -105,6 +111,8 @@ AC_CHECK_LIB(sndio, sio_open, have_sndio=yes, have_sndio=no) AC_MSG_NOTICE([WARNING: No sndio dev files found building without sndio support]) fi + AM_CONDITIONAL([SNDIO], [test x$have_sndio = xyes]) + dnl ###################### dnl checking for math lib dnl ###################### @@ -151,8 +159,10 @@ AC_CHECK_LIB($curses_lib, initscr, LIBS="$LIBS `$CURSES_CONFIG --libs`" fi AC_CHECK_HEADERS([curses.h], , AC_MSG_ERROR([missing curses.h header])) + AM_CONDITIONAL([NCURSES], [true]) , AC_MSG_NOTICE([WARNING: building without ncursesw support ncursesw is recomended!]) + AM_CONDITIONAL([NCURSES], [false]) ) @@ -199,6 +209,7 @@ AS_IF([test "x$enable_shmem" = "xyes"], [ CPPFLAGS="$CPPFLAGS -DSHMEM" LIBS="$LIBS -lrt" ]) +AM_CONDITIONAL([SHMEM], [test "x$enable_shmem" = xyes]) diff --git a/input/alsa.c b/input/alsa.c index 4a5ba63..8ddce75 100644 --- a/input/alsa.c +++ b/input/alsa.c @@ -1,6 +1,4 @@ // input: ALSA -#ifdef ALSA - #include "input/alsa.h" #include "debug.h" #include "input/common.h" @@ -164,5 +162,3 @@ void *input_alsa(void *data) { snd_pcm_close(handle); return NULL; } - -#endif // ALSA diff --git a/input/portaudio.c b/input/portaudio.c index 738663d..1d51c9a 100644 --- a/input/portaudio.c +++ b/input/portaudio.c @@ -1,5 +1,3 @@ -#ifdef PORTAUDIO - #include "input/portaudio.h" #include "input/common.h" @@ -207,5 +205,3 @@ void *input_portaudio(void *audiodata) { portaudio_simple_free(data); return 0; } - -#endif // PORTAUDIO diff --git a/input/pulse.c b/input/pulse.c index 0decdd1..8229752 100644 --- a/input/pulse.c +++ b/input/pulse.c @@ -1,5 +1,3 @@ -#ifdef PULSE - #include "input/pulse.h" #include "input/common.h" @@ -147,5 +145,3 @@ void *input_pulse(void *data) { pa_simple_free(s); return 0; } - -#endif // PULSE diff --git a/input/shmem.c b/input/shmem.c index 8c30999..c218968 100644 --- a/input/shmem.c +++ b/input/shmem.c @@ -1,5 +1,3 @@ -#ifdef SHMEM - #include "input/shmem.h" #include "input/common.h" @@ -90,5 +88,3 @@ void *input_shmem(void *data) { } return 0; } - -#endif // SHMEM diff --git a/input/sndio.c b/input/sndio.c index f0c89ba..ec5922e 100644 --- a/input/sndio.c +++ b/input/sndio.c @@ -1,5 +1,3 @@ -#ifdef SNDIO - #include "input/sndio.h" #include @@ -66,5 +64,3 @@ void *input_sndio(void *data) { return 0; } - -#endif // SNDIO \ No newline at end of file diff --git a/output/terminal_bcircle.c b/output/terminal_bcircle.c index 302a9e6..90363cb 100644 --- a/output/terminal_bcircle.c +++ b/output/terminal_bcircle.c @@ -1,5 +1,3 @@ -#ifdef NCURSES - #include "output/terminal_bcircle.h" #include @@ -85,5 +83,3 @@ void cleanup_terminal_bcircle(void) { endwin(); system("clear"); } - -#endif // NCURSES diff --git a/output/terminal_ncurses.c b/output/terminal_ncurses.c index d20befe..6a2260c 100644 --- a/output/terminal_ncurses.c +++ b/output/terminal_ncurses.c @@ -1,5 +1,3 @@ -#ifdef NCURSES - #include "output/terminal_ncurses.h" #include @@ -276,5 +274,3 @@ void cleanup_terminal_ncurses(void) { system("clear"); system("reset"); } - -#endif // NCURSES