From 00b4f54142276b0e2272ca56e48558551ab7b2b0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:19 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kfaxview/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kfaxview/Makefile.am') diff --git a/kfaxview/Makefile.am b/kfaxview/Makefile.am index 884c503a..d42c6ed9 100644 --- a/kfaxview/Makefile.am +++ b/kfaxview/Makefile.am @@ -12,8 +12,8 @@ METASOURCES = AUTO bin_PROGRAMS = kfaxview kfaxview_SOURCES = main.cpp -kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts +kfaxview_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kfaxview_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts # this is where the desktop file will go kde_services_DATA = kfaxmultipage.desktop kfaxmultipage_tiff.desktop @@ -23,7 +23,7 @@ shellrcdir = $(kde_datadir)/kfaxview kde_module_LTLIBRARIES = kfaxviewpart.la kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kfaxviewpart_la_LIBADD = -ltdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la +kfaxviewpart_la_LIBADD = -ltdeprint -ltdeparts $(top_builddir)/kviewshell/libtdemultipage.la libkfaximage/libkfaximage.la kfaxviewpart_la_SOURCES = faxmultipage.cpp faxrenderer.cpp partdir = $(kde_datadir)/kfaxview -- cgit v1.2.1