diff --git a/src/Makefile.am b/src/Makefile.am index 8bc77a1..6ec8a49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,7 +30,7 @@ tellico_LDADD = ./core/libcore.a ./cite/libcite.a ./fetch/libfetch.a \ ./newstuff/libnewstuff.a ./translators/pilotdb/libpilotdb.a \ ./translators/pilotdb/libflatfile/liblibflatfile.a ./gui/libgui.a \ ./translators/pilotdb/libpalm/liblibpalm.a ./rtf2html/librtf2html.a \ - ./commands/libcommands.a -lexslt $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \ + ./commands/libcommands.a -lexslt $(LIB_TDEFILE) $(LIB_TDEHTML) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) \ $(LIBSOCKET) $(LIBXSLT_LIBS) $(TAGLIB_LIBS) $(KCDDB_LIBS) $(YAZ_LIBS) $(LIB_TDEIO) \ $(LIB_TDEABC) $(KCAL_LIBS) $(LDADD_LIBBTPARSE) $(LIB_TDENEWSTUFF) $(EXEMPI_LIBS) \ $(POPPLER_LIBS) $(LDADD_LIBBARCODE) $(LIBXML_LIBS) @@ -122,7 +122,7 @@ KDE_OPTIONS = noautodist CLEANFILES = *~ *.loT # the library search path. -tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) +tellico_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEPARTS) uidir = $(kde_datadir)/tellico ui_DATA = tellicoui.rc diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 3dc9d98..d85b7c4 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -16,13 +16,13 @@ METASOURCES = AUTO DISTCLEANFILES = *~ *.Po $(CLEANFILES) isbntest_SOURCES = isbntest.cpp -isbntest_LDADD = ../isbnvalidator.o ../upcvalidator.o $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +isbntest_LDADD = ../isbnvalidator.o ../upcvalidator.o $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) latin1test_SOURCES = latin1test.cpp -latin1test_LDADD = $(LIB_QT) $(LIB_TDECORE) +latin1test_LDADD = $(LIB_TQT) $(LIB_TDECORE) entitytest_SOURCES = entitytest.cpp -entitytest_LDADD = ../tellico_utils.o $(LIB_QT) $(LIB_TDECORE) +entitytest_LDADD = ../tellico_utils.o $(LIB_TQT) $(LIB_TDECORE) #formattest_SOURCES = formattest.cpp -#formattest_LDADD = ../core/tellico_config.o ../core/tellico_config_addons.o ../field.o ../tellico_utils.o $(LIB_QT) $(LIB_TDECORE) +#formattest_LDADD = ../core/tellico_config.o ../core/tellico_config_addons.o ../field.o ../tellico_utils.o $(LIB_TQT) $(LIB_TDECORE)