diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:43 -0600 |
| commit | cb68a7857c80661d242ee5527ec6f99dc3f79fa7 (patch) | |
| tree | a3b54203ca6bce0e8e1dc5107dc9653db246a281 /kscd | |
| parent | 7534907d3759a8c520eeb9a701b316d891c63bdf (diff) | |
| download | tdemultimedia-cb68a7857c80661d242ee5527ec6f99dc3f79fa7.tar.gz tdemultimedia-cb68a7857c80661d242ee5527ec6f99dc3f79fa7.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kscd')
| -rw-r--r-- | kscd/Makefile.am | 4 | ||||
| -rw-r--r-- | kscd/kscdmagic/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kscd/Makefile.am b/kscd/Makefile.am index d782683a..952aae9a 100644 --- a/kscd/Makefile.am +++ b/kscd/Makefile.am @@ -23,9 +23,9 @@ libkcompactdisc_la_LDFLAGS = $(all_libraries) -lpthread kde_kcfg_DATA = kscd.kcfg -kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kscd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kscd_LDADD = $(LIBCDROM) $(LIBCDAUDIO) \ - $(LIBFPE) $(LIB_KIO) -lkutils $(top_builddir)/libkcddb/libkcddb.la \ + $(LIBFPE) $(LIB_KIO) -ltdeutils $(top_builddir)/libkcddb/libkcddb.la \ libkcompactdisc.la -lpthread profiledata_DATA = kscd.profile.xml diff --git a/kscd/kscdmagic/Makefile.am b/kscd/kscdmagic/Makefile.am index 27c9454d..cf24f2bf 100644 --- a/kscd/kscdmagic/Makefile.am +++ b/kscd/kscdmagic/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = kscdmagic kscdmagic_SOURCES = core.cpp main.cpp sound.cpp xlibwrap.cpp xlib.c # the library search path. -kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kscdmagic_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. |