summaryrefslogtreecommitdiffstats
path: root/kcoloredit
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-26 13:17:19 -0600
committerTimothy Pearson <[email protected]>2013-01-26 13:17:19 -0600
commit00b4f54142276b0e2272ca56e48558551ab7b2b0 (patch)
tree1d1054b59fc2e76d0c2bae00126bdf65d9318865 /kcoloredit
parentc7549e238d15850306158ae153fc99126c84ab9d (diff)
downloadtdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.tar.gz
tdegraphics-00b4f54142276b0e2272ca56e48558551ab7b2b0.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcoloredit')
-rw-r--r--kcoloredit/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/kcoloredit/Makefile.am b/kcoloredit/Makefile.am
index f45833e6..09028843 100644
--- a/kcoloredit/Makefile.am
+++ b/kcoloredit/Makefile.am
@@ -7,7 +7,7 @@ kcoloredit_SOURCES = kzcolorselector.cpp imageselection.cpp \
kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
kcoloredit_METASOURCES = AUTO
kcoloredit_LDADD = $(LIB_TDEUI) $(LIB_KFILE)
-kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/kcoloredit
rc_DATA = kcoloreditui.rc
@@ -15,7 +15,7 @@ rc_DATA = kcoloreditui.rc
bin_PROGRAMS = kcoloredit kcolorchooser
kcolorchooser_SOURCES = kcolorchooser.cpp
kcolorchooser_LDADD = $(LIB_TDEUI)
-kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \