summaryrefslogtreecommitdiffstats
path: root/kjsembed
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:02:03 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:59:03 +0200
commit3771a842be82c729e79a2728d2b39f901da2d865 (patch)
tree1745d38238389a00651e5bbfefde3662dcb50c54 /kjsembed
parent620f8b9f5d43eb28d25ead69e9fa52626bd91cd8 (diff)
downloadtdebindings-3771a842be82c729e79a2728d2b39f901da2d865.tar.gz
tdebindings-3771a842be82c729e79a2728d2b39f901da2d865.zip
Additional k => tde renaming and fixes
Diffstat (limited to 'kjsembed')
-rw-r--r--kjsembed/Makefile.am6
-rw-r--r--kjsembed/bindings/Makefile.am2
-rw-r--r--kjsembed/builtins/Makefile.am4
-rw-r--r--kjsembed/cpptests/jsaccess/Makefile.am2
-rw-r--r--kjsembed/docs/embedding/simple-embed/Makefile.am2
-rw-r--r--kjsembed/plugin/Makefile.am2
-rw-r--r--kjsembed/plugins/Makefile.am10
7 files changed, 14 insertions, 14 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am
index 31c56e12..2b25cd12 100644
--- a/kjsembed/Makefile.am
+++ b/kjsembed/Makefile.am
@@ -48,17 +48,17 @@ kjsembedinclude_HEADERS = jsconsolewidget.h \
jsbindingplugin.h \
global.h
-libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS)
+libkjsembed_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
builtins/libkjsembedbuiltins.la \
qtbindings/libkjsembedqtbindings.la \
-ltqui \
- $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
+ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TDEFILE) $(LIB_TDEHTML) -lkjs $(LIBSOCKET)
kjscmd_SOURCES = kjscmd.cpp
-kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS)
+kjscmd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
kjscmd_LDADD = libkjsembed.la
man_MANS = kjscmd.1
diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am
index 5ca34fcf..2020e182 100644
--- a/kjsembed/bindings/Makefile.am
+++ b/kjsembed/bindings/Makefile.am
@@ -21,7 +21,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \
size_imp.cpp
libkjsembedbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
+libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TDEFILE) $(LIBSOCKET)
libkjsembedbindings_la_METASOURCES = AUTO
diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am
index 623807b5..c8005c71 100644
--- a/kjsembed/builtins/Makefile.am
+++ b/kjsembed/builtins/Makefile.am
@@ -11,8 +11,8 @@ libkjsembedbuiltins_la_SOURCES = stdaction_imp.cpp \
qdir_imp.cpp \
qfile_imp.cpp
-libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
+libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) \
$(LIB_TDEFILE) -lkjs $(LIBSOCKET)
libkjsembedbuiltins_la_METASOURCES = AUTO
diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am
index d7296b03..cb71f53d 100644
--- a/kjsembed/cpptests/jsaccess/Makefile.am
+++ b/kjsembed/cpptests/jsaccess/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST
noinst_PROGRAMS = jsaccess
jsaccess_SOURCES = jsaccess.cpp
-jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS)
+jsaccess_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_KJS)
jsaccess_LDADD = $(top_builddir)/kjsembed/libkjsembed.la
METASOURCES = AUTO
diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am
index 9d5f81c3..6625effb 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) -ltdetexteditor
+embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
# the libraries to link against.
embedjs_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la
diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am
index 1ccdb914..8ea341fe 100644
--- a/kjsembed/plugin/Makefile.am
+++ b/kjsembed/plugin/Makefile.am
@@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = libjsconsoleplugin.la
METASOURCES = AUTO
libjsconsoleplugin_la_SOURCES = jsconsoleplugin.cpp
-libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_QT) $(LIB_KPARTS) ../libkjsembed.la
+libjsconsoleplugin_la_LIBADD = -lDCOP -ltdecore -ltdeui -lkjs $(LIB_QT) $(LIB_TDEPARTS) ../libkjsembed.la
libjsconsoleplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH)
#pluginsdir = $(kde_datadir)/konqueror/kpartplugins
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index e08702bf..e67b1c65 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -8,27 +8,27 @@ METASOURCES = AUTO
# the Plugin's source, library search path, and link libraries
libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
+libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp
libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
+libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libimagefxplugin_la_SOURCES = imagefx_plugin.cpp
libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
+libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libqprocessplugin_la_SOURCES = qprocess_plugin.cpp
libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
+libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
libfileitemplugin_la_SOURCES = tdefileitemloader.cpp
libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
-libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkjsembed.la
+libfileitemplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TDEFILE) ../libkjsembed.la
# this is where the desktop file will go