[osmo-gmr PATCH 2/7] build: simplify building by avoiding recursion in src/.

Only the l1 subdirectory's sources are shared between the two binaries, so build those into a static archive and link it in both. The sdr sources are compiled in directly. Signed-off-by: Diego Elio Pettenò <flameeyes(a)flameeyes.eu> --- configure.ac | 2 -- src/Makefile.am | 17 +++++++++-------- src/l1/Makefile.am | 9 --------- src/sdr/Makefile.am | 7 ------- 4 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 src/l1/Makefile.am delete mode 100644 src/sdr/Makefile.am diff --git a/configure.ac b/configure.ac index a4f3952..87cfc79 100644 --- a/configure.ac +++ b/configure.ac @@ -43,8 +43,6 @@ AM_CONFIG_HEADER(config.h) AC_OUTPUT( src/Makefile - src/l1/Makefile - src/sdr/Makefile Makefile Doxyfile ) diff --git a/src/Makefile.am b/src/Makefile.am index c3991ae..a1f8c9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,15 +1,16 @@ -SUBDIRS = l1 sdr - INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMODSP_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) +noinst_LIBRARIES = libl1.a bin_PROGRAMS = gmr1_rx gmr1_gen_mat -gmr1_rx_SOURCES = gmr1_rx.c gsmtap.c -gmr1_rx_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a \ - $(top_builddir)/src/sdr/libgmr1-sdr.a \ - $(FFTW3F_LIBS) +libl1_a_SOURCES = l1/conv.c l1/crc.c l1/interleave.c l1/punct.c \ + l1/scramb.c l1/a5.c l1/bcch.c l1/ccch.c l1/rach.c \ + l1/facch3.c l1/tch3.c + +gmr1_rx_SOURCES = gmr1_rx.c gsmtap.c sdr/dkab.c sdr/fcch.c sdr/nb.c \ + sdr/pi4cxpsk.c +gmr1_rx_LDADD = libl1.a $(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) $(FFTW3F_LIBS) gmr1_gen_mat_SOURCES = gmr1_gen_mat.c -gmr1_gen_mat_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a +gmr1_gen_mat_LDADD = libl1.a $(LIBOSMOCORE_LIBS) diff --git a/src/l1/Makefile.am b/src/l1/Makefile.am deleted file mode 100644 index 3ef01a3..0000000 --- a/src/l1/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) - -noinst_LIBRARIES = libgmr1-l1.a - -libgmr1_l1_a_SOURCES = \ - conv.c crc.c interleave.c punct.c scramb.c \ - a5.c bcch.c ccch.c rach.c facch3.c tch3.c diff --git a/src/sdr/Makefile.am b/src/sdr/Makefile.am deleted file mode 100644 index df1d2d3..0000000 --- a/src/sdr/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMODSP_CFLAGS) $(FFTW3F_CFLAGS) -AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) $(FFTW3F_LIBS) - -noinst_LIBRARIES = libgmr1-sdr.a - -libgmr1_sdr_a_SOURCES = dkab.c fcch.c nb.c pi4cxpsk.c -- 1.7.8.6