[Commit-gnuradio] r3284 - gnuradio/branches/developers/jcorgan/ticket-35

[jcorgan]

Author: jcorgan
Date: 2006-08-14 19:40:22 -0600 (Mon, 14 Aug 2006)
New Revision: 3284

Modified:
   gnuradio/branches/developers/jcorgan/ticket-35/Makefile.common
   gnuradio/branches/developers/jcorgan/ticket-35/configure.ac
Log:
Add explicit setting of RM variable so BSD make can handle. GNU make
defaults this to 'rm -f'; BSD make does not.


Modified: gnuradio/branches/developers/jcorgan/ticket-35/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/Makefile.common      
2006-08-15 00:56:07 UTC (rev 3283)
+++ gnuradio/branches/developers/jcorgan/ticket-35/Makefile.common      
2006-08-15 01:40:22 UTC (rev 3284)
@@ -71,3 +71,7 @@
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
+
+# Fix for BSD make not defining $(RM).  We define it now in configure.ac
+# using AM_PATH_PROG, but now here have to add a -f to be line GNU make
+RM=$(RM_PROG) -f

Modified: gnuradio/branches/developers/jcorgan/ticket-35/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/configure.ac 2006-08-15 
00:56:07 UTC (rev 3283)
+++ gnuradio/branches/developers/jcorgan/ticket-35/configure.ac 2006-08-15 
01:40:22 UTC (rev 3284)
@@ -34,6 +34,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PATH_PROG([RM_PROG], [rm])
 
 AC_LIBTOOL_WIN32_DLL
 dnl AC_DISABLE_SHARED  dnl don't build shared libraries