From 56c4d26d031cbe55a66c75c4506eccb23ff92b1c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:08:44 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index afcd57f..04aeda8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kdiff3 # the application source, library search path, and link libraries kdiff3_SOURCES = main.cpp kdiff3_shell.cpp -kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kdiff3_LDADD = $(LIB_KPARTS) # this is where the desktop file will go -- cgit v1.2.3