Change autotools to "subdir-objects" and simplify

4 files changed, 149 insertions, 152 deletions

diff --git a/Makefile.am b/Makefile.am
index c0b3024..b384024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,152 @@
 # You should have received a copy of the GNU General Public License
 # along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
 
-SUBDIRS = src lib
-
 ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = COPYING NEWS README.md AUTHORS ChangeLog TODO doc
+
+if IS_GIT_REPO
+GITVERSION_FLAGS = -DGITVERSION="\"`git describe`\""
+else
+GITVERSION_FLAGS =
+endif
+
+if HAVE_SSE
+SIMD_CFLAGS = -msse -msse2
+else
+SIMD_CFLAGS =
+endif
+
+bin_PROGRAMS = odr-dabmod
+
+FFT_DIR=lib/kiss_fft129
+FFT_LDADD=
+
+if USE_KISS_FFT
+FFT_INC=-I$(FFT_DIR) -I$(FFT_DIR)/tools
+FFT_FLG=-ffast-math
+
+.PHONY: lib/kiss_fft129
+
+BUILT_SOURCES=lib/kiss_fft129
+
+lib/kiss_fft129:
+	if [ ! -e lib/kiss_fft129/kiss_fft.c ]; then \
+		tar xzf lib/kiss_fft129.tar.gz -C lib; \
+	fi
+
+nodist_odr_dabmod_SOURCES = lib/kiss_fft129/kiss_fft.c \
+							lib/kiss_fft129/kiss_fft.h \
+							lib/kiss_fft129/tools/kiss_fftr.c \
+							lib/kiss_fft129/tools/kiss_fftr.h \
+							src/kiss_fftsimd.c \
+							src/kiss_fftsimd.h
+
+clean-local:
+	rm -rf $(FFT_DIR)
+
+else
+FFT_INC=
+FFT_FLG=
+endif
+
+odr_dabmod_CPPFLAGS = -Wall \
+					  $(FFT_INC) $(FFT_FLG) $(SIMD_CFLAGS) $(GITVERSION_FLAGS)
+odr_dabmod_LDADD    = $(FFT_LDADD)
+odr_dabmod_SOURCES  = src/DabMod.cpp \
+					  src/PcDebug.h \
+					  src/porting.c \
+					  src/porting.h \
+					  src/DabModulator.cpp \
+					  src/DabModulator.h \
+					  src/Buffer.cpp \
+					  src/Buffer.h \
+					  src/ModCodec.cpp \
+					  src/ModCodec.h \
+					  src/ModPlugin.cpp \
+					  src/ModPlugin.h \
+					  src/ModFormat.cpp \
+					  src/ModFormat.h \
+					  src/EtiReader.cpp \
+					  src/EtiReader.h \
+					  src/Eti.cpp \
+					  src/Eti.h \
+					  src/FicSource.cpp \
+					  src/FicSource.h \
+					  src/FIRFilter.cpp \
+					  src/FIRFilter.h \
+					  src/ModInput.cpp \
+					  src/ModInput.h \
+					  src/PuncturingRule.cpp \
+					  src/PuncturingRule.h \
+					  src/PuncturingEncoder.cpp \
+					  src/PuncturingEncoder.h \
+					  src/SubchannelSource.cpp \
+					  src/SubchannelSource.h \
+					  src/Flowgraph.cpp \
+					  src/Flowgraph.h \
+					  src/GainControl.cpp \
+					  src/GainControl.h \
+					  src/OutputMemory.cpp \
+					  src/OutputMemory.h \
+					  src/OutputZeroMQ.cpp \
+					  src/OutputZeroMQ.h \
+					  src/TimestampDecoder.h \
+					  src/TimestampDecoder.cpp \
+					  src/OutputUHD.cpp \
+					  src/OutputUHD.h \
+					  src/ModOutput.cpp \
+					  src/ModOutput.h \
+					  src/InputMemory.cpp \
+					  src/InputMemory.h \
+					  src/InputFileReader.cpp \
+					  src/InputZeroMQReader.cpp \
+					  src/InputReader.h \
+					  src/OutputFile.cpp \
+					  src/OutputFile.h \
+					  src/FrameMultiplexer.cpp \
+					  src/FrameMultiplexer.h \
+					  src/ModMux.cpp \
+					  src/ModMux.h \
+					  src/PrbsGenerator.cpp \
+					  src/PrbsGenerator.h \
+					  src/BlockPartitioner.cpp \
+					  src/BlockPartitioner.h \
+					  src/QpskSymbolMapper.cpp \
+					  src/QpskSymbolMapper.h \
+					  src/FrequencyInterleaver.cpp \
+					  src/FrequencyInterleaver.h \
+					  src/PhaseReference.cpp \
+					  src/PhaseReference.h \
+					  src/DifferentialModulator.cpp \
+					  src/DifferentialModulator.h \
+					  src/NullSymbol.cpp \
+					  src/NullSymbol.h \
+					  src/SignalMultiplexer.cpp \
+					  src/SignalMultiplexer.h \
+					  src/CicEqualizer.cpp \
+					  src/CicEqualizer.h \
+					  src/OfdmGenerator.cpp \
+					  src/OfdmGenerator.h \
+					  src/GuardIntervalInserter.cpp \
+					  src/GuardIntervalInserter.h \
+					  src/Resampler.cpp \
+					  src/Resampler.h \
+					  src/ConvEncoder.cpp \
+					  src/ConvEncoder.h \
+					  src/TimeInterleaver.cpp \
+					  src/TimeInterleaver.h \
+					  src/ThreadsafeQueue.h \
+					  src/Log.cpp \
+					  src/Log.h \
+					  src/RemoteControl.cpp \
+					  src/RemoteControl.h \
+					  src/FormatConverter.cpp \
+					  src/FormatConverter.h \
+					  src/zmq.hpp
+
+dist_bin_SCRIPTS = src/crc-dwap.py
+
+EXTRA_DIST += lib/kiss_fft129.tar.gz
+EXTRA_DIST += src/kiss_fftsimd.c src/kiss_fftsimd.h
+
diff --git a/configure.ac b/configure.ac
index 3f21f89..a73ee39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,9 @@
 AC_PREREQ(2.59)
 AC_INIT([ODR-DabMod], [0.5.1], [matthias.braendli@mpb.li])
 AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([-Wall foreign])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
 AC_CONFIG_SRCDIR([src/DabMod.cpp])
 AM_CONFIG_HEADER([config.h])
 AM_SILENT_RULES([yes])
