sdr
/
libusrp
mirror of https://gerrit.osmocom.org/libusrp
8
0
Fork 0
Code Releases Activity

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.
This commit is contained in:
Eric Blossom 2010-11-24 17:29:11 -08:00
parent 005c0c55a5
commit dc2588910e
7 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -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

2
doc/Makefile.am
View File

@ -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 \

4
doc/other/Makefile.am
View File

@ -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

6
host/include/usrp/Makefile.am
View File

@ -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

4
host/lib/Makefile.am
View File

@ -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

4
host/misc/Makefile.am
View File

@ -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 \

9
host/swig/Makefile.am
View File

@ -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)