diff options
| author | gdt | 2006-10-23 14:58:05 +0000 |
|---|---|---|
| committer | gdt | 2006-10-23 14:58:05 +0000 |
| commit | 62cf5126cd25e3d7e67daefb55d69c8e9526dc86 (patch) | |
| tree | 2255a189c947b84f04ab0d669d736f6c44cafefb /gr-howto-write-a-block | |
| parent | 2efbbf1f2c3bc7deb4c6998e4b7235552c140506 (diff) | |
| download | gnuradio-62cf5126cd25e3d7e67daefb55d69c8e9526dc86.tar.gz gnuradio-62cf5126cd25e3d7e67daefb55d69c8e9526dc86.tar.bz2 gnuradio-62cf5126cd25e3d7e67daefb55d69c8e9526dc86.zip | |
Search for rm, and substitute it. Avoids assumption that make
predefines RM (BSD make does not).
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3835 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-howto-write-a-block')
| -rw-r--r-- | gr-howto-write-a-block/Makefile.common | 5 | ||||
| -rw-r--r-- | gr-howto-write-a-block/configure.ac | 1 | ||||
| -rw-r--r-- | gr-howto-write-a-block/doc/Makefile.am | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common index 31a31232a..0160c354a 100644 --- a/gr-howto-write-a-block/Makefile.common +++ b/gr-howto-write-a-block/Makefile.common @@ -36,3 +36,8 @@ grpyexecdir = $(pyexecdir)/gnuradio # 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 diff --git a/gr-howto-write-a-block/configure.ac b/gr-howto-write-a-block/configure.ac index 7035599d5..9cf72f093 100644 --- a/gr-howto-write-a-block/configure.ac +++ b/gr-howto-write-a-block/configure.ac @@ -36,6 +36,7 @@ GR_PROG_AS 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 diff --git a/gr-howto-write-a-block/doc/Makefile.am b/gr-howto-write-a-block/doc/Makefile.am index 07e6f5961..5ca6a5a39 100644 --- a/gr-howto-write-a-block/doc/Makefile.am +++ b/gr-howto-write-a-block/doc/Makefile.am @@ -72,7 +72,7 @@ howto_square2_ff.h.xml: $(top_srcdir)/src/lib/howto_square2_ff.h make_numbered_l # ---------------------------------------------------------------- clean: - -rm -f $(TARGETS) $(BUILT_XML_FILES) + -${RM} -f $(TARGETS) $(BUILT_XML_FILES) %.html : %.xml xmlto html-nochunks $< |