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 --- kdvi/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kdvi/Makefile.am') diff --git a/kdvi/Makefile.am b/kdvi/Makefile.am index 98f5e94f..ee2c8bc2 100644 --- a/kdvi/Makefile.am +++ b/kdvi/Makefile.am @@ -30,8 +30,8 @@ kdvipart_la_SOURCES = renderedDviPagePixmap.cpp dviPageCache.cpp \ kde_kcfg_DATA = kdvi.kcfg kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -lkparts \ - $(top_builddir)/kviewshell/libkmultipage.la +kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -ltdeparts \ + $(top_builddir)/kviewshell/libtdemultipage.la # Which sources should be compiled for squeeze. squeeze_SOURCES = squeeze.c @@ -39,8 +39,8 @@ squeeze_SOURCES = squeeze.c KDE_OPTIONS = nofinal kdvi_SOURCES = main.cpp -kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -lkparts +kdvi_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kdvi_LDADD = ../kviewshell/libifaces.la ../kviewshell/libkviewshell.la -ltdeparts ## this option you can leave out. Just, if you use "make dist", you need it noinst_HEADERS = dvi.h dviRenderer.h xdvi.h -- cgit v1.2.1