diff options
| author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-10-19 22:12:45 +0200 |
|---|---|---|
| committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2011-10-19 22:12:45 +0200 |
| commit | fbfe926fc482a1e48501310c53c95118255da0bc (patch) | |
| tree | 45a099eeac12ed5e1e72acf9c288b45538221b60 | |
| parent | 0646fca97a7bff15060c86c6acf0a4130cc23111 (diff) | |
| download | pa-sink-ctl-fbfe926fc482a1e48501310c53c95118255da0bc.tar.gz pa-sink-ctl-fbfe926fc482a1e48501310c53c95118255da0bc.tar.bz2 pa-sink-ctl-fbfe926fc482a1e48501310c53c95118255da0bc.zip | |
Makefile.am: Use variables rather then substitutions
Also set preprocessor flags in AM_CPPFLAGS
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5c011e2..4d51963 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,6 @@ if test "x$GCC" = "xyes"; then fi AC_SUBST(GCC_CFLAGS) - AC_SUBST(CURSES_LIBS) AC_CHECK_HEADERS([ncurses.h sys/ioctl.h unistd.h signal.h]) diff --git a/src/Makefile.am b/src/Makefile.am index c73f0d7..78e47d7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,8 @@ bin_PROGRAMS = pa-sink-ctl pa_sink_ctl_SOURCES = interface.c pa-sink-ctl.c sink.c sink_input.c g_unix_signal.c g_curses_input.c -AM_CFLAGS = $(GCC_CFLAGS) @PULSE_CFLAGS@ @PULSE_MAINLOOP_CFLAGS@ @GLIB_CFLAGS@ -pa_sink_ctl_LDADD = @GLIB_LIBS@ @PULSE_LIBS@ @PULSE_MAINLOOP_LIBS@ @CURSES_LIBS@ +AM_CFLAGS = $(GCC_CFLAGS) +AM_CPPFLAGS = $(PULSE_CFLAGS) $(PULSE_MAINLOOP_CFLAGS) $(GLIB_CFLAGS) +pa_sink_ctl_LDADD = $(GLIB_LIBS) $(PULSE_LIBS) $(PULSE_MAINLOOP_LIBS) $(CURSES_LIBS) noinst_HEADERS = interface.h pa-sink-ctl.h sink.h sink_input.h g_unix_signal.h g_curses_input.h |