summaryrefslogtreecommitdiff
path: root/usrp2
diff options
context:
space:
mode:
authorEric Blossom2010-11-24 17:29:11 -0800
committerEric Blossom2010-11-24 17:29:11 -0800
commitd692a41f98e7b888c745efbb9fcbbb0400f39025 (patch)
tree591782e695d1d29f2dfcfe6390fc21cd99a06a16 /usrp2
parent42fe3e571be14e70cb06ea1244125553f0606be4 (diff)
downloadgnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.tar.gz
gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.tar.bz2
gnuradio-d692a41f98e7b888c745efbb9fcbbb0400f39025.zip
Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files.
Diffstat (limited to 'usrp2')
-rw-r--r--usrp2/firmware/Makefile.am2
-rw-r--r--usrp2/firmware/lib/Makefile.am2
-rw-r--r--usrp2/host/Makefile.am2
3 files changed, 3 insertions, 3 deletions
diff --git a/usrp2/firmware/Makefile.am b/usrp2/firmware/Makefile.am
index c75136de1..a5339bb5b 100644
--- a/usrp2/firmware/Makefile.am
+++ b/usrp2/firmware/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007,2008 Free Software Foundation, Inc.
+# Copyright 2007,2008,2010 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am
index d6bb4edc3..2e5f3651f 100644
--- a/usrp2/firmware/lib/Makefile.am
+++ b/usrp2/firmware/lib/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2010 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/usrp2/host/Makefile.am b/usrp2/host/Makefile.am
index b6e30b5ff..13f7cb86a 100644
--- a/usrp2/host/Makefile.am
+++ b/usrp2/host/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = usrp2.pc
-EXTRA_DIST = \
+EXTRA_DIST += \
usrp2.pc.in
SUBDIRS = include lib apps