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

firmware/lib/Makefile.am

@@ -30,7 +30,7 @@ EXTRA_DIST = 		\
 
 
 DEFINES=
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include
+FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include
 
 # with EA = 0, the FX2 implements a portion of the 8051 "external memory"
 # on chip.  This memory is mapped like this:
@@ -58,7 +58,7 @@ LIBOBJS = 		\
 all: libfx2.lib
 
 .c.rel:
-	$(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
+	$(XCC) $(FW_INCLUDES) $(DEFINES) -c $< -o $@
 
 $(LIBRARY): $(LIBOBJS)
 	-rm -f $(LIBRARY)

firmware/src/usrp2/Makefile.am

@@ -54,7 +54,7 @@ EXTRA_DIST =			\
 
 
 DEFINES=-DHAVE_USRP2
-INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
+FW_INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
          -I$(top_srcdir)/usrp/firmware/src/usrp2 \
 	 -I$(top_srcdir)/usrp/firmware/src/common \
 	 -I$(top_builddir)/usrp/firmware/src/common
@@ -91,7 +91,7 @@ noinst_SCRIPTS = 		\
 
 
 .c.rel:
-	$(XCC) $(INCLUDES) $(DEFINES) \
+	$(XCC) $(FW_INCLUDES) $(DEFINES) \
 		-c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 .a51.rel:

host/apps-inband/Makefile.am

@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = 	\
+AM_CPPFLAGS = 	\
 	$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
 	$(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) \
 	$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)

host/apps/Makefile.am

@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
 	   $(WITH_INCLUDES)
 
 bin_PROGRAMS =				\

host/lib/inband/Makefile.am

@@ -20,7 +20,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = 	\
+AM_CPPFLAGS = 	\
 	$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
 	$(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
 	-I$(srcdir)/../../apps-inband $(WITH_INCLUDES)

host/lib/legacy/Makefile.am

@@ -32,10 +32,10 @@ libusrp_la_common_LIBADD = 		\
 
 # darwin fusb requires omnithreads
 if FUSB_TECH_darwin
-INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
 libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
 else
-INCLUDES = $(common_INCLUDES) $(WITH_INCLUDES)
+AM_CPPFLAGS = $(common_INCLUDES) $(WITH_INCLUDES)
 libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
 endif
 

host/swig/Makefile.am

@@ -25,7 +25,7 @@ ourpythondir = $(usrppythondir)
 ourlibdir    = $(usrppyexecdir)
 
 
-INCLUDES = $(USRP_INCLUDES) 		\
+AM_CPPFLAGS = $(USRP_INCLUDES) 		\
 	   $(PYTHON_CPPFLAGS) 		\
 	   -I$(srcdir)			\
 	   $(WITH_INCLUDES)
@@ -53,7 +53,7 @@ ourpython_PYTHON = 			\
 	usrp_prims.py			
 
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
 	$(WITH_INCLUDES)