[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/8] clean up Makefile for audio directory
From: |
William Hubbs |
Subject: |
[PATCH 2/8] clean up Makefile for audio directory |
Date: |
Sun, 19 Sep 2010 00:50:19 -0500 |
- remove definition of localedir since it is defined in configure.ac.
- remove use of localedir since it is not referred to in any sources in
this directory
- convert AM_CFLAGS to libsdaudio_la_CPPFLAGS
- move library references to libsdaudio_la_LIBADD
- convert autoconf substitutions to make variables
- remove unnecessary EXTRA_DIST line
---
src/audio/Makefile.am | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am
index 0d67162..d42a43a 100644
--- a/src/audio/Makefile.am
+++ b/src/audio/Makefile.am
@@ -1,13 +1,13 @@
+## Process this file with automake to produce Makefile.in
-localedir = $(datadir)/locale
inc_local = "-I$(top_srcdir)/include/"
include_HEADERS = spd_audio_plugin.h
-am_cflags = -DLOCALEDIR=\"$(localedir)\" $(inc_local)
-
spdlib_LTLIBRARIES = libsdaudio.la
-libsdaudio_la_CPPFLAGS = $(GLIB_CFLAGS)
+libsdaudio_la_CPPFLAGS = $(inc_local) $(GLIB_CFLAGS)
+libsdaudio_la_LDFLAGS = -version-info
$(LIB_SDAUDIO_CURRENT):$(LIB_SDAUDIO_REVISION):$(LIB_SDAUDIO_AGE)
+libsdaudio_la_LIBADD = $(GLIB_LIBS) -lpthread $(SPD_AUDIO_LIBS)
libsdaudio_la_SOURCES = spd_audio.c spd_audio.h spd_audio_plugin.h
static_plugins.c
if nas_support
@@ -29,9 +29,3 @@ endif
if oss_support
libsdaudio_la_SOURCES += oss.c
endif
-
-EXTRA_DIST = alsa.c libao.c oss.c nas.c pulse.c static_plugins.c.in
-
-AM_CFLAGS = -DLOCALEDIR=\"$(localedir)\" $(inc_local)
-libsdaudio_la_LDFLAGS = -version-info
@LIB_SDAUDIO_CURRENT@:@LIB_SDAUDIO_REVISION@:@LIB_SDAUDIO_AGE@ -lpthread
$(SPD_AUDIO_LIBS)
-libsdaudio_la_LIBADD = $(GLIB_LIBS)
--
1.7.2.2
- [PATCH 1/8] clean up Makefile for c api, William Hubbs, 2010/09/19
- [PATCH 2/8] clean up Makefile for audio directory,
William Hubbs <=
- [PATCH 3/8] clean up the Makefile for spd-say, William Hubbs, 2010/09/19
- [PATCH 4/8] clean up the Makefile for spdsend, William Hubbs, 2010/09/19
- [PATCH 5/8] clean up the Makefile for the common source directory, William Hubbs, 2010/09/19
- [PATCH 6/8] clean up the Makefile for the modules directory, William Hubbs, 2010/09/19
- [PATCH 7/8] clean up Makefile for server directory, William Hubbs, 2010/09/19
- [PATCH 8/8] clean up Makefile for tests directory, William Hubbs, 2010/09/19
- [PATCH 1/8] clean up Makefile for c api, Andrei Kholodnyi, 2010/09/19