From 2d84c9d3ad0aaea0620658024537d54e6a7939f4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:17:00 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kjsembed/docs/ChangeLog | 2 +- kjsembed/docs/embedding/simple-embed/Makefile.am | 2 +- kjsembed/docs/embedding/simple-embed/README | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kjsembed/docs') diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog index 0c19114f..4b14af71 100644 --- a/kjsembed/docs/ChangeLog +++ b/kjsembed/docs/ChangeLog @@ -1351,7 +1351,7 @@ 2004-04-09 Friday 21:26 rich Added support for streaming data to a KPart, and an example of doing so. This - means you no longer need to have a temporary file to display stuff in khtml. + means you no longer need to have a temporary file to display stuff in tdehtml. 2004-04-09 Friday 20:22 rich diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am index 2c9243a3..93d68f76 100644 --- a/kjsembed/docs/embedding/simple-embed/Makefile.am +++ b/kjsembed/docs/embedding/simple-embed/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = embedjs INCLUDES = -I$(top_srcdir) $(all_includes) # the library search path. -embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. embedjs_LDADD = $(LIB_KFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la diff --git a/kjsembed/docs/embedding/simple-embed/README b/kjsembed/docs/embedding/simple-embed/README index 9c048f35..12f9642b 100644 --- a/kjsembed/docs/embedding/simple-embed/README +++ b/kjsembed/docs/embedding/simple-embed/README @@ -53,7 +53,7 @@ embeddable in other apps. For example, the kmplayer kpart can be called to play in your app. For more details, consult : -http://www-106.ibm.com/developerworks/library/l-kparts/ +http://www-106.ibm.com/developerworks/library/l-tdeparts/ http://developer.kde.org/documentation/tutorials/dot/writing-plugins.html http://developer.kde.org/documentation/tutorials/developing-a-plugin-structure/index.html -- cgit v1.2.1