projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged r10948:10959 from jcorgan/deb into trunk. Trunk passes
[debian/gnuradio]
/
gr-qtgui
/
src
/
lib
/
Makefile.am
diff --git
a/gr-qtgui/src/lib/Makefile.am
b/gr-qtgui/src/lib/Makefile.am
index 3c05d28f9e916e8a247227e385eca75429c40610..6543a71ce9400ecd7f21ad729d2ae673820d12ff 100644
(file)
--- a/
gr-qtgui/src/lib/Makefile.am
+++ b/
gr-qtgui/src/lib/Makefile.am
@@
-40,10
+40,10
@@
endif
EXTRA_DIST = spectrumdisplayform.ui
# Build the normal library for C++ apps to link against
EXTRA_DIST = spectrumdisplayform.ui
# Build the normal library for C++ apps to link against
-lib_LTLIBRARIES = libqtgui.la
+lib_LTLIBRARIES = lib
gnuradio-
qtgui.la
# These are the source files that go into the shared library
# These are the source files that go into the shared library
-lib
qtgui_la_SOURCES =
\
+lib
gnuradio_qtgui_la_SOURCES =
\
FrequencyDisplayPlot.cc \
TimeDomainDisplayPlot.cc \
WaterfallDisplayPlot.cc \
FrequencyDisplayPlot.cc \
TimeDomainDisplayPlot.cc \
WaterfallDisplayPlot.cc \
@@
-90,9
+90,9
@@
else
endif
# magic flags
endif
# magic flags
-libqtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+lib
gnuradio_
qtgui_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
-lib
qtgui_la_LIBADD =
\
+lib
gnuradio_qtgui_la_LIBADD =
\
$(GNURADIO_CORE_LA) \
-lstdc++ \
$(QT_LIBS)
$(GNURADIO_CORE_LA) \
-lstdc++ \
$(QT_LIBS)
@@
-112,7
+112,7
@@
qtgui_pythondir_category = \
# additional libraries for linking with the SWIG-generated library
qtgui_la_swig_libadd = \
# additional libraries for linking with the SWIG-generated library
qtgui_la_swig_libadd = \
- libqtgui.la
+ lib
gnuradio-
qtgui.la
include $(top_srcdir)/Makefile.swig
include $(top_srcdir)/Makefile.swig