diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:08:44 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:08:44 -0600 |
| commit | 56c4d26d031cbe55a66c75c4506eccb23ff92b1c (patch) | |
| tree | 06fd74a705eff4d92007c53058d4054e3b5bc3d2 /src/Makefile.am | |
| parent | bfd3620cd83f108b5f82d034ffb250748755dfd5 (diff) | |
| download | kdiff3-56c4d26d031cbe55a66c75c4506eccb23ff92b1c.tar.gz kdiff3-56c4d26d031cbe55a66c75c4506eccb23ff92b1c.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
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 |