diff options
Diffstat (limited to 'tdeinit')
| -rw-r--r-- | tdeinit/Makefile.am | 6 | ||||
| -rw-r--r-- | tdeinit/tdeinit.cpp | 2 | ||||
| -rw-r--r-- | tdeinit/tdeioslave.cpp | 2 | ||||
| -rw-r--r-- | tdeinit/tdelauncher.h | 4 | ||||
| -rw-r--r-- | tdeinit/tdelauncher_cmds.h | 4 | ||||
| -rw-r--r-- | tdeinit/tests/Makefile.am | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/tdeinit/Makefile.am b/tdeinit/Makefile.am index 85381ccd4..9f5914b90 100644 --- a/tdeinit/Makefile.am +++ b/tdeinit/Makefile.am @@ -33,12 +33,12 @@ AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS) tdeinit_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -tdeinit_LDADD = $(LIB_KPARTS) -lXft $(LIB_QT) +tdeinit_LDADD = $(LIB_TDEPARTS) -lXft $(LIB_QT) tdeioslave_SOURCES = tdeioslave.cpp tdeioslave_LDFLAGS = $(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) \ $(KDE_RPATH) -tdeioslave_LDADD = $(LIB_KIO) +tdeioslave_LDADD = $(LIB_TDEIO) tdeinit_wrapper_SOURCES = wrapper.c tdeinit_wrapper_LDADD = $(LIBSOCKET) @@ -56,7 +56,7 @@ kwrapper_SOURCES = kwrapper.c kwrapper_LDADD = $(LIBSOCKET) tdelauncher_la_LDFLAGS = $(all_libraries) -module -avoid-version -tdelauncher_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) +tdelauncher_la_LIBADD = $(LIB_TDEIO) $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) tdelauncher_la_SOURCES = tdelauncher.cpp tdelauncher_main.cpp autostart.cpp tdestartupconfig_SOURCES = tdestartupconfig.cpp diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp index ca0d1dcaf..3850b10d5 100644 --- a/tdeinit/tdeinit.cpp +++ b/tdeinit/tdeinit.cpp @@ -171,7 +171,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err ); extern "C" KParts::Plugin* _tdeinit_init_tdeparts() { return new KParts::Plugin(); } /* These are to link libtdeio even if 'smart' linker is used */ #include <tdeio/authinfo.h> -extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); } +extern "C" TDEIO::AuthInfo* _tdeioslave_init_tdeio() { return new TDEIO::AuthInfo(); } /* * Close fd's which are only useful for the parent process. diff --git a/tdeinit/tdeioslave.cpp b/tdeinit/tdeioslave.cpp index 1690ca2f7..d62b02591 100644 --- a/tdeinit/tdeioslave.cpp +++ b/tdeinit/tdeioslave.cpp @@ -49,7 +49,7 @@ /* These are to link libtdeio even if 'smart' linker is used */ #include <tdeio/authinfo.h> -extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); } +extern "C" TDEIO::AuthInfo* _tdeioslave_init_tdeio() { return new TDEIO::AuthInfo(); } int main(int argc, char **argv) { diff --git a/tdeinit/tdelauncher.h b/tdeinit/tdelauncher.h index 791958980..1802cd6ba 100644 --- a/tdeinit/tdelauncher.h +++ b/tdeinit/tdelauncher.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KLAUNCHER_H_ -#define _KLAUNCHER_H_ +#ifndef _TDELAUNCHER_H_ +#define _TDELAUNCHER_H_ #include <sys/types.h> #include <unistd.h> diff --git a/tdeinit/tdelauncher_cmds.h b/tdeinit/tdelauncher_cmds.h index 5763e5a38..dc28c6fff 100644 --- a/tdeinit/tdelauncher_cmds.h +++ b/tdeinit/tdelauncher_cmds.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef _KLAUNCHER_CMDS_H_ -#define _KLAUNCHER_CMDS_H_ +#ifndef _TDELAUNCHER_CMDS_H_ +#define _TDELAUNCHER_CMDS_H_ typedef struct { diff --git a/tdeinit/tests/Makefile.am b/tdeinit/tests/Makefile.am index e1157bf72..bf82495b2 100644 --- a/tdeinit/tests/Makefile.am +++ b/tdeinit/tests/Makefile.am @@ -6,5 +6,5 @@ INCLUDES= -I$(srcdir)/../.. $(all_includes) check_PROGRAMS = tdelaunchertest tdelaunchertest_SOURCES = tdelaunchertest.cpp -tdelaunchertest_LDADD = $(LIB_KIO) +tdelaunchertest_LDADD = $(LIB_TDEIO) |