summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-29 02:14:01 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-29 02:14:01 +0000
commitea99cc1978aff99f7766d1837192fb4507856997 (patch)
treea710982f846303b2b3b70bddfb891d0e1a6c99cd
parentecd4f459fb9e4befe2496139479d56ff01bb9b33 (diff)
downloadtdeedu-3.5.13.tar.gz
tdeedu-3.5.13.zip
Fix kdeedu FTBFS on Fedora 15v3.5.13
Thanks to Francois Andriot for the patch! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1261217 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kstars/kstars/indi/Makefile.am28
1 files changed, 14 insertions, 14 deletions
diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am
index ff4982c2..303dffad 100644
--- a/kstars/kstars/indi/Makefile.am
+++ b/kstars/kstars/indi/Makefile.am
@@ -20,59 +20,59 @@ noinst_LIBRARIES = liblilxml.a libindicom.a
indiserver_SOURCES = indiserver.c fq.c
indiserver_LDADD = liblilxml.a ${LIBPTHREAD} ${USE_THREADS} $(LIBSOCKET)
-indiserver_LDFLAGS = $(LIB_QT)
+indiserver_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp
lx200generic_LDADD = liblilxml.a libindicom.a -lm
-lx200generic_LDFLAGS = $(LIB_QT)
+lx200generic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp
lx200basic_LDADD = liblilxml.a libindicom.a
-lx200basic_LDFLAGS = $(LIB_QT)
+lx200basic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
celestrongps_SOURCES = indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp
celestrongps_LDADD = liblilxml.a libindicom.a -lm
-celestrongps_LDFLAGS = $(LIB_QT)
+celestrongps_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp
apmount_LDADD = liblilxml.a libindicom.a
-apmount_LDFLAGS = $(LIB_QT)
+apmount_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
fliccd_SOURCES = eventloop.c base64.c fli_ccd.c indidrivermain.c
fliccd_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -lz $(LIBSOCKET)
-fliccd_LDFLAGS = $(LIB_QT)
+fliccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
fliwheel_SOURCES = eventloop.c base64.c fli_wheel.c indidrivermain.c
fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm
-fliwheel_LDFLAGS = $(LIB_QT)
+fliwheel_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp
v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz
-v4ldriver_LDFLAGS = $(LIB_QT)
+v4ldriver_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp
v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz
-v4lphilips_LDFLAGS = $(LIB_QT)
+v4lphilips_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp
meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz
-meade_lpi_LDFLAGS = $(LIB_QT)
+meade_lpi_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c
temma_LDADD = liblilxml.a libindicom.a -lm
-temma_LDFLAGS = $(LIB_QT)
+temma_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
skycommander_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c
skycommander_LDADD = liblilxml.a libindicom.a -lm
-skycommander_LDFLAGS = $(LIB_QT)
+skycommander_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
apogee_ppi_SOURCES = apogee_ppi.cpp base64.c eventloop.c indidrivermain.c
apogee_ppi_LDADD = libindicom.a liblilxml.a apogee/libapogee_PPI.la -lz
-apogee_ppi_LDFLAGS = $(LIB_QT)
+apogee_ppi_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c
sbigccd_LDADD = libindicom.a liblilxml.a -lz
-sbigccd_LDFLAGS = $(LIB_QT)
+sbigccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS)
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(bindir)