X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2Fruntime%2FMakefile.in;h=677a6d3a754f8bb67ce3897ed21fbc64ea6a3834;hb=09a1e803a9e6587c78d20cdf16891e5295874668;hp=5e0d5e040d634ad7d2e72054fb5e6df949d3f68b;hpb=0cfd4875e519e2b1ee05d074f72ec67391ed13bf;p=debian%2Fgnuradio diff --git a/gnuradio-core/src/lib/runtime/Makefile.in b/gnuradio-core/src/lib/runtime/Makefile.in index 5e0d5e04..677a6d3a 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.in +++ b/gnuradio-core/src/lib/runtime/Makefile.in @@ -21,7 +21,7 @@ # # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # GNU Radio is distributed in the hope that it will be useful, @@ -37,13 +37,13 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# the Free Software Foundation; either version 3, or (at your option) # any later version. # # GNU Radio is distributed in the hope that it will be useful, @@ -414,25 +414,17 @@ GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ $(FFTW3F_CFLAGS) -# These used to be set in PKGCONFIG but now point to the current -# build tree. -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ - -lgnuradio-core -lfftw3f -lm - +# How to link in GNU Radio core library from inside the tree +GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la # This is a dependency for many swig operations GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i -# The below used to be set in PKGCONFIG but now point to the current -# build tree. +# How to link in the USRP library from inside the tree USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ -I$(top_srcdir)/usrp/firmware/include -USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ - -lusrp - -PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib -PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt +USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included.