Fixes for ticket:35, allowing use of BSD make instead of GNU make.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3286 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.common b/Makefile.common
index bd25233edb053ec8987e5be38883403e3733f455..3bf752f98f74bd06d520b7aa2d857e258f11fa33 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -71,3 +71,7 @@ USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
 # 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 like GNU make
+RM=$(RM_PROG) -f

diff --git a/configure.ac b/configure.ac
index 9da583cedf88c7cf752029ce4b0a6e952e811ff8..93a521d7176c8f33de1415207bc8e789b426e97e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,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
 dnl AC_DISABLE_SHARED  dnl don't build shared libraries

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 6428936982c16d82e25d442fada34ab98e8036d6..97905557139fce0e901cdf5043f3b802e0266fa5 100644 (file)
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -83,7 +83,7 @@ _gnuradio_swig_python_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 gnuradio_swig_python.py gnuradio_swig_python.h: gnuradio_swig_python.cc
 
 gnuradio_swig_python.cc : gnuradio.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module gnuradio_swig_python -o gnuradio_swig_python.cc $< ;\
+       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module gnuradio_swig_python -o gnuradio_swig_python.cc gnuradio.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_python.Td >gnuradio_swig_python.d; rm -f gnuradio_swig_python.Td; \
             else mv -f gnuradio_swig_python.Td gnuradio_swig_python.d; fi \
@@ -91,7 +91,7 @@ gnuradio_swig_python.cc : gnuradio.i
 
 
 gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc $(srcdir)/gen-swig-bug-fix
-       $(srcdir)/gen-swig-bug-fix $< $@
+       $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@
 
 
 # ----------------------------------------------------------------

diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am
index b625aaabe7ed3e8fb20907d413031a4282f28031..b7285387515c672706f259327762e541b4d15d93 100644 (file)
--- a/gr-atsc/src/lib/Makefile.am
+++ b/gr-atsc/src/lib/Makefile.am
@@ -221,7 +221,7 @@ NON_LOCAL_IFILES =                  \
        $(GNURADIO_I)
 
 LOCAL_IFILES =                                 \
-       atsc.i                          
+       $(top_srcdir)/gr-atsc/src/lib/atsc.i                            
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _atsc shared library
@@ -253,7 +253,7 @@ _atsc_la_LIBADD =                   \
        -lstdc++                        
 
 atsc.cc atsc.py: atsc.i $(ALL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $<
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_IFILES)
 
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS =                  \

diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index 319db7a8ce5aeffe08f7d1f7dac187940c886aac..675fa3c394e2e2fa252dcc914ee982e2e40dcb1b 100644 (file)
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       audio_oss.i                             
+       $(top_srcdir)/gr-audio-oss/src/audio_oss.i
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -75,8 +75,8 @@ _audio_oss_la_LIBADD =                        \
 
 _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-audio_oss.cc audio_oss.py: audio_oss.i $(NON_LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc $<
+audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc $(LOCAL_IFILES)
 
 # Don't distribute output of swig
 dist-hook:

diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am
index 33129b7ac377dcfaf29774edfaafeea9db55d986..f55110b8ac6a5522e03ce43f6fc10b814ccdee87 100644 (file)
--- a/gr-audio-windows/src/Makefile.am
+++ b/gr-audio-windows/src/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       audio_windows.i                         
+       $(top_srcdir)/gr-audio-windows/src/audio_windows.i                              
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -76,8 +76,8 @@ _audio_windows_la_LIBADD =            \
 _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
                             $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
 
-audio_windows.cc audio_windows.py: audio_windows.i
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc $<
+audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc $(LOCAL_IFILES)
 
 
 noinst_PYTHON = qa_audio_windows.py

diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am
index 06ab5caab95ece4df9411a7f5c09ff1e342df523..597cccde59d589cb135c999a3368c6eff28f350b 100644 (file)
--- a/gr-gsm-fr-vocoder/src/lib/Makefile.am
+++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am
@@ -44,7 +44,7 @@ NON_LOCAL_IFILES =                    \
 
 
 LOCAL_IFILES =                                 \
-       gsm_full_rate.i                         
+       $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i                         
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -80,7 +80,7 @@ _gsm_full_rate_la_LIBADD =    \
        -lstdc++                        
 
 gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc $<
+       $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am
index 1b3e66461b4a8a1fa00ac580ab330bb9116472ec..935fe9fbf10bd8e4e8dd45dea80d106c4f3d894c 100644 (file)
--- a/gr-trellis/src/lib/Makefile.am
+++ b/gr-trellis/src/lib/Makefile.am
@@ -43,7 +43,7 @@ NON_LOCAL_IFILES =                    \
 
 
 LOCAL_IFILES =                                 \
-       trellis.i                       
+       $(top_srcdir)/gr-trellis/src/lib/trellis.i                      
 
 
 # These files are built by SWIG.  The first is the C++ glue.
@@ -80,8 +80,8 @@ _trellis_la_LIBADD =                  \
        $(GNURADIO_CORE_LIBS)           \
        -lstdc++                        
 
-trellis.cc trellis.py: trellis.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $<
+trellis.cc trellis.py: $(ALL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 4b502f5daa7d6d791379f1956e88f831eb094270..de64cfd7e8cd4ad1553ca2054e2fe85ed8b8e5c2 100644 (file)
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       usrp1.i                         
+       $(top_srcdir)/gr-usrp/src/usrp1.i                               
 
 NON_LOCAL_IFILES = $(GNURADIO_I)
 
@@ -102,8 +102,8 @@ _usrp1_la_LIBADD =                  \
 _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 
-usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $<
+usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
 
 
 noinst_PYTHON =                                \

diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am
index 4b8723291c07cc647aed0a1d2bda5852d4e71a5d..39d110cb2cfe94057e8f637f9dbc1cd12e180432 100644 (file)
--- a/gr-video-sdl/src/Makefile.am
+++ b/gr-video-sdl/src/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       video_sdl.i                             
+       $(top_srcdir)/gr-video-sdl/src/video_sdl.i                              
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -75,8 +75,8 @@ _video_sdl_la_LIBADD =                        \
 
 _video_sdl_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-video_sdl.cc video_sdl.py: video_sdl.i
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc $<
+video_sdl.cc video_sdl.py: $(ALL_IFILES)
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc $(LOCAL_IFILES)
 
 
 noinst_PYTHON = qa_video_sdl.py

diff --git a/usrp/firmware/lib/Makefile.am b/usrp/firmware/lib/Makefile.am
index 3ddafcf1bf90c0778d2a2b5739979051f33ffd06..47fc6f73003952f11e52d5254d1f23e429c54d8a 100644 (file)
--- a/usrp/firmware/lib/Makefile.am
+++ b/usrp/firmware/lib/Makefile.am
@@ -57,13 +57,9 @@ LIBOBJS =            \
 
 all: libfx2.lib
 
-%.rel : %.c
+.c.rel:
        $(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
 
-%.rel : %.a51
-       $(XAS) $<
-
-
 $(LIBRARY): $(LIBOBJS)
        -rm -f $(LIBRARY)
        touch $(LIBRARY)

diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am
index 41664a2da29d8db38c1ffd9305eb311496e89a9b..e2b9f9e612d18640943255dd05579ce8e307f0ab 100644 (file)
--- a/usrp/firmware/src/usrp2/Makefile.am
+++ b/usrp/firmware/src/usrp2/Makefile.am
@@ -90,11 +90,11 @@ noinst_SCRIPTS =            \
        burn-usrp4-eeprom
 
 
-%.rel : %.c
+.c.rel:
        $(XCC) $(INCLUDES) $(DEFINES) \
                -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
-%.rel : %.a51
+.a51.rel:
        test -f `basename '$<'` || ln -s '$<' .
        test -f ../common/`basename '$<'` -o \
                \! -f `dirname '$<'`/../common/`basename '$<'` \
@@ -108,11 +108,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
        $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
 
 burn-usrp2-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r2 $< > $@
+       $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
        chmod +x $@
 
 burn-usrp4-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r4 $< > $@
+       $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
        chmod +x $@
 
 

diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am
index 2a1f5b8a5d54570de5fc10d4960d0dbf0e53464a..78459515ee1a2ae4e3fcb7469619be153aebf8f4 100644 (file)
--- a/usrp/host/swig/Makefile.am
+++ b/usrp/host/swig/Makefile.am
@@ -71,7 +71,7 @@ _usrp_prims_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 
 prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h ../../firmware/include/fpga_regs_standard.h
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc $<
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i
 
 
 MOSTLYCLEANFILES = \