diff options
| author | michaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-21 19:16:45 +0000 |
|---|---|---|
| committer | michaelld <michaelld@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-21 19:16:45 +0000 |
| commit | 776da31eb84e146a8adf1e3ca7e017c1d9992ce3 (patch) | |
| tree | e992059b2d7a647fce943469c704a505a2819bed /gnuradio-core | |
| parent | fd7f6c8cfacb4afaca28b22325f450342edd5218 (diff) | |
Merged build_config branch into trunk:
1) Modified top-level run_tests.sh script:
a) to execute code for setting or changing the library search path in
Darwin (DYLD_LIBRARY_PATH) or Windows (PATH) on those host OSs
only, not on other host OSs.
b) Added local (to the component making check) library paths to those
same search paths, since libtool doesn't do it (unlike in Linux).
2) In all AM Makefiles -except those dealing with USRP firmware-,
changes INCLUDES to AM_CPPFLAGS since the former is deprecated.
3) Changed AM_CPPFLAGS to FW_INCLUDES for commands .c.rel in USRP
firmware.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7769 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/src/lib/filter/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/gengen/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/reed-solomon/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/tests/Makefile.am | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 22d5aa071f..93834d742a 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -26,7 +26,7 @@ include $(top_srcdir)/Makefile.common # other performance critical items # -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libfilter.la libfilter-qa.la diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index bc94d3b0b2..8a16692b05 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libgeneral.la libgeneral-qa.la diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index 5282ad6630..b142905bc0 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) #noinst_LTLIBRARIES = libgengen.la libgengen-qa.la noinst_LTLIBRARIES = libgengen.la diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am index c946837359..c307be133e 100644 --- a/gnuradio-core/src/lib/io/Makefile.am +++ b/gnuradio-core/src/lib/io/Makefile.am @@ -22,7 +22,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libio.la diff --git a/gnuradio-core/src/lib/reed-solomon/Makefile.am b/gnuradio-core/src/lib/reed-solomon/Makefile.am index 1820818823..b7bd939b0c 100644 --- a/gnuradio-core/src/lib/reed-solomon/Makefile.am +++ b/gnuradio-core/src/lib/reed-solomon/Makefile.am @@ -25,7 +25,7 @@ include $(top_srcdir)/Makefile.common # If you need the int versions too, please figure out how to add them *cleanly* to # this Makefile.am. -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) TESTS = rstest diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am index f6b744e480..d84128cbdf 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.am +++ b/gnuradio-core/src/lib/runtime/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) noinst_LTLIBRARIES = libruntime.la libruntime-qa.la diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 8c77d39b27..d3060e9d9b 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common grgrpythondir = $(grpythondir)/gr grgrlibdir = $(grpyexecdir)/gr -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \ +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \ $(WITH_INCLUDES) EXTRA_DIST = gen-swig-bug-fix @@ -69,7 +69,7 @@ BUILT_SOURCES = \ gnuradio_swig_py_io.h \ gnuradio_swig_bug_workaround.h -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \ +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \ $(WITH_INCLUDES) # ---------------------------------------------------------------- diff --git a/gnuradio-core/src/tests/Makefile.am b/gnuradio-core/src/tests/Makefile.am index b3bd86883f..01e35120f4 100644 --- a/gnuradio-core/src/tests/Makefile.am +++ b/gnuradio-core/src/tests/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) # list of programs run by "make check" and "make distcheck" |