shithub: sox

Download patch

ref: 211ad7c132ef024289affc4d21f625ddb3d2e8ce
parent: 5e0e521494ba5c31589875497a1daa868ae19c92
author: cbagwell <cbagwell>
date: Wed Sep 1 22:41:07 EDT 2004

Moving makefile around.

--- a/Makefile.dos
+++ /dev/null
@@ -1,92 +1,0 @@
-# Sound Tools Makefile - builds libst.lib and sox.exe
-#
-#   Short and Sweat makefile - cbagwell@sprynet.com 9/28/98
-#   With a little editing this makefile should compile under both
-#   pre and post Borland 3.0.
-#
-#   Also some support for MS VC based on info from Mark Morgan Lloyd
-#   <markMLl.in@telemetry.co.uk> 1/24/99
-#
-#   NOTE: This Makefile does not support compiling GSM currently.
-#
-# Need object files to know what libst.lib depends on.  All .c files
-# are compiled from default rules of make.
-
-FOBJ	= 8svx.obj adpcm.obj aiff.obj alsa.obj au.obj auto.obj \
-          avr.obj cdr.obj cvsd.obj dat.obj g711.obj g721.obj g723_16.obj \
-	  g723_24.obj g723_40.obj g72x.obj gsm.obj \
-	  hcom.obj ima_rw.obj maud.obj mp3.obj nulfile.obj oss.obj prc.obj \
-	  raw.obj sf.obj smp.obj sndrtool.obj sphere.obj sunaudio.obj \
-	  tx16w.obj voc.obj vorbis.obj vox.obj wav.obj wve.obj
-
-EOBJ	= avg.obj band.obj bandpass.obj breject.obj btrworth.obj chorus.obj \
-	  compand.obj copy.obj dcshift.obj deemphas.obj earwax.o \
-	  echo.obj echos.obj fade.obj filter.obj flanger.obj highp.obj \
-	  highpass.obj lowp.obj lowpass.obj map.obj mask.obj phaser.obj \
-	  pitch.obj pan.obj polyphase.obj rate.obj repeat.obj resample.obj \
-	  reverb.obj reverse.obj silence.obj speed.obj stat.obj \
-	  stretch.obj swap.obj synth.obj trim.obj vibro.obj vol.obj
-
-LIBOBJS   = $(FOBJ) $(EOBJ) handlers.obj misc.obj getopt.obj util.obj
-
-
-# The following defines tell where compiler files are kept, not where
-# things should be installed like Unix usually specifies.  If your using
-# Microsoft Compilers then you don't need these.
-BINDIR  = c:\tc
-LIBDIR  = c:\tc\lib
-INCDIR  = c:\tc\include
-
-#BINDIR	= d:\bc\bin
-#LIBDIR	= d:\bc\lib
-#INCDIR	= d:\bc\include
-
-# Standard Borland options for Huge Memory Mode (more than 64k for both
-# code and data), Word aligned, compile to Objects only, Speed and Jump
-# optimized.
-# -v is for debuging and -N is to add stack corruption detection code.
-# both add unneeded size to code.
-#
-# Pick one of the next two defines for pre/post Borland C 3.0
-CC      = $(BINDIR)\tcc
-#CC      = $(BINDIR)\bcc
-LDD	= $(BINDIR)\tlib
-CFLAGS  = -DDOS -D__STDC__=1 -a -c -mh -G -O -v -N
-LFLAGS  = -v -mh
-
-.c.obj:
-	$(CC) $(CFLAGS) -I$(INCDIR) -L$(LIBDIR) $*.c
-	$(LDD) libst -$* +$*
-
-# MS VC needs the following. /AL uses large memory model.
-#CC	= cl
-#LDD	= lib
-#CFLAGS	= -DDOS -D__STDC__=1 -c -O /AL /Gt8192
-#LFLAGS	= /AL /Gt8192
-
-# When using MS VC, comment out above rule for .c.obj and use this as well
-#.c.obj:
-#       $(CC) $(CFLAGS) $*.c
-#       $(LDD) libst -+$*,,
-
-all: sox.exe soxmix.exe
-
-sox.exe: sox.obj libst.lib
-	$(CC) $(LFLAGS) -L$(LIBDIR) sox.obj libst.lib
-
-soxmix.exe: soxmix.obj libst.lib
-	$(CC) $(LFLAGS) -L$(LIBDIR) soxmix.obj libst.lib
-
-libst.lib: $(LIBOBJS)
-
-sox.obj: sox.c st.h
-	$(CC) $(CFLAGS) -I$(INCDIR) -L$(LIBDIR) $*.c
-
-soxmix.obj: sox.c st.h
-	$(CC) $(CFLAGS) -DSOXMIX -I$(INCDIR) -L$(LIBDIR) sox.c
-
-clean:
-	del *.obj
-	del sox.exe
-	del soxmix.exe
-	del libst.lib
--- a/Makefile.gcc
+++ /dev/null
@@ -1,172 +1,0 @@
-#
-# Sound Tools Makefile
-#
-# 	builds libst.a, sox, soxmix, and play
-#
-# To use this Makefile, first copy stconfig.h.in to stconfig.h and modify
-# that file to reflect your environment.  This will should also be modified
-# to reflect your build environment.
-#   
-
-# These things are site dependant so you may want to change.
-PREFIX	= /usr/local
-bindir  = $(PREFIX)/bin
-libdir	= $(PREFIX)/lib
-mandir  = $(PREFIX)/man
-incdir	= $(PREFIX)/include
-
-SRCDIR	= sox-12.17.3
-
-##############################################################################
-
-FOBJ	= 8svx.o adpcm.o aiff.o alsa.o au.o auto.o avr.o cdr.o cvsd.o dat.o \
-	  g711.o g721.o g723_16.o g723_24.o g723_40.o g72x.o gsm.o hcom.o \
-	  ima_rw.o maud.o mp3.o nulfile.o oss.o prc.o raw.o sf.o smp.o \
-	  sndrtool.o sphere.o sunaudio.o tx16w.o voc.o vorbis.o \
-          vox.o wav.o wve.o
-
-EOBJ    = avg.o band.o bandpass.o breject.o btrworth.o chorus.o compand.o \
-          copy.o dcshift.o deemphas.o earwax.o echo.o echos.o fade.o \
-	  filter.o flanger.o highp.o highpass.o lowp.o lowpass.o map.o \
-	  mask.o pan.o phaser.o pitch.o polyphas.o rate.o repeat.o \
-	  resample.o reverb.o reverse.o silence.o speed.o \
-	  stat.o stretch.o swap.o synth.o trim.o vibro.o vol.o
-
-SOUNDLIB = libst.a
-LIBOBJS = $(FOBJ) $(EOBJ) handlers.o misc.o util.o getopt.o
-
-##############################################################################
-
-#
-# System dependency parameters
-#   Find anything related to your system and uncomment.
-#
-
-# Default way to delete files.
-RM	    = rm -f
-
-# Default way to provide symbolic links from one file to another
-LN_S	    = ln -s
-
-# Chose the best compiler you got from the following:
-#
-# GCC with all warnings and debug info
-CC		= gcc -g -Wall
-#
-# GCC with no special options
-# CC		= gcc
-#
-# Generic compiler on your system
-# CC		= cc
-#
-# EMX GCC under OS/2 seems to need the following
-# CC		= gcc -Zcrtdll -Zexe
-
-# For optimized compilation, uncomment one of the following that your
-# compiler understands.
-#
-# gcc's all understand this as do lots of standard compilers.  Try this one
-# first.
-O		= -O2
-
-# Uncomment the following lines if your compiling under DOS or Windows.
-# defines .snd to mean a DOS soundtool file (starts with SOUND)
-#
-# DOS_DEFINES	= -DDOS
-# RM		= del /q
-
-##############################################################################
-
-# Library setup
-
-# How should libaries be created.  Most systems can simply use the following.
-AR		= ar r
-
-# How should 'ranlib' be performed. HPUX, Linux, BSD-ish, SunOS, Solaris
-RANLIB		= ranlib
-
-# AT&T System V and GCC on DOS or OS/2 based systems
-# RANLIB	= ar ts
-
-# Some systems don't have a ranlib that you can run.  Use the following
-# for those systems.
-# RANLIB    = true
-
-# Some systems (i.e. MacOsX Server) don't need a separate math library
-MATHLIB = -lm
-# MATHLIB = 
-
-# If your linking Ogg Vorbis support, uncomment the following
-#VORBISLIB = -logg -lvorbis -lvorbisfile -lvorbisenc
-
-# If your linking MP3 support, uncomment the following
-#MP3LIB = -lmad -lmp3lame
-
-##############################################################################
-
-SOX_PRE_LIBS    = -L./gsm
-SOX_POST_LIBS	= -lgsm $(VORBISLIB) $(MP3LIB) $(MATHLIB)
-SOX_INCLUDES    =
-SOX_DEFINES	= -DGSM_SUPPORT $(DOS_DEFINES)
-
-CFLAGS  = $O $(SOX_DEFINES) $(SOX_INCLUDES)
-
-all: sox soxmix
-
-sox: sox.o $(SOUNDLIB) gsm/libgsm.a
-	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) $(SOX_PRE_LIBS) $(SOX_POST_LIBS)
-
-soxmix.o: sox.c
-	$(CC) $(CLAGS) -DSOXMIX -c -o soxmix.o sox.c
-
-soxmix: soxmix.o $(SOUNDLIB) gsm/libgsm.a
-	$(CC) $(CFLAGS) -o soxmix soxmix.o $(SOUNDLIB) $(SOX_PRE_LIBS) $(SOX_POST_LIBS)
-
-play: play.in
-	$(SED) -e 's|@PREFIX@|$(bindir)|g' < $(srcdir)/play.in > play
-
-$(SOUNDLIB): $(LIBOBJS)
-	$(RM) $(SOUNDLIB)
-	$(AR) $(SOUNDLIB) $(LIBOBJS)
-	$(RANLIB) $(SOUNDLIB)
-
-gsm/libgsm.a:
-	cd gsm && $(MAKE)
-
-sox.o:		sox.c st.h
-
-$(LIBOBJS):	st.h st_i.h
-
-man: sox.1 soxexam.1 libst.3
-	nroff -man sox.1 | col -b > sox.txt
-	nroff -man soxexam.1 | col -b > soxexam.txt
-	nroff -man libst.3 | col -b > libst.txt
-
-install: sox soxmix
-	$(INSTALL) -c -m 755 sox $(bindir)
-	$(INSTALL) -c -m 755 sox play $(bindir)
-	$(INSTALL) -c -m 644 sox.1 $(mandir)/man1
-	if [ -f $(mandir)/man1/soxmmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
-	$(LN_S) $(mandir)/man1/sox.1 $(mandir)/man1/soxmix.1
-	$(INSTALL) -c -m 644 soxexam.1 $(mandir)/man1
-
-install-play: play
-	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec ; fi
-	if [ -f $(mandir)/man1/rec.1 ] ; then $(RM) $(mandir)/man1/rec.1 ; fi
-	install -c -m 755 play $(bindir)
-	install -c -m 644 play.1 $(mandir)/man1
-	$(LN_S) $(bindir)/play $(bindir)/rec
-	$(LN_S) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
-
-install-lib: libst.a
-	install -c -m 644 libst.a $(libdir)
-	install -c -m 644 libst.3 $(mandir)/man3
-	install -c -m 644 st.h $(incdir)
-	install -c -m 644 ststdint.h $(incdir)
-
-clean:
-	$(RM) *~ *.o *.raw *.sf core sox soxmix libst.a
-
-tar:	clean
-	$(RM) ../$(SRCDIR).tar
-	cd ..; tar cvf $(SRCDIR).tar $(SRCDIR)
--- /dev/null
+++ b/src/Makefile.dos
@@ -1,0 +1,92 @@
+# Sound Tools Makefile - builds libst.lib and sox.exe
+#
+#   Short and Sweat makefile - cbagwell@sprynet.com 9/28/98
+#   With a little editing this makefile should compile under both
+#   pre and post Borland 3.0.
+#
+#   Also some support for MS VC based on info from Mark Morgan Lloyd
+#   <markMLl.in@telemetry.co.uk> 1/24/99
+#
+#   NOTE: This Makefile does not support compiling GSM currently.
+#
+# Need object files to know what libst.lib depends on.  All .c files
+# are compiled from default rules of make.
+
+FOBJ	= 8svx.obj adpcm.obj aiff.obj alsa.obj au.obj auto.obj \
+          avr.obj cdr.obj cvsd.obj dat.obj g711.obj g721.obj g723_16.obj \
+	  g723_24.obj g723_40.obj g72x.obj gsm.obj \
+	  hcom.obj ima_rw.obj maud.obj mp3.obj nulfile.obj oss.obj prc.obj \
+	  raw.obj sf.obj smp.obj sndrtool.obj sphere.obj sunaudio.obj \
+	  tx16w.obj voc.obj vorbis.obj vox.obj wav.obj wve.obj
+
+EOBJ	= avg.obj band.obj bandpass.obj breject.obj btrworth.obj chorus.obj \
+	  compand.obj copy.obj dcshift.obj deemphas.obj earwax.o \
+	  echo.obj echos.obj fade.obj filter.obj flanger.obj highp.obj \
+	  highpass.obj lowp.obj lowpass.obj map.obj mask.obj phaser.obj \
+	  pitch.obj pan.obj polyphase.obj rate.obj repeat.obj resample.obj \
+	  reverb.obj reverse.obj silence.obj speed.obj stat.obj \
+	  stretch.obj swap.obj synth.obj trim.obj vibro.obj vol.obj
+
+LIBOBJS   = $(FOBJ) $(EOBJ) handlers.obj misc.obj getopt.obj util.obj
+
+
+# The following defines tell where compiler files are kept, not where
+# things should be installed like Unix usually specifies.  If your using
+# Microsoft Compilers then you don't need these.
+BINDIR  = c:\tc
+LIBDIR  = c:\tc\lib
+INCDIR  = c:\tc\include
+
+#BINDIR	= d:\bc\bin
+#LIBDIR	= d:\bc\lib
+#INCDIR	= d:\bc\include
+
+# Standard Borland options for Huge Memory Mode (more than 64k for both
+# code and data), Word aligned, compile to Objects only, Speed and Jump
+# optimized.
+# -v is for debuging and -N is to add stack corruption detection code.
+# both add unneeded size to code.
+#
+# Pick one of the next two defines for pre/post Borland C 3.0
+CC      = $(BINDIR)\tcc
+#CC      = $(BINDIR)\bcc
+LDD	= $(BINDIR)\tlib
+CFLAGS  = -DDOS -D__STDC__=1 -a -c -mh -G -O -v -N
+LFLAGS  = -v -mh
+
+.c.obj:
+	$(CC) $(CFLAGS) -I$(INCDIR) -L$(LIBDIR) $*.c
+	$(LDD) libst -$* +$*
+
+# MS VC needs the following. /AL uses large memory model.
+#CC	= cl
+#LDD	= lib
+#CFLAGS	= -DDOS -D__STDC__=1 -c -O /AL /Gt8192
+#LFLAGS	= /AL /Gt8192
+
+# When using MS VC, comment out above rule for .c.obj and use this as well
+#.c.obj:
+#       $(CC) $(CFLAGS) $*.c
+#       $(LDD) libst -+$*,,
+
+all: sox.exe soxmix.exe
+
+sox.exe: sox.obj libst.lib
+	$(CC) $(LFLAGS) -L$(LIBDIR) sox.obj libst.lib
+
+soxmix.exe: soxmix.obj libst.lib
+	$(CC) $(LFLAGS) -L$(LIBDIR) soxmix.obj libst.lib
+
+libst.lib: $(LIBOBJS)
+
+sox.obj: sox.c st.h
+	$(CC) $(CFLAGS) -I$(INCDIR) -L$(LIBDIR) $*.c
+
+soxmix.obj: sox.c st.h
+	$(CC) $(CFLAGS) -DSOXMIX -I$(INCDIR) -L$(LIBDIR) sox.c
+
+clean:
+	del *.obj
+	del sox.exe
+	del soxmix.exe
+	del libst.lib
--- /dev/null
+++ b/src/Makefile.gcc
@@ -1,0 +1,172 @@
+#
+# Sound Tools Makefile
+#
+# 	builds libst.a, sox, soxmix, and play
+#
+# To use this Makefile, first copy stconfig.h.in to stconfig.h and modify
+# that file to reflect your environment.  This will should also be modified
+# to reflect your build environment.
+#   
+
+# These things are site dependant so you may want to change.
+PREFIX	= /usr/local
+bindir  = $(PREFIX)/bin
+libdir	= $(PREFIX)/lib
+mandir  = $(PREFIX)/man
+incdir	= $(PREFIX)/include
+
+SRCDIR	= sox-12.17.3
+
+##############################################################################
+
+FOBJ	= 8svx.o adpcm.o aiff.o alsa.o au.o auto.o avr.o cdr.o cvsd.o dat.o \
+	  g711.o g721.o g723_16.o g723_24.o g723_40.o g72x.o gsm.o hcom.o \
+	  ima_rw.o maud.o mp3.o nulfile.o oss.o prc.o raw.o sf.o smp.o \
+	  sndrtool.o sphere.o sunaudio.o tx16w.o voc.o vorbis.o \
+          vox.o wav.o wve.o
+
+EOBJ    = avg.o band.o bandpass.o breject.o btrworth.o chorus.o compand.o \
+          copy.o dcshift.o deemphas.o earwax.o echo.o echos.o fade.o \
+	  filter.o flanger.o highp.o highpass.o lowp.o lowpass.o map.o \
+	  mask.o pan.o phaser.o pitch.o polyphas.o rate.o repeat.o \
+	  resample.o reverb.o reverse.o silence.o speed.o \
+	  stat.o stretch.o swap.o synth.o trim.o vibro.o vol.o
+
+SOUNDLIB = libst.a
+LIBOBJS = $(FOBJ) $(EOBJ) handlers.o misc.o util.o getopt.o
+
+##############################################################################
+
+#
+# System dependency parameters
+#   Find anything related to your system and uncomment.
+#
+
+# Default way to delete files.
+RM	    = rm -f
+
+# Default way to provide symbolic links from one file to another
+LN_S	    = ln -s
+
+# Chose the best compiler you got from the following:
+#
+# GCC with all warnings and debug info
+CC		= gcc -g -Wall
+#
+# GCC with no special options
+# CC		= gcc
+#
+# Generic compiler on your system
+# CC		= cc
+#
+# EMX GCC under OS/2 seems to need the following
+# CC		= gcc -Zcrtdll -Zexe
+
+# For optimized compilation, uncomment one of the following that your
+# compiler understands.
+#
+# gcc's all understand this as do lots of standard compilers.  Try this one
+# first.
+O		= -O2
+
+# Uncomment the following lines if your compiling under DOS or Windows.
+# defines .snd to mean a DOS soundtool file (starts with SOUND)
+#
+# DOS_DEFINES	= -DDOS
+# RM		= del /q
+
+##############################################################################
+
+# Library setup
+
+# How should libaries be created.  Most systems can simply use the following.
+AR		= ar r
+
+# How should 'ranlib' be performed. HPUX, Linux, BSD-ish, SunOS, Solaris
+RANLIB		= ranlib
+
+# AT&T System V and GCC on DOS or OS/2 based systems
+# RANLIB	= ar ts
+
+# Some systems don't have a ranlib that you can run.  Use the following
+# for those systems.
+# RANLIB    = true
+
+# Some systems (i.e. MacOsX Server) don't need a separate math library
+MATHLIB = -lm
+# MATHLIB = 
+
+# If your linking Ogg Vorbis support, uncomment the following
+#VORBISLIB = -logg -lvorbis -lvorbisfile -lvorbisenc
+
+# If your linking MP3 support, uncomment the following
+#MP3LIB = -lmad -lmp3lame
+
+##############################################################################
+
+SOX_PRE_LIBS    = -L./gsm
+SOX_POST_LIBS	= -lgsm $(VORBISLIB) $(MP3LIB) $(MATHLIB)
+SOX_INCLUDES    =
+SOX_DEFINES	= -DGSM_SUPPORT $(DOS_DEFINES)
+
+CFLAGS  = $O $(SOX_DEFINES) $(SOX_INCLUDES)
+
+all: sox soxmix
+
+sox: sox.o $(SOUNDLIB) gsm/libgsm.a
+	$(CC) $(CFLAGS) -o sox sox.o $(SOUNDLIB) $(SOX_PRE_LIBS) $(SOX_POST_LIBS)
+
+soxmix.o: sox.c
+	$(CC) $(CLAGS) -DSOXMIX -c -o soxmix.o sox.c
+
+soxmix: soxmix.o $(SOUNDLIB) gsm/libgsm.a
+	$(CC) $(CFLAGS) -o soxmix soxmix.o $(SOUNDLIB) $(SOX_PRE_LIBS) $(SOX_POST_LIBS)
+
+play: play.in
+	$(SED) -e 's|@PREFIX@|$(bindir)|g' < $(srcdir)/play.in > play
+
+$(SOUNDLIB): $(LIBOBJS)
+	$(RM) $(SOUNDLIB)
+	$(AR) $(SOUNDLIB) $(LIBOBJS)
+	$(RANLIB) $(SOUNDLIB)
+
+gsm/libgsm.a:
+	cd gsm && $(MAKE)
+
+sox.o:		sox.c st.h
+
+$(LIBOBJS):	st.h st_i.h
+
+man: sox.1 soxexam.1 libst.3
+	nroff -man sox.1 | col -b > sox.txt
+	nroff -man soxexam.1 | col -b > soxexam.txt
+	nroff -man libst.3 | col -b > libst.txt
+
+install: sox soxmix
+	$(INSTALL) -c -m 755 sox $(bindir)
+	$(INSTALL) -c -m 755 sox play $(bindir)
+	$(INSTALL) -c -m 644 sox.1 $(mandir)/man1
+	if [ -f $(mandir)/man1/soxmmix.1 ] ; then $(RM) $(mandir)/man1/soxmix.1; fi
+	$(LN_S) $(mandir)/man1/sox.1 $(mandir)/man1/soxmix.1
+	$(INSTALL) -c -m 644 soxexam.1 $(mandir)/man1
+
+install-play: play
+	if [ -f $(bindir)/rec ] ; then $(RM) $(bindir)/rec ; fi
+	if [ -f $(mandir)/man1/rec.1 ] ; then $(RM) $(mandir)/man1/rec.1 ; fi
+	install -c -m 755 play $(bindir)
+	install -c -m 644 play.1 $(mandir)/man1
+	$(LN_S) $(bindir)/play $(bindir)/rec
+	$(LN_S) $(mandir)/man1/play.1 $(mandir)/man1/rec.1
+
+install-lib: libst.a
+	install -c -m 644 libst.a $(libdir)
+	install -c -m 644 libst.3 $(mandir)/man3
+	install -c -m 644 st.h $(incdir)
+	install -c -m 644 ststdint.h $(incdir)
+
+clean:
+	$(RM) *~ *.o *.raw *.sf core sox soxmix libst.a
+
+tar:	clean
+	$(RM) ../$(SRCDIR).tar
+	cd ..; tar cvf $(SRCDIR).tar $(SRCDIR)