diff options
author | jcorgan | 2008-02-08 23:32:10 +0000 |
---|---|---|
committer | jcorgan | 2008-02-08 23:32:10 +0000 |
commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /pmt | |
parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
download | gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.gz gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.bz2 gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.zip |
Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'pmt')
-rw-r--r-- | pmt/Makefile.am | 5 | ||||
-rw-r--r-- | pmt/pmt.pc.in | 4 | ||||
-rw-r--r-- | pmt/src/lib/Makefile.am | 5 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pmt/Makefile.am b/pmt/Makefile.am index 2c3de669f..758eb1d98 100644 --- a/pmt/Makefile.am +++ b/pmt/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,8 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ - pmt.pc.in +EXTRA_DIST = pmt.pc.in SUBDIRS = src DIST_SUBDIRS = src doc diff --git a/pmt/pmt.pc.in b/pmt/pmt.pc.in index e4a5e640c..6ca31ad49 100644 --- a/pmt/pmt.pc.in +++ b/pmt/pmt.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: pmt Description: The GNU Radio Polymorphic Type library -Requires: +Requires: gnuradio-omnithread Version: @VERSION@ -Libs: -L${libdir} -lgromnithread +Libs: -L${libdir} -lpmt -lgromnithread Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@ diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am index 692860408..cb1a907f0 100644 --- a/pmt/src/lib/Makefile.am +++ b/pmt/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2006 Free Software Foundation, Inc. +# Copyright 2006,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,8 @@ include $(top_srcdir)/Makefile.common -INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) +INCLUDES = $(DEFINES) $(OMNITHREAD_INCLUDES) $(BOOST_CFLAGS) \ + $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) TESTS = test_pmt |