diff options
| -rw-r--r-- | config/grc_gr_digital.m4 | 3 | ||||
| -rw-r--r-- | gr-digital/lib/Makefile.am | 21 | ||||
| -rw-r--r-- | gr-trellis/src/lib/Makefile.am | 8 |
3 files changed, 8 insertions, 24 deletions
diff --git a/config/grc_gr_digital.m4 b/config/grc_gr_digital.m4 index d7c1d605f..22ecd41b3 100644 --- a/config/grc_gr_digital.m4 +++ b/config/grc_gr_digital.m4 @@ -26,7 +26,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[ if test $passed != with; then dnl how and where to find INCLUDES and LA and such gr_digital_INCLUDES="\ --I\${abs_top_srcdir}/gr-digital/lib \ +-I\${abs_top_srcdir}/gr-digital/include \ -I\${abs_top_srcdir}/gr-digital/hier \ -I\${abs_top_srcdir}/gr-digital/swig" gr_digital_LA="\${abs_top_builddir}/gr-digital/lib/libgnuradio-core.la" @@ -44,6 +44,7 @@ AC_DEFUN([GRC_GR_DIGITAL],[ gr-digital/gnuradio-digital.pc \ gr-digital/apps/Makefile \ gr-digital/grc/Makefile \ + gr-digital/include/Makefile \ gr-digital/lib/Makefile \ gr-digital/hier/Makefile \ gr-digital/python/Makefile \ diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am index 60db19821..dc86bbd5b 100644 --- a/gr-digital/lib/Makefile.am +++ b/gr-digital/lib/Makefile.am @@ -21,25 +21,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) - -# These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - digital_binary_slicer_fb.h \ - digital_clock_recovery_mm_cc.h \ - digital_clock_recovery_mm_ff.h \ - digital_constellation.h \ - digital_constellation_receiver_cb.h \ - digital_constellation_decoder_cb.h \ - digital_correlate_access_code_bb.h \ - digital_costas_loop_cc.h \ - digital_cma_equalizer_cc.h \ - digital_crc32.h \ - digital_fll_band_edge_cc.h \ - digital_lms_dd_equalizer_cc.h \ - digital_kurtotic_equalizer_cc.h \ - digital_metric_type.h \ - digital_mpsk_receiver_cc.h +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(GR_DIGITAL_INCLUDES) $(WITH_INCLUDES) lib_LTLIBRARIES = libgnuradio-digital.la diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 795ac28b4..f358cd523 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 @@ -162,8 +163,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 |