diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-02-26 21:26:10 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-02-26 21:26:10 +0000 |
| commit | 63d05d64826fd1b3eef89e5a8a14a73b318464ac (patch) | |
| tree | 3d720a44e1088f92769f6a56408202446fbd569f /gr-ezdop/src | |
| parent | 789bfcc9d9172645e7b4bf0c7fbf30574e03c201 (diff) | |
Merged r4632:4645 on jcorgan/linking into trunk. Cleans up linking issues with libtool and already installed libraries.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4646 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-ezdop/src')
| -rw-r--r-- | gr-ezdop/src/lib/Makefile.am | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gr-ezdop/src/lib/Makefile.am b/gr-ezdop/src/lib/Makefile.am index c0cdacca6e..51d7e56c26 100644 --- a/gr-ezdop/src/lib/Makefile.am +++ b/gr-ezdop/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -32,7 +32,7 @@ EZDOP_INCLUDES = \ -I$(top_srcdir)/ezdop/src/firmware \ -I$(top_srcdir)/ezdop/src/host/ezdop -EZDOP_LIBS = -L$(top_builddir)/ezdop/src/host/ezdop/ -lezdop +EZDOP_LA = $(top_builddir)/ezdop/src/host/ezdop/libezdop.la INCLUDES = \ $(STD_DEFINES_AND_INCLUDES) \ @@ -78,8 +78,8 @@ _ezdop_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version # c++ standard library _ezdop_la_LIBADD = \ $(PYTHON_LDFLAGS) \ - $(GNURADIO_CORE_LIBS) \ - $(EZDOP_LIBS) \ + $(GNURADIO_CORE_LA) \ + $(EZDOP_LA) \ -lstdc++ ezdop.cc ezdop.py: $(ALL_IFILES) @@ -89,7 +89,6 @@ ezdop.cc ezdop.py: $(ALL_IFILES) grinclude_HEADERS = \ ezdop_source_c.h - # These swig headers get installed in ${prefix}/include/gnuradio/swig swiginclude_HEADERS = \ $(LOCAL_IFILES) |