projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated db_bitshark_rx.c to the proper version that includes the
[debian/gnuradio]
/
Makefile.common
diff --git
a/Makefile.common
b/Makefile.common
index b81433a32972d74e7164c1785869f38fbd12f84e..64891345ba778b99600d6b7e2620b6beb9df2068 100644
(file)
--- a/
Makefile.common
+++ b/
Makefile.common
@@
-20,11
+20,13
@@
# Boston, MA 02110-1301, USA.
#
# Boston, MA 02110-1301, USA.
#
-AM_CXXFLAGS = @autoconf_default_CXXFLAGS@
+AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@
+AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@
# includes
grincludedir = $(includedir)/gnuradio
# includes
grincludedir = $(includedir)/gnuradio
+if PYTHON
# swig includes
swigincludedir = $(grincludedir)/swig
# swig includes
swigincludedir = $(grincludedir)/swig
@@
-41,6
+43,7
@@
grpyexecdir = $(pyexecdir)/gnuradio
usrppythondir = $(pythondir)/usrpm
usrppyexecdir = $(pyexecdir)/usrpm
usrppythondir = $(pythondir)/usrpm
usrppyexecdir = $(pyexecdir)/usrpm
+endif
# gcell includes
gcellincludedir = $(includedir)/gcell
# gcell includes
gcellincludedir = $(includedir)/gcell
@@
-78,14
+81,6
@@
GRUEL_LA = @gruel_LA@
USRP_INCLUDES = @usrp_INCLUDES@
USRP_LA = @usrp_LA@
USRP_INCLUDES = @usrp_INCLUDES@
USRP_LA = @usrp_LA@
-# How to link in usrp-inband library from inside the tree
-USRP_INBAND_INCLUDES = @usrp_inband_INCLUDES@
-USRP_INBAND_LA = @usrp_inband_LA@
-
-# How to link the PMT library from inside the tree
-PMT_INCLUDES = @pmt_INCLUDES@
-PMT_LA = @pmt_LA@
-
# How to link the mblock library from inside the tree
MBLOCK_INCLUDES = @mblock_INCLUDES@
MBLOCK_LA = @mblock_LA@
# How to link the mblock library from inside the tree
MBLOCK_INCLUDES = @mblock_INCLUDES@
MBLOCK_LA = @mblock_LA@
@@
-105,7
+100,7
@@
GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libto
# using AM_PATH_PROG, but now here have to add a -f to be like GNU make
RM=$(RM_PROG) -f
# using AM_PATH_PROG, but now here have to add a -f to be like GNU make
RM=$(RM_PROG) -f
-RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/
pmt
/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s
+RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/
gruel
/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s
COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
# Base directory for example applications
COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
# Base directory for example applications
@@
-113,7
+108,13
@@
exampledir = $(datadir)/gnuradio/examples
# Base directory for documentation (docdir undefined in autoconf < 1.60)
docdir ?= $(datadir)/doc/$(PACKAGE)
# Base directory for documentation (docdir undefined in autoconf < 1.60)
docdir ?= $(datadir)/doc/$(PACKAGE)
-gr_docdir = $(docdir)-$(VERSION)
+gr_docdir = $(docdir)-$(DOCVER)
+
+# System configuration files
+gr_prefsdir = $(GR_PREFSDIR)
+
+# Data directory for grc block wrappers
+grc_blocksdir = $(pkgdatadir)/grc/blocks
# Other common defines; use "+=" to add to these
STAMPS =
# Other common defines; use "+=" to add to these
STAMPS =