diff options
| -rw-r--r-- | kjsembed/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/bindings/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/builtins/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/docs/embedding/simple-embed/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/plugins/Makefile.am | 10 | ||||
| -rw-r--r-- | kjsembed/plugins/tdefileitemloader.h | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index 8a66883f..31c56e12 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -55,7 +55,7 @@ libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \ qtbindings/libkjsembedqtbindings.la \ -ltqui \ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \ - $(LIB_KFILE) $(LIB_TDEHTML) -lkjs $(LIBSOCKET) + $(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) diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index 1aa5ce49..5ca34fcf 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -22,7 +22,7 @@ libkjsembedbindings_la_SOURCES = image_imp.cpp \ libkjsembedbindings_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \ - $(LIB_KFILE) $(LIBSOCKET) + $(LIB_TDEFILE) $(LIBSOCKET) libkjsembedbindings_la_METASOURCES = AUTO diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am index 5be761af..623807b5 100644 --- a/kjsembed/builtins/Makefile.am +++ b/kjsembed/builtins/Makefile.am @@ -13,6 +13,6 @@ libkjsembedbuiltins_la_SOURCES = stdaction_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) \ - $(LIB_KFILE) -lkjs $(LIBSOCKET) + $(LIB_TDEFILE) -lkjs $(LIBSOCKET) libkjsembedbuiltins_la_METASOURCES = AUTO diff --git a/kjsembed/docs/embedding/simple-embed/Makefile.am b/kjsembed/docs/embedding/simple-embed/Makefile.am index 93d68f76..9d5f81c3 100644 --- a/kjsembed/docs/embedding/simple-embed/Makefile.am +++ b/kjsembed/docs/embedding/simple-embed/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir) $(all_includes) 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 +embedjs_LDADD = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la # which sources should be compiled for embedjs embedjs_SOURCES = main.cpp embedview.ui embedviewimp.cpp diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index 3f1e4fab..e08702bf 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_KFILE) ../libkjsembed.la +libcustomobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(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_KFILE) ../libkjsembed.la +libcustomqobjectplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(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_KFILE) ../libkjsembed.la +libimagefxplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(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_KFILE) ../libkjsembed.la +libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(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_KFILE) ../libkjsembed.la +libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkjsembed.la # this is where the desktop file will go diff --git a/kjsembed/plugins/tdefileitemloader.h b/kjsembed/plugins/tdefileitemloader.h index 384379f3..0667b6e0 100644 --- a/kjsembed/plugins/tdefileitemloader.h +++ b/kjsembed/plugins/tdefileitemloader.h @@ -17,8 +17,8 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef KFILEITEMLOADER_H -#define KFILEITEMLOADER_H +#ifndef TDEFILEITEMLOADER_H +#define TDEFILEITEMLOADER_H #include <kjsembed/jsbindingplugin.h> #include <kjsembed/jsproxy_imp.h> |