From ff2557dc4fd7a8383b56081c1e8d1cd9cc7accd2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:51:13 -0600 Subject: [PATCH] Rename a number of libraries and executables to avoid conflicts with KDE4 --- acinclude.m4 | 8 ++++---- configure.in | 2 +- configure.in.in | 2 +- settings-backend/Makefile.am | 8 ++++---- ...kconfig_backend.cpp => tdeconfig_backend.cpp} | 16 ++++++++-------- 5 files changed, 18 insertions(+), 18 deletions(-) rename settings-backend/{kconfig_backend.cpp => tdeconfig_backend.cpp} (99%) diff --git a/acinclude.m4 b/acinclude.m4 index 0cc5030..38b5d4d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -602,7 +602,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], fi if test -n "$trinity2ornewer"; then - KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) + KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) fi if test -n "$trinity3ornewer"; then @@ -1788,7 +1788,7 @@ if test "$kde_qtver" = 1; then kde_check_lib="libtdecore.la" else kde_check_header="ksharedptr.h" - kde_check_lib="libkio.la" + kde_check_lib="libtdeio.la" fi if test -z "$1"; then @@ -2094,7 +2094,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") - AC_SUBST(LIB_KFILE, "-lkfile") + AC_SUBST(LIB_KFILE, "-ltdefile") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KHTML, "-ltdehtml") AC_SUBST(LIB_KSPELL, "-ltdespell") @@ -2104,7 +2104,7 @@ else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") - AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/configure.in b/configure.in index 738e110..ab2906d 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,7 @@ dnl Perform program name transformation AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(compizconfig-backend-kconfig, 0.7.3) dnl searches for some needed programs +AM_INIT_AUTOMAKE(compizconfig-backend-tdeconfig, 0.7.3) dnl searches for some needed programs KDE_SET_PREFIX diff --git a/configure.in.in b/configure.in.in index a74f3d5..03c7483 100644 --- a/configure.in.in +++ b/configure.in.in @@ -1,6 +1,6 @@ #MIN_CONFIG KDE_ENABLE_HIDDEN_VISIBILITY -AM_INIT_AUTOMAKE(compizconfig-backend-kconfig,0.8.4) +AM_INIT_AUTOMAKE(compizconfig-backend-tdeconfig,0.8.4) AC_CHECK_RANDOM AC_CHECK_USLEEP diff --git a/settings-backend/Makefile.am b/settings-backend/Makefile.am index 2159ecb..8687bc5 100644 --- a/settings-backend/Makefile.am +++ b/settings-backend/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(srcdir)/lib $(all_includes) -libkconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) -libkconfig_la_LIBADD = $(CCS_LIBS) $(LIB_TDECORE) -libkconfig_la_SOURCES = kconfig_backend.cpp +libtdeconfig_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) +libtdeconfig_la_LIBADD = $(CCS_LIBS) $(LIB_TDECORE) +libtdeconfig_la_SOURCES = tdeconfig_backend.cpp backenddir = $(BACKENDDIR)/backends KDE_CXXFLAGS = $(CCS_CFLAGS) METASOURCES = AUTO -backend_LTLIBRARIES = libkconfig.la +backend_LTLIBRARIES = libtdeconfig.la diff --git a/settings-backend/kconfig_backend.cpp b/settings-backend/tdeconfig_backend.cpp similarity index 99% rename from settings-backend/kconfig_backend.cpp rename to settings-backend/tdeconfig_backend.cpp index d6b1c8c..0360250 100644 --- a/settings-backend/kconfig_backend.cpp +++ b/settings-backend/tdeconfig_backend.cpp @@ -21,7 +21,7 @@ #include -#include +#include #include #include #include @@ -610,7 +610,7 @@ static CCSStringList getExistingProfiles (CCSContext *) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); TQDir dir (TDEGlobal::dirs()->saveLocation ("config", TQString(), false), "compizrc.*"); @@ -1760,7 +1760,7 @@ static Bool readInit (CCSContext *c) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); if (cFiles->profile != ccsGetProfile (c) ) { @@ -1796,7 +1796,7 @@ static Bool writeInit (CCSContext *c) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); if (cFiles->profile != ccsGetProfile (c) ) { @@ -1853,7 +1853,7 @@ static Bool init (CCSContext *c) { if (!instance) - instance = new TDEInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-tdeconfig"); cFiles = new ConfigFiles; @@ -1938,9 +1938,9 @@ deleteProfile (CCSContext *, return FALSE; } -static CCSBackendVTable kconfigVTable = +static CCSBackendVTable tdeconfigVTable = { - "kconfig", + "tdeconfig", "KDE Configuration Backend", "KDE Configuration Backend for libccs", true, @@ -1966,7 +1966,7 @@ extern "C" CCSBackendVTable * getBackendInfo (void) { - return &kconfigVTable; + return &tdeconfigVTable; } }