summaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:08:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:08:06 -0600
commitd6571d0e1a6f79d7a7ae3430cbe45f2bf7c0a381 (patch)
tree699d0aaff2c55fc027cdabaf6be5f566be75d167 /src/Makefile.am
parent7154fc859f9fadcdd97cf8c9f184234d21f16a62 (diff)
downloadk3b-d6571d0e1a6f79d7a7ae3430cbe45f2bf7c0a381.tar.gz
k3b-d6571d0e1a6f79d7a7ae3430cbe45f2bf7c0a381.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3eb6d1f..a04021f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ k3b_SOURCES = k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp \
k3b_LDADD = ./option/liboption.la ./rip/librip.la \
./projects/libprojects.la ../libk3bdevice/libk3bdevice.la \
../libk3b/libk3b.la ./misc/libmisc.la ./fastscale/libfastscale.la \
- -ltdefx -lkio -lkparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
+ -ltdefx -lkio -ltdeparts $(CAM_LIB) $(MUSICBRAINZ_LIBS)
SUBDIRS = option misc rip projects fastscale pics icons konqi mimetypes sounds
@@ -74,7 +74,7 @@ AM_CPPFLAGS = -I$(srcdir)/../libk3b/tools \
METASOURCES = AUTO
# the library search path.
-k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+k3b_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
rcdir = $(kde_datadir)/k3b
rc_DATA = k3bui.rc eventsrc tips