summaryrefslogtreecommitdiff
path: root/usrp/doc
diff options
context:
space:
mode:
authorEric Blossom <eb@comsec.com>2010-11-24 17:29:11 -0800
committerEric Blossom <eb@comsec.com>2010-11-24 17:29:11 -0800
commitd692a41f98e7b888c745efbb9fcbbb0400f39025 (patch)
tree591782e695d1d29f2dfcfe6390fc21cd99a06a16 /usrp/doc
parent42fe3e571be14e70cb06ea1244125553f0606be4 (diff)
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 'usrp/doc')
-rw-r--r--usrp/doc/Makefile.am2
-rw-r--r--usrp/doc/other/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am
index 6099ebb728..0eddc623a1 100644
--- a/usrp/doc/Makefile.am
+++ b/usrp/doc/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = other
man3dir = $(mandir)/man3
usrp_docdir = $(prefix)/share/doc/usrp-$(DOCVER)
-EXTRA_DIST = \
+EXTRA_DIST += \
Doxyfile.in \
ddc.eps \
ddc.png \
diff --git a/usrp/doc/other/Makefile.am b/usrp/doc/other/Makefile.am
index ca1de7ce00..815553a6dd 100644
--- a/usrp/doc/other/Makefile.am
+++ b/usrp/doc/other/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2010 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,5 +21,5 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+EXTRA_DIST += \
mainpage.dox