diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-09 16:41:25 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2014-03-09 16:43:04 +0100 |
| commit | 4673583e61c883e0b681bdb82d1e7afa12a27348 (patch) | |
| tree | a3a47b8fa7f6b9f76693e63b532fa8362f40a215 | |
| parent | 97d839e2db2abe2cde1a729902cbf48344a0368e (diff) | |
| download | ODR-AudioEnc-4673583e61c883e0b681bdb82d1e7afa12a27348.tar.gz ODR-AudioEnc-4673583e61c883e0b681bdb82d1e7afa12a27348.tar.bz2 ODR-AudioEnc-4673583e61c883e0b681bdb82d1e7afa12a27348.zip | |
Move sources to src, rename all programs
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | Makefile.am | 50 | ||||
| -rw-r--r-- | src/aac-enc-dabplus-zmq.c (renamed from aac-enc-dabplus-zmq.c) | 0 | ||||
| -rw-r--r-- | src/aac-enc-dabplus.c (renamed from aac-enc-dabplus.c) | 0 | ||||
| -rw-r--r-- | src/aac-enc.c (renamed from aac-enc.c) | 0 | ||||
| -rw-r--r-- | src/mot-encoder.c (renamed from mot-encoder.c) | 0 | ||||
| -rw-r--r-- | src/wavreader.c (renamed from wavreader.c) | 0 | ||||
| -rw-r--r-- | src/wavreader.h (renamed from wavreader.h) | 0 |
8 files changed, 30 insertions, 28 deletions
@@ -26,9 +26,7 @@ m4/ltversion.m4 m4/lt~obsolete.m4 missing stamp-h1 -aac-enc mot-encoder -aac-enc-dabplus -aac-enc-dabplus-zmq -dabplus-zmq -alsa-dabplus-zmq +dabplus-enc-file +dabplus-enc-file-zmq +dabplus-enc-alsa-zmq diff --git a/Makefile.am b/Makefile.am index f0c5de4..1fdddb8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,36 +33,40 @@ libfdk_aac_la_CXXFLAGS = -fno-exceptions -fno-rtti libfdk_aac_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \ -export-symbols $(top_srcdir)/fdk-aac.sym -aac_enc_LDADD = libfdk-aac.la -aac_enc_SOURCES = aac-enc.c wavreader.c +#aac_enc_LDADD = libfdk-aac.la +#aac_enc_SOURCES = src/aac-enc.c \ +# src/wavreader.c -aac_enc_dabplus_LDADD = libfdk-aac.la -lfec -aac_enc_dabplus_SOURCES = aac-enc-dabplus.c wavreader.c +dabplus_enc_file_LDADD = libfdk-aac.la -lfec +dabplus_enc_file_SOURCES = src/aac-enc-dabplus.c \ + src/wavreader.c -aac_enc_dabplus_zmq_LDADD = libfdk-aac.la -lfec -lzmq -aac_enc_dabplus_zmq_SOURCES = aac-enc-dabplus-zmq.c wavreader.c \ - contrib/lib_crc.c +dabplus_enc_file_zmq_LDADD = libfdk-aac.la -lfec -lzmq +dabplus_enc_file_zmq_SOURCES = src/aac-enc-dabplus-zmq.c \ + src/wavreader.c \ + contrib/lib_crc.c -mot_encoder_CFLAGS = @MAGICKWAND_CFLAGS@ -Icontrib -mot_encoder_LDADD = @MAGICKWAND_LDADD@ -mot_encoder_SOURCES = mot-encoder.c contrib/lib_crc.c +dabplus_enc_alsa_zmq_LDFLAGS = -no-install +dabplus_enc_alsa_zmq_LDADD = libfdk-aac.la -lfec -lzmq -lasound \ + -lrt -lboost_thread +dabplus_enc_alsa_zmq_SOURCES = src/AlsaDabplus.cpp \ + src/AlsaInput.cpp \ + src/AlsaInput.h \ + src/SampleQueue.h \ + src/zmq.hpp -dabplus_enc_LDFLAGS = -no-install -dabplus_enc_LDADD = libfdk-aac.la -lfec -lzmq -lasound \ - -lrt -lboost_thread -dabplus_enc_SOURCES = src/AlsaDabplus.cpp \ - src/AlsaInput.cpp \ - src/AlsaInput.h \ - src/SampleQueue.h \ - src/zmq.hpp +mot_encoder_CFLAGS = @MAGICKWAND_CFLAGS@ -Icontrib +mot_encoder_LDADD = @MAGICKWAND_LDADD@ +mot_encoder_SOURCES = src/mot-encoder.c \ + contrib/lib_crc.c -bin_PROGRAMS = aac-enc-dabplus$(EXEEXT) \ - aac-enc-dabplus-zmq$(EXEEXT) \ - dabplus-enc$(EXEEXT) \ - mot-encoder$(EXEEXT) +bin_PROGRAMS = dabplus-enc-file$(EXEEXT) \ + dabplus-enc-file-zmq$(EXEEXT) \ + dabplus-enc-alsa-zmq$(EXEEXT) \ + mot-encoder$(EXEEXT) -noinst_HEADERS = wavreader.h +noinst_HEADERS = src/wavreader.h AACDEC_SRC = \ libAACdec/src/aacdec_drc.cpp \ diff --git a/aac-enc-dabplus-zmq.c b/src/aac-enc-dabplus-zmq.c index febbdd9..febbdd9 100644 --- a/aac-enc-dabplus-zmq.c +++ b/src/aac-enc-dabplus-zmq.c diff --git a/aac-enc-dabplus.c b/src/aac-enc-dabplus.c index 6a0b882..6a0b882 100644 --- a/aac-enc-dabplus.c +++ b/src/aac-enc-dabplus.c diff --git a/aac-enc.c b/src/aac-enc.c index 1528881..1528881 100644 --- a/aac-enc.c +++ b/src/aac-enc.c diff --git a/mot-encoder.c b/src/mot-encoder.c index a60a39a..a60a39a 100644 --- a/mot-encoder.c +++ b/src/mot-encoder.c diff --git a/wavreader.c b/src/wavreader.c index c62a885..c62a885 100644 --- a/wavreader.c +++ b/src/wavreader.c diff --git a/wavreader.h b/src/wavreader.h index 57a13ff..57a13ff 100644 --- a/wavreader.h +++ b/src/wavreader.h |