[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10508 - in gnuradio/branches/developers/michaelld/fix
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r10508 - in gnuradio/branches/developers/michaelld/fix_local_data_install: config gr-radar-mono/src/fpga/top gr-sounder/src/fpga/top gr-trellis/doc gr-trellis/src/examples usrp/fpga/rbf usrp/fpga/rbf/rev2 usrp/fpga/rbf/rev4 |
|
Date: |
Wed, 25 Feb 2009 13:46:35 -0700 (MST) |
Author: michaelld
Date: 2009-02-25 13:46:34 -0700 (Wed, 25 Feb 2009)
New Revision: 10508
Added:
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev2/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev4/Makefile.am
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/config/grc_usrp.m4
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/fpga/top/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/fpga/top/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/doc/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/Makefile.am
Log:
Initial changes to remove use of "install-data-local" and related
rules. Passes "make check" on OSX and Ubuntu. WIP: Still more
chnages forthcoming.
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/config/grc_usrp.m4
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/config/grc_usrp.m4
2009-02-25 19:33:46 UTC (rev 10507)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/config/grc_usrp.m4
2009-02-25 20:46:34 UTC (rev 10508)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software
Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -107,6 +107,8 @@
usrp/firmware/src/usrp2/Makefile \
usrp/fpga/Makefile \
usrp/fpga/rbf/Makefile \
+ usrp/fpga/rbf/rev2/Makefile \
+ usrp/fpga/rbf/rev4/Makefile \
])
GRC_BUILD_CONDITIONAL(usrp)
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/fpga/top/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/fpga/top/Makefile.am
2009-02-25 19:33:46 UTC (rev 10507)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/fpga/top/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -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,36 +21,22 @@
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)
+ usrp_radar_mono.v
-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
-
-
MOSTLYCLEANFILES = \
db/* \
*.rpt \
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/fpga/top/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/fpga/top/Makefile.am
2009-02-25 19:33:46 UTC (rev 10507)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/fpga/top/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -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,36 +21,22 @@
include $(top_srcdir)/Makefile.common
-datadir = $(prefix)/share/usrp
+RBFS = usrp_sounder.rbf
-RBFS = usrp_sounder.rbf
+rbf2datadir = $(prefix)/share/usrp/rev2
+dist_rbf2data_DATA = $(RBFS)
+rbf4datadir = $(prefix)/share/usrp/rev4
+dist_rbf4data_DATA = $(RBFS)
+
EXTRA_DIST = \
config.vh \
usrp_sounder.v \
usrp_sounder.csf \
usrp_sounder.esf \
usrp_sounder.psf \
- usrp_sounder.qpf \
- $(RBFS)
+ usrp_sounder.qpf
-
-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
-
MOSTLYCLEANFILES = \
db/* \
*.rpt \
@@ -61,4 +47,3 @@
*.pin \
*.sof \
*~
-
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/doc/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/doc/Makefile.am
2009-02-25 19:33:46 UTC (rev 10507)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/doc/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -40,6 +40,9 @@
BUILT_XML_FILES =
+htmldocdir = $(gr_docdir)/html
+htmldoc_DATA = $(HTML_FILES)
+
# ----------------------------------------------------------------
gr-trellis.html : gr-trellis.xml
@@ -49,19 +52,5 @@
%.xml : % make_numbered_listing.py
./make_numbered_listing.py $<
-install-data-local:
- mkdir -p $(DESTDIR)$(gr_docdir)/html
- @for i in $(HTML_FILES); do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)/html"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)/html; \
- done
-
-uninstall-local:
- @for i in $(HTML_FILES); do \
- echo "$(RM) $(DESTDIR)$(gr_docdir)/$$i;"; \
- $(RM) $(DESTDIR)$(gr_docdir)/$$i; \
- done
- $(RM) -fr $(DESTDIR)$(gr_docdir)/html
-
clean-local:
$(RM) -fr $(HTML_FILES) *~
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
2009-02-25 19:33:46 UTC (rev 10507)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,7 +23,8 @@
SUBDIRS = fsm_files
-EXTRA_DIST = \
+ourdatadir = $(exampledir)/trellis
+dist_ourdata_DATA = \
README \
fsm_utils.py \
test_tcm.py \
@@ -40,10 +41,6 @@
test_turbo_equalization1.py \
test_turbo_equalization2.py
-
-ourdatadir = $(exampledir)/trellis
-ourdata_DATA = $(EXTRA_DIST)
-
# Make example scripts with #! executable
install-data-local: install-ourdataDATA
for i in `find $(ourdatadir) -type f ! -perm 755`; do \
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/Makefile.am
2009-02-25 19:33:46 UTC (rev 10507)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,35 +19,4 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/Makefile.common
-
-datadir = $(prefix)/share/usrp
-
-rbfs = \
- rev2/std_2rxhb_2tx.rbf \
- rev2/std_4rx_0tx.rbf \
- rev2/inband_1rxhb_1tx.rbf \
- rev2/inband_2rxhb_2tx.rbf \
- rev4/std_2rxhb_2tx.rbf \
- rev4/std_4rx_0tx.rbf \
- rev4/inband_1rxhb_1tx.rbf \
- rev4/inband_2rxhb_2tx.rbf \
- rev2/multi_2rxhb_2tx.rbf \
- rev4/multi_2rxhb_2tx.rbf
-
-
-EXTRA_DIST = \
- $(rbfs)
-
-
-install-data-local:
- @for file in $(rbfs); do \
- echo "$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/$$file"; \
- $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/$$file; \
- done
-
-uninstall-local:
- @for file in $(rbfs); do \
- echo "$(RM) $(DESTDIR)$(datadir)/$$file"; \
- $(RM) $(DESTDIR)$(datadir)/$$file; \
- done
+SUBDIRS = rev2 rev4
Added:
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev2/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev2/Makefile.am
(rev 0)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev2/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+rbf2datadir = $(prefix)/share/usrp/rev2
+
+dist_rbf2data_DATA = \
+ std_2rxhb_2tx.rbf \
+ std_4rx_0tx.rbf \
+ inband_1rxhb_1tx.rbf \
+ inband_2rxhb_2tx.rbf \
+ multi_2rxhb_2tx.rbf
Added:
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev4/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev4/Makefile.am
(rev 0)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev4/Makefile.am
2009-02-25 20:46:34 UTC (rev 10508)
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+rbf4datadir = $(prefix)/share/usrp/rev4
+
+dist_rbf4data_DATA = \
+ std_2rxhb_2tx.rbf \
+ std_4rx_0tx.rbf \
+ inband_1rxhb_1tx.rbf \
+ inband_2rxhb_2tx.rbf \
+ multi_2rxhb_2tx.rbf
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10508 - in gnuradio/branches/developers/michaelld/fix_local_data_install: config gr-radar-mono/src/fpga/top gr-sounder/src/fpga/top gr-trellis/doc gr-trellis/src/examples usrp/fpga/rbf usrp/fpga/rbf/rev2 usrp/fpga/rbf/rev4,
michaelld <=