diff options
Diffstat (limited to 'usrp')
| -rw-r--r-- | usrp/Makefile.am | 4 | ||||
| -rw-r--r-- | usrp/doc/Makefile.am | 2 | ||||
| -rw-r--r-- | usrp/doc/other/Makefile.am | 4 | ||||
| -rw-r--r-- | usrp/host/include/usrp/Makefile.am | 6 | ||||
| -rw-r--r-- | usrp/host/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | usrp/host/misc/Makefile.am | 4 | ||||
| -rw-r--r-- | usrp/host/swig/Makefile.am | 9 |
7 files changed, 13 insertions, 20 deletions
diff --git a/usrp/Makefile.am b/usrp/Makefile.am index c3e529da9..cde72e1eb 100644 --- a/usrp/Makefile.am +++ b/usrp/Makefile.am @@ -19,7 +19,9 @@ # Boston, MA 02110-1301, USA. # -EXTRA_DIST = \ +include $(top_srcdir)/Makefile.common + +EXTRA_DIST += \ usrp.pc.in \ usrp.iss.in \ usrp.inf diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am index 6099ebb72..0eddc623a 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 ca1de7ce0..815553a6d 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 diff --git a/usrp/host/include/usrp/Makefile.am b/usrp/host/include/usrp/Makefile.am index 2aaf66a53..19504313b 100644 --- a/usrp/host/include/usrp/Makefile.am +++ b/usrp/host/include/usrp/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -47,10 +47,8 @@ usrpinclude_HEADERS = \ usrp_subdev_spec.h \ usrp_tune_result.h -EXTRA_DIST = \ +EXTRA_DIST += \ libusb_types.h.in -if PYTHON swiginclude_HEADERS = \ db_base.i -endif diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index b8b60fa98..96ab55821 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -42,11 +42,11 @@ libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS) endif -EXTRA_DIST = \ +EXTRA_DIST += \ std_paths.h.in \ usrp_dbid.dat -BUILT_SOURCES = $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h +BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h BUILT_SOURCES += usrp_dbid.cc \ usrp_dbid.py diff --git a/usrp/host/misc/Makefile.am b/usrp/host/misc/Makefile.am index 45c940f67..935dc74b5 100644 --- a/usrp/host/misc/Makefile.am +++ b/usrp/host/misc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2003,2004 Free Software Foundation, Inc. +# Copyright 2003,2004,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ getopt.c getopt.h \ gettimeofday.c \ tempname.c mkstemp.c \ diff --git a/usrp/host/swig/Makefile.am b/usrp/host/swig/Makefile.am index c846f267b..5baeff4cb 100644 --- a/usrp/host/swig/Makefile.am +++ b/usrp/host/swig/Makefile.am @@ -20,6 +20,7 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig AM_CPPFLAGS = \ $(USRP_INCLUDES) \ @@ -53,11 +54,3 @@ usrp_prims_la_swig_libadd = \ usrp_prims_python = \ __init__.py \ usrp_fpga_regs.py - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) |