2nd pass at generic Makefile.linux

git-svn-id: https://svn.code.sf.net/p/freetel/code@1138 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/README.linux b/fdmdv2/README.linux
index 837bb8d59c0e0a05509f9396e514a7426ac961d8..e292071b82d1630b670dccb21210d329bf5469a2 100644 (file)
--- a/fdmdv2/README.linux
+++ b/fdmdv2/README.linux
@@ -17,9 +17,7 @@ BUILDING FreeDV for Linux
 2. A typical ALSA installation (e.g., Ubuntu 10.04) first install the
    following packages:
 
-     libsamplerate, libsamplerate-dev
-     libsndfile1, libsndfile1-dev
-     libasound, libasound_dev
+   $ sudo apt-get install libgtk2.0-dev libsamplerate0-dev libsndfile1-dev libasound_dev
 
 3. If you would like to use OSS rather than ALSA do not install
    libasound & libasound_dev.

diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux
index 80d6f1dc55d94fb3e7a61a96064a6c1418e382c9..744a3ed495e2c7ce93949932dfe7a4a5b1f4fb5b 100644 (file)
--- a/fdmdv2/src/Makefile.linux
+++ b/fdmdv2/src/Makefile.linux
@@ -30,6 +30,7 @@ CODEC2_INC=-I$(CODEC2)/src
 CODEC2_LIB=$(CODEC2)/src/.libs/libcodec2.a
 
 # Sox ---------------------------------------------------
+# (libmagic is rqd or later versions of Ubuntu)
 
 SOX=sox-14.4.0
 SOX_INC=-I$(SOX)/src/
@@ -117,7 +118,7 @@ $(CODEC2):
 
 $(SOX)/.built: $(SOX)
        cd $(SOX) && \
-       ./configure --enable-shared=no --without-id3tag --without-png --disable-gomp --with-oggvorbis=no --with-oss=no --with-flac=no --disable-dl-sndfile --with-pulseaudio=no \
+       ./configure --enable-shared=no --without-id3tag --without-png --disable-gomp --with-oggvorbis=no --with-oss=no --with-flac=no --disable-dl-sndfile --with-pulseaudio=no --without-magic \
        && make && touch .built
                
 $(SOX) : $(SOX).tar.bz2