summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2006-08-04 03:03:30 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2006-08-04 03:03:30 +0000
commit542c00327b1846d5816d76f87e4624cdb5c9a7d6 (patch)
treea7b3b8b35f585a036c7293ef601c4c0f938cd223
parent559f82a0d10f604b0b27cfb8663d93b1625dbd8b (diff)
Adjusted makefiles to accommodate r3133.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3134 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--Makefile.am2
-rw-r--r--TODO.build21
-rw-r--r--gnuradio-core/Makefile.am4
-rw-r--r--gnuradio-examples/Makefile.am1
4 files changed, 12 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am
index 883a490a28..94d10231e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,6 +24,6 @@ include $(top_srcdir)/Makefile.common
EXTRA_DIST = \
bootstrap \
configure \
- config.h.in
+ config.h.in
SUBDIRS = @subdirs@
diff --git a/TODO.build b/TODO.build
index 43bdd57ccb..4a2122be2e 100644
--- a/TODO.build
+++ b/TODO.build
@@ -13,10 +13,6 @@ dtools:
* No checking or testing done in this directory.
-gnuradio-core:
-
-* NEWS, README, and TODO are stale.
-
gnuradio-core/doc:
* Make hasn't been tested yet in this directory.
@@ -45,27 +41,30 @@ this correct?
gnuradio-examples:
-* AUTHORS, README and README.hacking are stale
-
* Some directories don't have Makefile.am's
gnuradio-examples/python/gmsk2:
* Not all examples are in Makefile.am
-usrp:
-
-* README is stale
-
usrp/doc:
* Make not tested in this directory
usrp/firmware/include:
-* Refactor include directory specification in Makefile.am into Makefile.common for use elsewhere
+* Refactor include directory specification in Makefile.am into
+Makefile.common for use elsewhere
usrp/firmware/lib:
* Use refactored include directory specification from Makefile.common
+gr-usrp/src:
+
+* Use refactored gnuradio.i specification from Makefile.common
+
+* USRP_LIBS and USRP_INCLUDES are hardcoded. These used to come out of
+PKGCONFIG in the old system.
+
+* Use common run_tests.in
diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
index b4b619b8b7..46af7c92c5 100644
--- a/gnuradio-core/Makefile.am
+++ b/gnuradio-core/Makefile.am
@@ -23,9 +23,7 @@ include $(top_srcdir)/Makefile.common
EXTRA_DIST = \
gnuradio-core.conf \
- gnuradio-core.pc.in \
- README.hacking \
- README-win32-mingw-short.txt
+ gnuradio-core.pc.in
SUBDIRS = src doc
diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am
index 2f5d322dfa..5da68b9dd2 100644
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -21,5 +21,4 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = README README.hacking
SUBDIRS = python