[Commit-gnuradio] r3840 - in gnuradio/branches/releases/3.0/gr-howto-write-a-block: . doc

[jcorgan]

Author: jcorgan
Date: 2006-10-23 13:37:35 -0600 (Mon, 23 Oct 2006)
New Revision: 3840

Modified:
   gnuradio/branches/releases/3.0/gr-howto-write-a-block/Makefile.common
   gnuradio/branches/releases/3.0/gr-howto-write-a-block/configure.ac
   gnuradio/branches/releases/3.0/gr-howto-write-a-block/doc/Makefile.am
Log:
Applied changeset r3835 on trunk to release branch.

Modified: gnuradio/branches/releases/3.0/gr-howto-write-a-block/Makefile.common
===================================================================
--- gnuradio/branches/releases/3.0/gr-howto-write-a-block/Makefile.common       
2006-10-23 19:34:50 UTC (rev 3839)
+++ gnuradio/branches/releases/3.0/gr-howto-write-a-block/Makefile.common       
2006-10-23 19:37:35 UTC (rev 3840)
@@ -36,3 +36,8 @@
 # swig flags
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR)
+
+# Don't assume that make predefines $(RM), because BSD make does
+# not. We define it now in configure.ac using AM_PATH_PROG, but now
+# here have to add a -f to be like GNU make.
+RM=$(RM_PROG) -f

Modified: gnuradio/branches/releases/3.0/gr-howto-write-a-block/configure.ac
===================================================================
--- gnuradio/branches/releases/3.0/gr-howto-write-a-block/configure.ac  
2006-10-23 19:34:50 UTC (rev 3839)
+++ gnuradio/branches/releases/3.0/gr-howto-write-a-block/configure.ac  
2006-10-23 19:37:35 UTC (rev 3840)
@@ -36,6 +36,7 @@
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PATH_PROG([RM_PROG], [rm])
 
 AC_LIBTOOL_WIN32_DLL
 AC_ENABLE_SHARED       dnl do build shared libraries

Modified: gnuradio/branches/releases/3.0/gr-howto-write-a-block/doc/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gr-howto-write-a-block/doc/Makefile.am       
2006-10-23 19:34:50 UTC (rev 3839)
+++ gnuradio/branches/releases/3.0/gr-howto-write-a-block/doc/Makefile.am       
2006-10-23 19:37:35 UTC (rev 3840)
@@ -72,7 +72,7 @@
 # ----------------------------------------------------------------
 
 clean:
-       -rm -f $(TARGETS) $(BUILT_XML_FILES)
+       -${RM} -f $(TARGETS) $(BUILT_XML_FILES)
 
 %.html : %.xml
        xmlto html-nochunks $<