[Commit-gnuradio] r7648 - in gnuradio/branches/developers/michaelld/build_config: . usrp/firmware/lib usrp/firmware/src/usrp2

[michaelld]

Author: michaelld
Date: 2008-02-12 07:36:25 -0700 (Tue, 12 Feb 2008)
New Revision: 7648

Modified:
   gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in
   
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
   
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
Log:
Changed AM_CPPFLAGS to FW_INCLUDES for commands .c.rel in USRP
firmware.

Modified top-level run_tests.sh script to execute code for changing
the library search path in Darwin (DYLD_LIBRARY_PATH) or Windows
(PATH) on those host OSs only, not on other host OSs.



Modified: gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in 
2008-02-12 08:27:35 UTC (rev 7647)
+++ gnuradio/branches/developers/michaelld/build_config/run_tests.sh.in 
2008-02-12 14:36:25 UTC (rev 7648)
@@ -78,47 +78,55 @@
 # Add 'mylibdir' to the start of the library load path, to get local
 # (to this component) created libraries
 
-# For OS/X
-if [ "$DYLD_LIBRARY_PATH" = "" ]
-then
-    DYLD_LIBRARY_PATH=$mylibdir
-else
-    DYLD_LIBRARY_PATH=$mylibdir:$DYLD_LIBRARY_PATH
-fi
+# Where to find pre-installed libraries
address@hidden@
 
-# For Win32
-if [ "$PATH" = "" ]
+# Special Code for executing on Darwin / Mac OS X only
+if [ "@FUSB_TECH@" = "darwin" ]
 then
-    PATH=$mylibdir
-else
-    PATH=$mylibdir:$PATH
+    if [ "$DYLD_LIBRARY_PATH" = "" ]
+    then
+       DYLD_LIBRARY_PATH=$mylibdir
+    else
+       DYLD_LIBRARY_PATH=$mylibdir:$DYLD_LIBRARY_PATH
+    fi
+    # DYLD_LIBRARY_PATH will not be empty now
+    # Add the grlibdir paths to the front of any library load variable
+    if [ "$grlibdir" != "" ]
+    then
+       DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
+    fi
+    # Add the withdirs paths to the end of any library load variable
+    if [ "$withlibdirs" != "" ]
+    then
+       DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
+    fi
+    export DYLD_LIBRARY_PATH
 fi
 
-# DYLD_LIBRARY_PATH and PATH will not be empty now
-
-# Add the grlibdir paths to the front of any library load variable
-if [ "$grlibdir" != "" ]
+# Special Code for executing on Win32 variants only
+if [ "@FUSB_TECH@" = "win32" ]
 then
-    # For OS/X
-    DYLD_LIBRARY_PATH=$grlibdir:$DYLD_LIBRARY_PATH
-    # For Win32
-    PATH=$grlibdir:$PATH
+    if [ "$PATH" = "" ]
+    then
+       PATH=$mylibdir
+    else
+       PATH=$mylibdir:$PATH
+    fi
+    # PATH will not be empty now
+    # Add the grlibdir paths to the front of any library load variable
+    if [ "$grlibdir" != "" ]
+    then
+       PATH=$grlibdir:$PATH
+    fi
+    # Add the withdirs paths to the end of any library load variable
+    if [ "$withlibdirs" != "" ]
+    then
+       PATH=$PATH:$withlibdirs
+    fi
+    export PATH
 fi
 
-# Where to find pre-installed libraries
address@hidden@
-
-# Add the withdirs paths to the end of any library load variable
-if [ "$withlibdirs" != "" ]
-then
-    # For OS/X
-    DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$withlibdirs
-    # For Win32
-    PATH=$PATH:$withlibdirs
-fi
-
-export DYLD_LIBRARY_PATH
-
 # Don't load user or system prefs
 GR_DONT_LOAD_PREFS=1
 export GR_DONT_LOAD_PREFS

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
   2008-02-12 08:27:35 UTC (rev 7647)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/lib/Makefile.am
   2008-02-12 14:36:25 UTC (rev 7648)
@@ -30,7 +30,7 @@
 
 
 DEFINES=
-AM_CPPFLAGS=-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 @@
 all: libfx2.lib
 
 .c.rel:
-       $(XCC) $(AM_CPPFLAGS) $(DEFINES) -c $< -o $@
+       $(XCC) $(FW_INCLUDES) $(DEFINES) -c $< -o $@
 
 $(LIBRARY): $(LIBOBJS)
        -rm -f $(LIBRARY)

Modified: 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
     2008-02-12 08:27:35 UTC (rev 7647)
+++ 
gnuradio/branches/developers/michaelld/build_config/usrp/firmware/src/usrp2/Makefile.am
     2008-02-12 14:36:25 UTC (rev 7648)
@@ -54,7 +54,7 @@
 
 
 DEFINES=-DHAVE_USRP2
-AM_CPPFLAGS=-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 @@
 
 
 .c.rel:
-       $(XCC) $(AM_CPPFLAGS) $(DEFINES) \
+       $(XCC) $(FW_INCLUDES) $(DEFINES) \
                -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 .a51.rel: