From 0eec648896debbc8aa5411868324365c8f15ba84 Mon Sep 17 00:00:00 2001 From: ben Date: Fri, 23 Jul 2010 01:54:16 +0200 Subject: fit autotools config to actual changes and improve --- .gitignore | 5 ++--- configure.ac | 12 +----------- src/Makefile.am | 4 ++-- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 8bba070..d1a3a13 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ .depend # executable -pa_sink_ctl +pa-sink-ctl # objects *.o @@ -24,8 +24,7 @@ config.sub configure # The include directory artifacts -config.h -config.h.in +config.h* stamp-h1 # Various scripts used for libtool and the like diff --git a/configure.ac b/configure.ac index 2598614..0745378 100644 --- a/configure.ac +++ b/configure.ac @@ -18,17 +18,7 @@ PKG_CHECK_MODULES(PULSE_MAINLOOP, [libpulse-mainloop-glib], [], [echo "Error: yo PKG_CHECK_MODULES(GLIB, [glib-2.0], [], [echo "Error: you need glib!"; exit1]) AC_SUBST(CURSES_LIBS) -AC_SUBST(PULSE_CFLAGS) -AC_SUBST(PULSE_LIBS) -# Checks for header files. -AC_CHECK_HEADERS([stdio.h stdlib.h stdint.h string.h ncurses.h glib.h pulse/pulseaudio.h pulse/glib-mainloop.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_UINT32_T - -# Checks for library functions. -AC_FUNC_REALLOC -AC_CHECK_FUNCS([strdup]) +AC_CHECK_HEADERS([ncurses.h]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 1d800a5..e23f3d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ -bin_PROGRAMS = pa_sink_ctl +bin_PROGRAMS = pa-sink-ctl pa_sink_ctl_SOURCES = interface.c pa-sink-ctl.c sink.c sink_input.c AM_CFLAGS = -std=c99 -pedantic -Wall -Werror @PULSE_CFLAGS@ @PULSE_MAINLOOP_CFLAGS@ @GLIB_CFLAGS@ -pa_sink_ctl_LDADD = @PULSE_LIBS@ @PULSE_MAINLOOP_LIBS@ @GLIB_LIBS@ @CURSES_LIBS@ +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 -- cgit