diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-03-16 08:18:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2011-03-16 08:18:30 -0700 |
| commit | 4cd06fadac972d4cac559c15488bc39823063afe (patch) | |
| tree | 6fe57896bc216d8c9e672194f2e4e0e75aedb645 /Makefile.common | |
| parent | 4ad736e21f45f64fd616bb53f54e45e1c63e7330 (diff) | |
| parent | 1d70ed2bd928d52a383e688949cc7f747dd584fa (diff) | |
Merge remote branch 'gnuradio/next'
* gnuradio/next: (806 commits)
gruel: added missing ignores
gruel: fixed swig interface file to dereference pmt_t.
qtgui: fix distcheck error
gruel: fixing structure. Passes make check.
gruel: SWIGing Gruel into Python to access PMTs.
gnuradio-examples: add C++ audio examples using new gr-audio
created gruel/attributes.h to house compiler specific attribute macros
audio: remove obsoleted individual top-level components
gr-audio: added README and default config fix
volk: simplify the get new method for the aligned pool
grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
grc: swap store the subprocess object rather than the pid when executing
qtgui: removed python directory that was added, never used
uhd: use %ignore to hide warnings and fix errors
Added/updated ignore files.
Fixing gr_filter_design program to import from gnuradio Python package.
audio: high prio for platform specific audio osx
audio: added windows and osx audio source files
audio: added config checks for other audios, added jack and port
audio: make prefs look like old audio, removed old audio.py
...
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 9c36a49665..20b8a78cf0 100644 --- a/Makefile.common +++ b/Makefile.common @@ -20,6 +20,20 @@ # Boston, MA 02110-1301, USA. # +# Every Makefile starts with common vars so we can +# consistently use += +BUILT_SOURCES = +MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT +CLEANFILES = guile.log +DISTCLEANFILES = +EXTRA_DIST = +STAMPS = + + +# Make rebuilds less verbose with stuff we can safely ignore +# about GNU make only extensions. +AUTOMAKE += -Wno-portability -Wnone + AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@ AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@ @@ -29,10 +43,12 @@ LTVERSIONFLAGS = -version-info 0:0:0 -release $(LIBVER) # includes grincludedir = $(includedir)/gnuradio -if PYTHON # swig includes swigincludedir = $(grincludedir)/swig +# Guile scheme code ends up under here: +guiledir = $(prefix)/share/guile/site + # Install the gnuradio stuff in the appropriate subdirectory # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio @@ -46,7 +62,6 @@ grpyexecdir = $(pyexecdir)/gnuradio usrppythondir = $(pythondir)/usrpm usrppyexecdir = $(pyexecdir)/usrpm -endif # gcell includes gcellincludedir = $(includedir)/gcell @@ -58,7 +73,7 @@ libspudir = $(libdir)spu # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. STD_DEFINES_AND_INCLUDES = $(DEFINES) $(GNURADIO_INCLUDES) \ - $(GRUEL_INCLUDES) $(BOOST_CPPFLAGS) + $(GRUEL_INCLUDES) $(VOLK_INCLUDES) $(BOOST_CPPFLAGS) # when including for compilation from pre-installed libraries and such, # need to make sure those are put last on the compile command @@ -72,10 +87,14 @@ GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@ # How to link in GNU Radio core library from inside the tree GNURADIO_CORE_LA = @gnuradio_core_LA@ -# How to link in the USRP library from inside the tree +# How to link in the GRUEL library from inside the tree GRUEL_INCLUDES = @gruel_INCLUDES@ GRUEL_LA = @gruel_LA@ +# How to link in the VOLK library from inside the tree +VOLK_INCLUDES = @volk_INCLUDES@ +VOLK_LA = @volk_LA@ + # How to link in the USRP library from inside the tree USRP_INCLUDES = @usrp_INCLUDES@ USRP_LA = @usrp_LA@ @@ -116,8 +135,9 @@ MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT \ .unittests/* .unittests/python/* # Don't distribute the files defined in the variable 'no_dist_files' + dist-hook: @for file in $(no_dist_files); do \ echo $(RM) $(distdir)/$$file; \ $(RM) $(distdir)/$$file; \ - done; + done |