From ee8d96df44729890bd7beaf4554c398b661a48bc Mon Sep 17 00:00:00 2001 From: drowe67 Date: Sun, 16 Dec 2012 06:22:52 +0000 Subject: [PATCH] 2nd pass at generic Makefile.linux git-svn-id: https://svn.code.sf.net/p/freetel/code@1138 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/README.linux | 4 +--- fdmdv2/src/Makefile.linux | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fdmdv2/README.linux b/fdmdv2/README.linux index 837bb8d5..e292071b 100644 --- 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 80d6f1dc..744a3ed4 100644 --- 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 -- 2.25.1