From 32a71023bf7350167fdd4f3797d384d47cafd71f Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 21 Oct 2010 13:17:11 -0600 Subject: add python/*.cc to SOURCES so dependencies work properly. --- gr-atsc/src/lib/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gr-atsc/src/lib/Makefile.am') diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index bf9c6626a..a82c37913 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -84,7 +84,8 @@ libgnuradio_atsc_la_SOURCES = \ create_atsci_equalizer.cc \ create_atsci_fs_checker.cc \ create_atsci_fs_correlator.cc \ - plinfo.cc + plinfo.cc \ + python/atsc.cc BUILT_SOURCES = \ atsci_viterbi_mux.cc -- cgit From 0282499102abcef25849ae3a5255902502c1382a Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 31 Oct 2010 13:24:29 -0700 Subject: Remove swig generated python code from C++-only libraries --- gr-atsc/src/lib/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-atsc/src/lib/Makefile.am') diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index a82c37913..1ca31d14b 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -84,8 +84,8 @@ libgnuradio_atsc_la_SOURCES = \ create_atsci_equalizer.cc \ create_atsci_fs_checker.cc \ create_atsci_fs_correlator.cc \ - plinfo.cc \ - python/atsc.cc + plinfo.cc + BUILT_SOURCES = \ atsci_viterbi_mux.cc -- cgit From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 17:29:11 -0800 Subject: Major Makefile.am housecleaning. Passes distcheck. Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files. --- gr-atsc/src/lib/Makefile.am | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'gr-atsc/src/lib/Makefile.am') diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 1ca31d14b..b1bda90ff 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2004,2005,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2001,2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,11 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) -EXTRA_DIST = \ +EXTRA_DIST += \ atsci_viterbi_gen.cc \ gen_encoder.py \ qa_atsci_trellis_encoder_t1_input.dat \ @@ -87,7 +88,7 @@ libgnuradio_atsc_la_SOURCES = \ plinfo.cc -BUILT_SOURCES = \ +BUILT_SOURCES += \ atsci_viterbi_mux.cc libgnuradio_atsc_la_LIBADD = \ @@ -211,12 +212,11 @@ test_atsci_LDADD = \ # Cleanup # ------------------------------------------------------------------------ -CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT) +CLEANFILES += atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT) -if PYTHON # ------------------------------------------------------------------------ # This is the swig-ish part of the Makefile. -# It builds the atsc module which we'll load into python +# It builds the atsc modules which we'll load into python or guile # ------------------------------------------------------------------------ TOP_SWIG_IFILES = \ @@ -233,11 +233,4 @@ atsc_pythondir_category = \ atsc_la_swig_libadd = \ libgnuradio-atsc.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES += $(swig_built_sources) -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif -- cgit