ref: 8d7a8fdb470e7e5a07393bf876073f35cdeca312
parent: 16da5c4589e8344f5b703a65699d1601fd8b7b69
author: rrt <rrt>
date: Mon Dec 18 15:00:04 EST 2006
Tweak cosmetically, and remove some redundancy.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,21 +27,21 @@
st_i.h stio.c util.c xmalloc.c xmalloc.h getopt.c getopt1.c getopt.h
AM_CFLAGS = $(LUA_INCLUDES)
-AM_LDFLAGS = $(LUA_LIBS)
+AM_LDFLAGS = $(LUA_LIBS) @SAMPLERATE_LIBS@
sox_SOURCES = sox.c
sox_LDADD = libst.a libgsm/libgsm.a
-sox_LDFLAGS = @SAMPLERATE_LIBS@
all: sox soxmix play rec
+libgsm/libgsm.a:
+ $(MAKE) -C libgsm
+
soxmix: sox
- $(RM) soxmix
- $(LN_S) sox soxmix
+ $(RM) soxmix && $(LN_S) sox soxmix
rec: play
- $(RM) play
- $(LN_S) play rec
+ $(RM) play && $(LN_S) play rec
install-exec-hook:
cd $(DESTDIR)$(bindir) && \
@@ -49,7 +49,4 @@
$(RM) rec && $(LN_S) play rec
distclean-local:
- $(RM) *.raw *.sf libst-config stconfig.h ststdint.h
-
-libgsm/libgsm.a:
- $(MAKE) -C libgsm
+ $(RM) *.raw *.sf ststdint.h
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -237,10 +237,9 @@
st_i.h stio.c util.c xmalloc.c xmalloc.h getopt.c getopt1.c getopt.h
AM_CFLAGS = $(LUA_INCLUDES)
-AM_LDFLAGS = $(LUA_LIBS)
+AM_LDFLAGS = $(LUA_LIBS) @SAMPLERATE_LIBS@
sox_SOURCES = sox.c
sox_LDADD = libst.a libgsm/libgsm.a
-sox_LDFLAGS = @SAMPLERATE_LIBS@
all: stconfig.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -795,13 +794,14 @@
all: sox soxmix play rec
+libgsm/libgsm.a:
+ $(MAKE) -C libgsm
+
soxmix: sox
- $(RM) soxmix
- $(LN_S) sox soxmix
+ $(RM) soxmix && $(LN_S) sox soxmix
rec: play
- $(RM) play
- $(LN_S) play rec
+ $(RM) play && $(LN_S) play rec
install-exec-hook:
cd $(DESTDIR)$(bindir) && \
@@ -809,10 +809,7 @@
$(RM) rec && $(LN_S) play rec
distclean-local:
- $(RM) *.raw *.sf libst-config stconfig.h ststdint.h
-
-libgsm/libgsm.a:
- $(MAKE) -C libgsm
+ $(RM) *.raw *.sf ststdint.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: