diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-26 23:39:17 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-26 23:39:17 +0000 |
| commit | 503efe1fbe3822979b8aa3c868d3d13fbeb9af7f (patch) | |
| tree | a3312f065b8865c473d2151f70a8d6ee1992563d /gr-radar-mono/src | |
| parent | f1c079534256ec7e1cd2bbf1360bec15c539d87c (diff) | |
Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-radar-mono/src')
| -rw-r--r-- | gr-radar-mono/src/fpga/top/Makefile.am | 30 | ||||
| -rw-r--r-- | gr-radar-mono/src/python/Makefile.am | 10 |
2 files changed, 11 insertions, 29 deletions
diff --git a/gr-radar-mono/src/fpga/top/Makefile.am b/gr-radar-mono/src/fpga/top/Makefile.am index f964106c52..606aa6c445 100644 --- a/gr-radar-mono/src/fpga/top/Makefile.am +++ b/gr-radar-mono/src/fpga/top/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,35 +21,21 @@ include $(top_srcdir)/Makefile.common -datadir = $(prefix)/share/usrp - RBFS = usrp_radar_mono.rbf +rbf2datadir = $(prefix)/share/usrp/rev2 +dist_rbf2data_DATA = $(RBFS) + +rbf4datadir = $(prefix)/share/usrp/rev4 +dist_rbf4data_DATA = $(RBFS) + EXTRA_DIST = \ usrp_radar_mono.csf \ usrp_radar_mono.esf \ usrp_radar_mono.psf \ usrp_radar_mono.qpf \ usrp_radar_mono.qsf \ - usrp_radar_mono.v \ - $(RBFS) - -install-data-local: - @for file in $(RBFS); do \ - echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file"; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev2/$$file; \ - echo "$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file"; \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/rev4/$$file; \ - done - -uninstall-local: - @for file in $(RBFS); do \ - echo "$(RM) $(DESTDIR)$(datadir)/rev2/$$file"; \ - $(RM) $(DESTDIR)$(datadir)/rev2/$$file; \ - echo "$(RM) $(DESTDIR)$(datadir)/rev4/$$file"; \ - $(RM) $(DESTDIR)$(datadir)/rev4/$$file; \ - done - + usrp_radar_mono.v MOSTLYCLEANFILES = \ db/* \ diff --git a/gr-radar-mono/src/python/Makefile.am b/gr-radar-mono/src/python/Makefile.am index 6cc80e9f74..366e817643 100644 --- a/gr-radar-mono/src/python/Makefile.am +++ b/gr-radar-mono/src/python/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -24,14 +24,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -EXTRA_DIST = \ - radar_mono.py \ +dist_bin_SCRIPTS = \ usrp_radar_mono.py -bin_SCRIPTS = \ - usrp_radar_mono.py - -ourpython_PYTHON = \ +dist_ourpython_PYTHON = \ radar_mono.py MOSTLYCLEANFILES = *~ *.pyc *.pyo |