diff options
| author | jcorgan | 2009-03-14 02:28:41 +0000 |
|---|---|---|
| committer | jcorgan | 2009-03-14 02:28:41 +0000 |
| commit | c3f962a1f0a4132ad643c58774bb69b190dccc49 (patch) | |
| tree | daa59a206d6fde01dc1404197e981927366af0e0 /gnuradio-core/src/lib/gengen | |
| parent | 4eea337c46db44a6ee7560a4552e158421776777 (diff) | |
| download | gnuradio-c3f962a1f0a4132ad643c58774bb69b190dccc49.tar.gz gnuradio-c3f962a1f0a4132ad643c58774bb69b190dccc49.tar.bz2 gnuradio-c3f962a1f0a4132ad643c58774bb69b190dccc49.zip | |
Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/gengen')
| -rw-r--r-- | gnuradio-core/src/lib/gengen/Makefile.am | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index e969eb900..13c821018 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -120,29 +120,13 @@ core_generator = \ gr_moving_average_XX.h.t \ gr_moving_average_XX.i.t -# include the srcdir's Makefile.gen; doing this creates an implicit -# dependency between $(srcdir)/Makefile.in and $(srcdir)/Makefile.gen. -include $(srcdir)/Makefile.gen - # Source built by Python into $(builddir) -python_built_sources = \ +BUILT_SOURCES = \ $(GENERATED_H) \ $(GENERATED_I) \ $(GENERATED_CC) \ gengen_generated.i -BUILT_SOURCES = $(python_built_sources) - -# Required when including Makefile.gen.gen - -STAMPS = -gen_sources = $(BUILT_SOURCES) -gen_sources_deps = $(core_generator) -MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc - -# common way for generating sources from templates, using the above parameters -include $(top_srcdir)/Makefile.gen.gen - # ---------------------------------------------------------------- EXTRA_DIST = \ @@ -151,20 +135,31 @@ EXTRA_DIST = \ libgengen_la_SOURCES = \ $(GENERATED_CC) -#libgengen_qa_la_SOURCES = - grinclude_HEADERS = \ $(GENERATED_H) \ gr_endianness.h \ gr_noise_type.h \ gr_sig_source_waveform.h -noinst_HEADERS = - swiginclude_HEADERS = \ $(GENERATED_I) \ gr_endianness.i \ gengen.i \ gengen_generated.i -CLEANFILES = $(BUILT_SOURCES) *.pyc +# Do creation and inclusion of other Makefiles last + +# include the srcdir's Makefile.gen; doing this creates an implicit +# dependency between $(srcdir)/Makefile.in and $(srcdir)/Makefile.gen. +include $(srcdir)/Makefile.gen + +# common way for generating local Makefile.gen +makefile_gen_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) do_makefile=1 do_sources=0 $(PYTHON) $(srcdir)/generate_all.py +include $(top_srcdir)/Makefile.gen.gen + +# common way for generating sources from templates when using +# BUILT_SOURCES, using parallel build protection. +gen_sources = $(BUILT_SOURCES) +gen_sources_deps = $(core_generator) +par_gen_command = PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) $(PYTHON) $(srcdir)/generate_all.py +include $(top_srcdir)/Makefile.par.gen |