diff options
| author | Josh Blum | 2011-09-28 22:59:51 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-28 22:59:51 -0700 |
| commit | b06328b4adee941fe62f12a848cc903097711bdd (patch) | |
| tree | fa8b6d5aaadd6bb70786e57891b52a7a17b0b3f6 /gr-trellis/src | |
| parent | 3f7db0afa99caeecb18428d7514dadd380d88d56 (diff) | |
| parent | 3e8c3125da6234c4d1f8c0eaf869bc86923cb292 (diff) | |
| download | gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.gz gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.tar.bz2 gnuradio-b06328b4adee941fe62f12a848cc903097711bdd.zip | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gr-digital/lib/Makefile.am
gr-digital/python/__init__.py
Diffstat (limited to 'gr-trellis/src')
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 2c50dd635..435a093d6 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -29,8 +29,9 @@ EXTRA_DIST += \ trellis.test -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) \ - -I$(abs_top_srcdir)/gr-digital/lib -I/home +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(GR_DIGITAL_INCLUDES) \ + $(WITH_INCLUDES) # ---------------------------------------------------------------- # these scripts generate trellis codes from template files @@ -166,8 +167,7 @@ BUILT_SOURCES += $(python_built_sources) # Location of non-standard SWIG interface files trellis_swig_args = \ - -I$(top_srcdir)/gr-digital/lib \ - -I$(top_srcdir)/gr-digital/swig + $(GR_DIGITAL_INCLUDES) if GUILE TESTS += run_guile_tests |