diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-15 03:39:14 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-15 03:39:14 +0000 |
| commit | c7aab5e1c9cbd2e1624d6cfbe92ca6aba70e7f62 (patch) | |
| tree | 2e4dfb93b251f1fdd08cecac57d4706689d97518 /usrp | |
| parent | 4e8b03a868354c8c8ef9c72b021bf52a53615aee (diff) | |
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
Diffstat (limited to 'usrp')
| -rw-r--r-- | usrp/firmware/lib/Makefile.am | 6 | ||||
| -rw-r--r-- | usrp/firmware/src/usrp2/Makefile.am | 8 | ||||
| -rw-r--r-- | usrp/host/swig/Makefile.am | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/usrp/firmware/lib/Makefile.am b/usrp/firmware/lib/Makefile.am index 3ddafcf1bf..47fc6f7300 100644 --- 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 41664a2da2..e2b9f9e612 100644 --- 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 2a1f5b8a5d..78459515ee 100644 --- 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 = \ |