From 2e0665dec63c510f6b070dde78eb933a82a56673 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:19:55 +0900 Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- kstars/kstars.kdevprj | 2 +- kstars/kstars/Makefile.am | 2 +- kstars/kstars/indi/Makefile.am | 28 ++++++++++++++-------------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'kstars') diff --git a/kstars/kstars.kdevprj b/kstars/kstars.kdevprj index 50c4a484..92c7f05e 100644 --- a/kstars/kstars.kdevprj +++ b/kstars/kstars.kdevprj @@ -22,7 +22,7 @@ bin_program=kstars cflags= cppflags= cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) +ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) ldflags=\s\s [General] diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am index ef7cae2d..c90b8ca4 100644 --- a/kstars/kstars/Makefile.am +++ b/kstars/kstars/Makefile.am @@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes) METASOURCES = AUTO # the library search path. -kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am index 303dffad..fc78522a 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) $(QT_LDFLAGS) +indiserver_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +lx200generic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp lx200basic_LDADD = liblilxml.a libindicom.a -lx200basic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +lx200basic_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +celestrongps_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp apmount_LDADD = liblilxml.a libindicom.a -apmount_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +apmount_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +fliccd_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +fliwheel_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +v4ldriver_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +v4lphilips_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +meade_lpi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c temma_LDADD = liblilxml.a libindicom.a -lm -temma_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +temma_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +skycommander_LDFLAGS = $(LIB_TQT) $(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) $(QT_LDFLAGS) +apogee_ppi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c sbigccd_LDADD = libindicom.a liblilxml.a -lz -sbigccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +sbigccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(bindir) -- cgit v1.2.1