diff options
| author | michaelld | 2008-02-21 19:16:45 +0000 |
|---|---|---|
| committer | michaelld | 2008-02-21 19:16:45 +0000 |
| commit | 776da31eb84e146a8adf1e3ca7e017c1d9992ce3 (patch) | |
| tree | e992059b2d7a647fce943469c704a505a2819bed /gr-gsm-fr-vocoder/src/lib | |
| parent | fd7f6c8cfacb4afaca28b22325f450342edd5218 (diff) | |
| download | gnuradio-776da31eb84e146a8adf1e3ca7e017c1d9992ce3.tar.gz gnuradio-776da31eb84e146a8adf1e3ca7e017c1d9992ce3.tar.bz2 gnuradio-776da31eb84e146a8adf1e3ca7e017c1d9992ce3.zip | |
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 'gr-gsm-fr-vocoder/src/lib')
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index bbfbf8f80..a53813c6e 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -30,7 +30,7 @@ SUBDIRS = gsm . ourpythondir = $(grpythondir)/vocoder ourlibdir = $(grpyexecdir)/vocoder -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am index d72eb896e..d0872ff39 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am @@ -43,7 +43,7 @@ LTP_CUT = OPTIONS = $(SASR) $(MULHACK) $(FAST) $(LTP_CUT) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \ +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \ $(OPTIONS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libgsm.la |