@@ -186,9 +187,7 @@ AM_CONDITIONAL([HAVE_SSE], [test "x$has_sse" = "xyes"])
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([bzero floor ftime gettimeofday memset sqrt strchr strerror strtol])
 
-AC_CONFIG_FILES([Makefile
-                 lib/Makefile
-                 src/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
 
 echo
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index c37fb46..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright (C) 2008, 2009 Her Majesty the Queen in Right of Canada
-# (Communications Research Center Canada)
-
-# This file is part of ODR-DabMod.
-# 
-# ODR-DabMod is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-# 
-# ODR-DabMod is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
-
-EXTRA_DIST	=kiss_fft129.tar.gz
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index f8ba7c2..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Her Majesty the
-# Queen in Right of Canada (Communications Research Center Canada)
-
-# This file is part of ODR-DabMod.
-#
-# ODR-DabMod is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# ODR-DabMod is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with ODR-DabMod.  If not, see <http://www.gnu.org/licenses/>.
-
-if IS_GIT_REPO
-GITVERSION_FLAGS = -DGITVERSION="\"`git describe`\""
-else
-GITVERSION_FLAGS =
-endif
-
-if HAVE_SSE
-SIMD_CFLAGS = -msse -msse2
-else
-SIMD_CFLAGS =
-endif
-
-bin_PROGRAMS = odr-dabmod
-
-if USE_KISS_FFT
-FFT_DIR=$(top_builddir)/lib/kiss_fft129
-FFT_INC=-I$(FFT_DIR) -I$(FFT_DIR)/tools
-FFT_SRC=$(FFT_DIR)/kiss_fft.c \
-		$(FFT_DIR)/kiss_fft.h \
-		$(FFT_DIR)/tools/kiss_fftr.c \
-		$(FFT_DIR)/tools/kiss_fftr.h \
-		kiss_fftsimd.c \
-		kiss_fftsimd.h
-FFT_FLG=-ffast-math
-
-.PHONY: kiss_fft129 reed-solomon-4.0
-
-DabModulator.cpp: $(FFT_DIR)
-
-BUILT_SOURCES: $(FFT_DIR)
-
-FFT_LDADD=
-
-$(FFT_DIR):
-	if [ ! -e $(FFT_DIR) ]; then \
-		tar xzf $(top_srcdir)/lib/kiss_fft129.tar.gz -C $(top_builddir)/lib; \
-	fi
-
-else
-FFT_LDADD=
-FFT_DIR=
-FFT_INC=
-FFT_SRC=
-FFT_FLG=
-endif
-
-odr_dabmod_CPPFLAGS = -Wall \
-					  $(FFT_INC) $(FFT_FLG) $(SIMD_CFLAGS) $(GITVERSION_FLAGS)
-odr_dabmod_LDADD    = $(FFT_LDADD)
-odr_dabmod_SOURCES  = DabMod.cpp \
-					  PcDebug.h \
-					  porting.c porting.h \
-					  DabModulator.cpp DabModulator.h  \
-					  Buffer.cpp Buffer.h \
-					  ModCodec.cpp ModCodec.h \
-					  ModPlugin.cpp ModPlugin.h \
-					  ModFormat.cpp ModFormat.h \
-					  EtiReader.cpp EtiReader.h \
-					  Eti.cpp Eti.h \
-					  FicSource.cpp FicSource.h \
-					  FIRFilter.cpp FIRFilter.h \
-					  ModInput.cpp ModInput.h \
-					  PuncturingRule.cpp PuncturingRule.h \
-					  PuncturingEncoder.cpp PuncturingEncoder.h \
-					  SubchannelSource.cpp SubchannelSource.h \
-					  Flowgraph.cpp Flowgraph.h \
-					  GainControl.cpp GainControl.h \
-					  OutputMemory.cpp OutputMemory.h \
-					  OutputZeroMQ.cpp OutputZeroMQ.h \
-					  TimestampDecoder.h TimestampDecoder.cpp \
-					  OutputUHD.cpp OutputUHD.h \
-					  ModOutput.cpp ModOutput.h \
-					  InputMemory.cpp InputMemory.h \
-					  InputFileReader.cpp InputZeroMQReader.cpp InputReader.h \
-					  OutputFile.cpp OutputFile.h \
-					  FrameMultiplexer.cpp FrameMultiplexer.h \
-					  ModMux.cpp ModMux.h \
-					  PrbsGenerator.cpp PrbsGenerator.h \
-					  BlockPartitioner.cpp BlockPartitioner.h \
-					  QpskSymbolMapper.cpp QpskSymbolMapper.h \
-					  FrequencyInterleaver.cpp FrequencyInterleaver.h \
-					  PhaseReference.cpp PhaseReference.h \
-					  DifferentialModulator.cpp DifferentialModulator.h \
-					  NullSymbol.cpp NullSymbol.h \
-					  SignalMultiplexer.cpp SignalMultiplexer.h \
-					  CicEqualizer.cpp CicEqualizer.h \
-					  OfdmGenerator.cpp OfdmGenerator.h \
-					  GuardIntervalInserter.cpp GuardIntervalInserter.h \
-					  Resampler.cpp Resampler.h \
-					  ConvEncoder.cpp ConvEncoder.h \
-					  TimeInterleaver.cpp TimeInterleaver.h \
-					  ThreadsafeQueue.h \
-					  Log.cpp Log.h \
-					  RemoteControl.cpp RemoteControl.h \
-					  FormatConverter.cpp FormatConverter.h \
-					  zmq.hpp
-
-nodist_odr_dabmod_SOURCES = $(FFT_SRC)
-
-dist_bin_SCRIPTS = crc-dwap.py
-
-if USE_KISS_FFT
-EXTRA_DIST = kiss_fftsimd.c kiss_fftsimd.h
-
-clean-local:
-	rm -rf $(FFT_DIR)
-
-endif
-