Update install instructions

4 files changed, 102 insertions, 56 deletions

diff --git a/installer/Makefile-deb b/installer/Makefile-deb
index 9385f27..e9335e2 100644
--- a/installer/Makefile-deb
+++ b/installer/Makefile-deb
@@ -17,16 +17,25 @@ MOD_VER=$(shell cd $(MOD_DIR) && git pull > /dev/null && git describe --long | c
 MOD_REV=$(shell cd $(MOD_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 2)
 DABMOD_DEB=odr-dabmod_$(MOD_VER)-$(MOD_REV)_amd64.deb
 
-FDK_AAC_DABPLUS_DIR=fdk-aac-dabplus
-FDK_AAC_DABPLUS_VER=$(shell cd $(FDK_AAC_DABPLUS_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 1 | tail -c +2)
-FDK_AAC_DABPLUS_REV=$(shell cd $(FDK_AAC_DABPLUS_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 2)
-FDK_AAC_DABPLUS_DEB=fdk-aac-dabplus_$(FDK_AAC_DABPLUS_VER)-$(FDK_AAC_DABPLUS_REV)_amd64.deb
+FDK_AAC_DIR=fdk-aac
+FDK_AAC_VER=$(shell cd $(FDK_AAC_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 1 | tail -c +2)
+FDK_AAC_REV=$(shell cd $(FDK_AAC_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 2)
+FDK_AAC_DEB=fdk-aac_$(FDK_AAC_VER)-$(FDK_AAC_REV)_amd64.deb
+
+ODR_AUDIOENC_DIR=ODR-AudioEnc
+ODR_AUDIOENC_VER=$(shell cd $(ODR_AUDIOENC_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 1 | tail -c +2)
+ODR_AUDIOENC_REV=$(shell cd $(ODR_AUDIOENC_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 2)
+ODR_AUDIOENC_DEB=odr-audioenc_$(ODR_AUDIOENC_VER)-$(ODR_AUDIOENC_REV)_amd64.deb
+
+ODR_PADENC_DIR=ODR-PadEnc
+ODR_PADENC_VER=$(shell cd $(ODR_PADENC_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 1 | tail -c +2)
+ODR_PADENC_REV=$(shell cd $(ODR_PADENC_DIR) && git pull > /dev/null && git describe --long | cut -d "-" -f 2)
+ODR_PADENC_DEB=odr-padenc_$(ODR_PADENC_VER)-$(ODR_PADENC_REV)_amd64.deb
 
 KA9Q_FEC_DEB := ka9q-fec_3.0.1-1_amd64.deb
 UHD_DEB := uhd_3.8.1-1_amd64.deb
-ZEROMQ_DEB := zeromq_4.0.4-1_amd64.deb
 
-all: $(KA9Q_FEC_DEB) $(DABMUX_DEB) $(FDK_AAC_DABPLUS_DEB) $(DABMOD_DEB)
+all: $(KA9Q_FEC_DEB) $(DABMUX_DEB) $(FDK_AAC_DEB) $(DABMOD_DEB)
 
 $(KA9Q_FEC_DEB):
 	cd ka9q-fec && \
@@ -47,16 +56,9 @@ $(UHD_DEB):
 	make package && \
 	mv ./uhd_003.008.001*deb ../../$(UHD_DEB)
 
-$(ZEROMQ_DEB):
-	cd zeromq-4.0.4 && \
-	./configure && \
-	make clean && \
-	make -j2 && \
-	sudo checkinstall --fstrans --pkgname="zeromq" --pkgversion=4.0.4 --pkgrelease=1 --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
-	mv $(ZEROMQ_DEB) ..
-
-$(DABMUX_DEB): $(KA9Q_FEC_DEB) $(ZEROMQ_DEB)
+$(DABMUX_DEB):
 	cd $(MUX_DIR) && \
+	git clean -fdx && \
 	git pull && \
 	./bootstrap.sh && \
 	./configure --enable-input-zeromq --enable-output-zeromq --enable-output-edi && \
@@ -65,8 +67,9 @@ $(DABMUX_DEB): $(KA9Q_FEC_DEB) $(ZEROMQ_DEB)
 	sudo checkinstall --fstrans --pkgname="odr-dabmux" --pkgversion=$(MUX_VER) --pkgrelease=$(MUX_REV) --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
 	mv $(DABMUX_DEB) ..
 
-$(DABMOD_DEB): $(UHD_DEB) $(ZEROMQ_DEB) $(KA9Q_FEC_DEB)
-	cd ODR-DabMod && \
+$(DABMOD_DEB): $(UHD_DEB)
+	cd $(MOD_DIR) && \
+	git clean -fdx && \
 	git pull && \
 	./bootstrap.sh && \
 	./configure --enable-zeromq --enable-output-uhd && \
@@ -75,13 +78,32 @@ $(DABMOD_DEB): $(UHD_DEB) $(ZEROMQ_DEB) $(KA9Q_FEC_DEB)
 	sudo checkinstall --fstrans --pkgname="odr-dabmod" --pkgversion=$(MOD_VER) --pkgrelease=$(MOD_REV) --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
 	mv $(DABMOD_DEB) ..
 
-$(FDK_AAC_DABPLUS_DEB): $(ZEROMQ_DEB)
-	cd fdk-aac-dabplus && \
+$(FDK_AAC_DEB):
+	cd $(FDK_AAC_DIR) && \
+	git pull && \
+	autoreconf -i && \
+	./configure && \
+	make clean && \
+	make -j2 && \
+	sudo checkinstall --fstrans --pkgname="fdk-aac" --pkgversion=$(FDK_AAC_VER) --pkgrelease=$(FDK_AAC_REV) --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
+	mv $(FDK_AAC_DEB) ..
+
+$(ODR_AUDIOENC_DEB): $(FDK_AAC_DEB)
+	cd $(ODR_AUDIOENC_DIR) && \
 	git pull && \
 	autoreconf -i && \
-	./configure --enable-vlc --enable-jack && \
+	./configure && \
 	make clean && \
 	make -j2 && \
-	sudo checkinstall --fstrans --pkgname="fdk-aac-dabplus" --pkgversion=$(FDK_AAC_DABPLUS_VER) --pkgrelease=$(FDK_AAC_DABPLUS_REV) --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
-	mv $(FDK_AAC_DABPLUS_DEB) ..
+	sudo checkinstall --fstrans --pkgname="odr-audioenc" --pkgversion=$(ODR_AUDIOENC_VER) --pkgrelease=$(ODR_AUDIOENC_REV) --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
+	mv $(ODR_AUDIOENC_DEB) ..
 
+$(ODR_PADENC_DEB):
+	cd $(ODR_PADENC_DIR) && \
+	git pull && \
+	autoreconf -i && \
+	./configure && \
+	make clean && \
+	make -j2 && \
+	sudo checkinstall --fstrans --pkgname="odr-padenc" --pkgversion=$(ODR_PADENC_VER) --pkgrelease=$(ODR_PADENC_REV) --maintainer="matthias@mpb.li" --deldoc -y --install=$(DO_INSTALL) && \
+	mv $(ODR_PADENC_DEB) ..
diff --git a/installer/README.md b/installer/README.md
index bdf5cf7..b3a823c 100644
--- a/installer/README.md
+++ b/installer/README.md
@@ -10,12 +10,13 @@ Debian
 The *debian.sh* script is designed to be run on debian jessie, and installs
 
  * UHD
+ * the fdk-aac library
  * ODR-mmbTools:
    * ODR-DabMux
    * ODR-DabMod
+   * ODR-AudioEnc
+   * ODR-PadEnc
    * auxiliary scripts
- * the FDK-AAC-DABplus package
- * Toolame-DAB
 
 
 To use it, you have to:
diff --git a/installer/debian.sh b/installer/debian.sh
index 4fe2dfd..764e2c5 100644
--- a/installer/debian.sh
+++ b/installer/debian.sh
@@ -6,8 +6,9 @@
 #   * ODR-DabMux
 #   * ODR-DabMod
 #   * auxiliary scripts
-#   * the FDK-AAC-DABplus package
-#   * Toolame-DAB
+#   * the FDK-AAC library with DAB+ patch
+#   * ODR-AudioEnc
+#   * ODR-PadEnc
 #
 # and all required dependencies for a
 # Debian stable system.
@@ -33,7 +34,7 @@ echo
 echo "This is the mmbTools installer script for debian"
 echo "================================================"
 echo
-echo "It will install ODR-DabMux, ODR-DabMod, FDK-AAC-DABplus, Toolame-dab"
+echo "It will install ODR-DabMux, ODR-DabMod, ODR-AudioEnc, ODR-PadEnc"
 echo "and all prerequisites to your machine."
 echo $DISTRO
 
@@ -177,30 +178,37 @@ make
 sudo make install
 popd
 
-
-echo -e "$GREEN Compiling Toolame-DAB $NORMAL"
-git clone https://github.com/Opendigitalradio/toolame-dab.git
-pushd toolame-dab
-mkdir build
-cd build
-cmake ..
+echo -e "$GREEN Compiling fdk-aac library $NORMAL"
+git clone https://github.com/Opendigitalradio/fdk-aac.git
+pushd fdk-aac
+./bootstrap
+./configure
 make
 sudo make install
 popd
 
-echo -e "$GREEN Compiling FDK-AAC-DABplus $NORMAL"
-git clone https://github.com/Opendigitalradio/fdk-aac-dabplus.git
-pushd fdk-aac-dabplus
+echo -e "$GREEN Updating ld cache $NORMAL"
+# update ld cache
+sudo ldconfig
+
+
+echo -e "$GREEN Compiling ODR-AudioEnc $NORMAL"
+git clone https://github.com/Opendigitalradio/ODR-AudioEnc.git
+pushd ODR-AudioEnc
 ./bootstrap
 ./configure --enable-jack --enable-vlc
 make
 sudo make install
 popd
 
-
-echo -e "$GREEN Updating ld cache $NORMAL"
-# update ld cache
-sudo ldconfig
+echo -e "$GREEN Compiling ODR-PadEnc $NORMAL"
+git clone https://github.com/Opendigitalradio/ODR-PadEnc.git
+pushd ODR-PadEnc
+./bootstrap
+./configure --enable-jack --enable-vlc
+make
+sudo make install
+popd
 
 
 echo -e "$GREEN Done installing all tools $NORMAL"
diff --git a/installer/gnuradio-livecd.sh b/installer/gnuradio-livecd.sh
index e08ab82..9bbefcb 100644
--- a/installer/gnuradio-livecd.sh
+++ b/installer/gnuradio-livecd.sh
@@ -5,8 +5,9 @@
 #   * ODR-DabMux
 #   * ODR-DabMod
 #   * auxiliary scripts
-#   * the FDK-AAC-DABplus package
-#   * Toolame-DAB
+#   * the FDK-AAC library with DAB+ patch
+#   * ODR-AudioEnc
+#   * ODR-PadEnc
 #
 #
 # Requires: sudo, UHD already installed, with all -dev packages too for
@@ -20,7 +21,7 @@ echo
 echo "This is the mmbTools installer script for the GNURadio live system"
 echo "=================================================================="
 echo
-echo "It will install ODR-DabMux, ODR-DabMod, FDK-AAC-DABplus, Toolame-dab"
+echo "It will install ODR-DabMux, ODR-DabMod, ODR-AudioEnc, ODR-PadEnc"
 echo "and all prerequisites to your machine."
 
 
@@ -114,7 +115,11 @@ git clone https://github.com/mpbraendli/mmbtools-aux.git
 echo -e "$GREEN Fetching etisnoop $NORMAL"
 git clone https://github.com/Opendigitalradio/etisnoop.git
 pushd etisnoop
+mkdir build
+cd build
+cmake ..
 make
+sudo make install
 popd
 
 echo -e "$GREEN Compiling ODR-DabMux $NORMAL"
@@ -135,27 +140,37 @@ make
 sudo make install
 popd
 
-
-echo -e "$GREEN Compiling Toolame-DAB $NORMAL"
-git clone https://github.com/Opendigitalradio/toolame-dab.git
-pushd toolame-dab
+echo -e "$GREEN Compiling fdk-aac library $NORMAL"
+git clone https://github.com/Opendigitalradio/fdk-aac.git
+pushd fdk-aac
+./bootstrap
+./configure
 make
-sudo cp toolame /usr/local/bin/toolame
+sudo make install
 popd
 
-echo -e "$GREEN Compiling FDK-AAC-DABplus $NORMAL"
-git clone https://github.com/Opendigitalradio/fdk-aac-dabplus.git
-pushd fdk-aac-dabplus
+echo -e "$GREEN Updating ld cache $NORMAL"
+# update ld cache
+sudo ldconfig
+
+
+echo -e "$GREEN Compiling ODR-AudioEnc $NORMAL"
+git clone https://github.com/Opendigitalradio/ODR-AudioEnc.git
+pushd ODR-AudioEnc
 ./bootstrap
 ./configure --enable-jack --enable-vlc
 make
 sudo make install
 popd
 
-
-echo -e "$GREEN Updating ld cache $NORMAL"
-# update ld cache
-sudo ldconfig
+echo -e "$GREEN Compiling ODR-PadEnc $NORMAL"
+git clone https://github.com/Opendigitalradio/ODR-PadEnc.git
+pushd ODR-PadEnc
+./bootstrap
+./configure --enable-jack --enable-vlc
+make
+sudo make install
+popd
 
 
 echo -e "$GREEN Done installing all tools $NORMAL"