[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3286 - in gnuradio/trunk: . gnuradio-core/src/lib/swi
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r3286 - in gnuradio/trunk: . gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-oss/src gr-audio-windows/src gr-gsm-fr-vocoder/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src usrp/firmware/lib usrp/firmware/src/usrp2 usrp/host/swig |
|
Date: |
Mon, 14 Aug 2006 21:39:14 -0600 (MDT) |
Author: jcorgan
Date: 2006-08-14 21:39:14 -0600 (Mon, 14 Aug 2006)
New Revision: 3286
Modified:
gnuradio/trunk/Makefile.common
gnuradio/trunk/configure.ac
gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/trunk/gr-atsc/src/lib/Makefile.am
gnuradio/trunk/gr-audio-oss/src/Makefile.am
gnuradio/trunk/gr-audio-windows/src/Makefile.am
gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/trunk/gr-trellis/src/lib/Makefile.am
gnuradio/trunk/gr-usrp/src/Makefile.am
gnuradio/trunk/gr-video-sdl/src/Makefile.am
gnuradio/trunk/usrp/firmware/lib/Makefile.am
gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
gnuradio/trunk/usrp/host/swig/Makefile.am
Log:
Fixes for ticket:35, allowing use of BSD make instead of GNU make.
Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common 2006-08-15 01:52:35 UTC (rev 3285)
+++ gnuradio/trunk/Makefile.common 2006-08-15 03:39:14 UTC (rev 3286)
@@ -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 like GNU make
+RM=$(RM_PROG) -f
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2006-08-15 01:52:35 UTC (rev 3285)
+++ gnuradio/trunk/configure.ac 2006-08-15 03:39:14 UTC (rev 3286)
@@ -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
Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am 2006-08-15
01:52:35 UTC (rev 3285)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am 2006-08-15
03:39:14 UTC (rev 3286)
@@ -83,7 +83,7 @@
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_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 $@
# ----------------------------------------------------------------
Modified: gnuradio/trunk/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/lib/Makefile.am 2006-08-15 01:52:35 UTC (rev
3285)
+++ gnuradio/trunk/gr-atsc/src/lib/Makefile.am 2006-08-15 03:39:14 UTC (rev
3286)
@@ -221,7 +221,7 @@
$(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 @@
-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 = \
Modified: gnuradio/trunk/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/src/Makefile.am 2006-08-15 01:52:35 UTC (rev
3285)
+++ gnuradio/trunk/gr-audio-oss/src/Makefile.am 2006-08-15 03:39:14 UTC (rev
3286)
@@ -32,7 +32,7 @@
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_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:
Modified: gnuradio/trunk/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-windows/src/Makefile.am 2006-08-15 01:52:35 UTC
(rev 3285)
+++ gnuradio/trunk/gr-audio-windows/src/Makefile.am 2006-08-15 03:39:14 UTC
(rev 3286)
@@ -32,7 +32,7 @@
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_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
Modified: gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am 2006-08-15
01:52:35 UTC (rev 3285)
+++ gnuradio/trunk/gr-gsm-fr-vocoder/src/lib/Makefile.am 2006-08-15
03:39:14 UTC (rev 3286)
@@ -44,7 +44,7 @@
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 @@
-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 = \
Modified: gnuradio/trunk/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2006-08-15 01:52:35 UTC
(rev 3285)
+++ gnuradio/trunk/gr-trellis/src/lib/Makefile.am 2006-08-15 03:39:14 UTC
(rev 3286)
@@ -43,7 +43,7 @@
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 @@
$(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 = \
Modified: gnuradio/trunk/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-usrp/src/Makefile.am 2006-08-15 01:52:35 UTC (rev
3285)
+++ gnuradio/trunk/gr-usrp/src/Makefile.am 2006-08-15 03:39:14 UTC (rev
3286)
@@ -32,7 +32,7 @@
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_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 = \
Modified: gnuradio/trunk/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-video-sdl/src/Makefile.am 2006-08-15 01:52:35 UTC (rev
3285)
+++ gnuradio/trunk/gr-video-sdl/src/Makefile.am 2006-08-15 03:39:14 UTC (rev
3286)
@@ -32,7 +32,7 @@
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_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
Modified: gnuradio/trunk/usrp/firmware/lib/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/lib/Makefile.am 2006-08-15 01:52:35 UTC
(rev 3285)
+++ gnuradio/trunk/usrp/firmware/lib/Makefile.am 2006-08-15 03:39:14 UTC
(rev 3286)
@@ -57,13 +57,9 @@
all: libfx2.lib
-%.rel : %.c
+.c.rel:
$(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
-%.rel : %.a51
- $(XAS) $<
-
-
$(LIBRARY): $(LIBOBJS)
-rm -f $(LIBRARY)
touch $(LIBRARY)
Modified: gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am 2006-08-15 01:52:35 UTC
(rev 3285)
+++ gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am 2006-08-15 03:39:14 UTC
(rev 3286)
@@ -90,11 +90,11 @@
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 @@
$(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 $@
Modified: gnuradio/trunk/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/swig/Makefile.am 2006-08-15 01:52:35 UTC (rev
3285)
+++ gnuradio/trunk/usrp/host/swig/Makefile.am 2006-08-15 03:39:14 UTC (rev
3286)
@@ -71,7 +71,7 @@
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 = \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3286 - in gnuradio/trunk: . gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-oss/src gr-audio-windows/src gr-gsm-fr-vocoder/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src usrp/firmware/lib usrp/firmware/src/usrp2 usrp/host/swig,
jcorgan <=