From 070482fcc398b8c5c25c8d3add69ed975ea2edd4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Feb 2013 23:41:27 +0000 Subject: [PATCH] Fix FTBFS --- tderesources/kolab/CMakeLists.txt | 2 +- tderesources/kolab/Makefile.am | 2 +- tderesources/kolab/{kabc => tdeabc}/CMakeLists.txt | 0 tderesources/kolab/{kabc => tdeabc}/Makefile.am | 0 tderesources/kolab/{kabc => tdeabc}/contact.cpp | 0 tderesources/kolab/{kabc => tdeabc}/contact.h | 0 tderesources/kolab/{kabc => tdeabc}/kolab.desktop | 0 tderesources/kolab/{kabc => tdeabc}/resourcekolab.cpp | 0 tderesources/kolab/{kabc => tdeabc}/resourcekolab.h | 0 tderesources/kolab/{kabc => tdeabc}/resourcekolab_plugin.cpp | 0 tderesources/scalix/CMakeLists.txt | 2 +- tderesources/scalix/Makefile.am | 2 +- tderesources/scalix/{kabc => tdeabc}/CMakeLists.txt | 0 tderesources/scalix/{kabc => tdeabc}/Makefile.am | 0 tderesources/scalix/{kabc => tdeabc}/contact.cpp | 0 tderesources/scalix/{kabc => tdeabc}/contact.h | 0 tderesources/scalix/{kabc => tdeabc}/resourcescalix.cpp | 0 tderesources/scalix/{kabc => tdeabc}/resourcescalix.h | 0 .../scalix/{kabc => tdeabc}/resourcescalix_plugin.cpp | 0 tderesources/scalix/{kabc => tdeabc}/scalix.desktop | 0 wizards/CMakeLists.txt | 4 ++-- 21 files changed, 6 insertions(+), 6 deletions(-) rename tderesources/kolab/{kabc => tdeabc}/CMakeLists.txt (100%) rename tderesources/kolab/{kabc => tdeabc}/Makefile.am (100%) rename tderesources/kolab/{kabc => tdeabc}/contact.cpp (100%) rename tderesources/kolab/{kabc => tdeabc}/contact.h (100%) rename tderesources/kolab/{kabc => tdeabc}/kolab.desktop (100%) rename tderesources/kolab/{kabc => tdeabc}/resourcekolab.cpp (100%) rename tderesources/kolab/{kabc => tdeabc}/resourcekolab.h (100%) rename tderesources/kolab/{kabc => tdeabc}/resourcekolab_plugin.cpp (100%) rename tderesources/scalix/{kabc => tdeabc}/CMakeLists.txt (100%) rename tderesources/scalix/{kabc => tdeabc}/Makefile.am (100%) rename tderesources/scalix/{kabc => tdeabc}/contact.cpp (100%) rename tderesources/scalix/{kabc => tdeabc}/contact.h (100%) rename tderesources/scalix/{kabc => tdeabc}/resourcescalix.cpp (100%) rename tderesources/scalix/{kabc => tdeabc}/resourcescalix.h (100%) rename tderesources/scalix/{kabc => tdeabc}/resourcescalix_plugin.cpp (100%) rename tderesources/scalix/{kabc => tdeabc}/scalix.desktop (100%) diff --git a/tderesources/kolab/CMakeLists.txt b/tderesources/kolab/CMakeLists.txt index d8d19443..9fb08e18 100644 --- a/tderesources/kolab/CMakeLists.txt +++ b/tderesources/kolab/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_subdirectory( shared ) -add_subdirectory( kabc ) +add_subdirectory( tdeabc ) add_subdirectory( knotes ) add_subdirectory( kcal ) diff --git a/tderesources/kolab/Makefile.am b/tderesources/kolab/Makefile.am index 3b883843..a208ed94 100644 --- a/tderesources/kolab/Makefile.am +++ b/tderesources/kolab/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = shared kabc knotes kcal +SUBDIRS = shared tdeabc knotes kcal updatedir = $(kde_datadir)/tdeconf_update update_DATA = kolab-resource.upd diff --git a/tderesources/kolab/kabc/CMakeLists.txt b/tderesources/kolab/tdeabc/CMakeLists.txt similarity index 100% rename from tderesources/kolab/kabc/CMakeLists.txt rename to tderesources/kolab/tdeabc/CMakeLists.txt diff --git a/tderesources/kolab/kabc/Makefile.am b/tderesources/kolab/tdeabc/Makefile.am similarity index 100% rename from tderesources/kolab/kabc/Makefile.am rename to tderesources/kolab/tdeabc/Makefile.am diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp similarity index 100% rename from tderesources/kolab/kabc/contact.cpp rename to tderesources/kolab/tdeabc/contact.cpp diff --git a/tderesources/kolab/kabc/contact.h b/tderesources/kolab/tdeabc/contact.h similarity index 100% rename from tderesources/kolab/kabc/contact.h rename to tderesources/kolab/tdeabc/contact.h diff --git a/tderesources/kolab/kabc/kolab.desktop b/tderesources/kolab/tdeabc/kolab.desktop similarity index 100% rename from tderesources/kolab/kabc/kolab.desktop rename to tderesources/kolab/tdeabc/kolab.desktop diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp similarity index 100% rename from tderesources/kolab/kabc/resourcekolab.cpp rename to tderesources/kolab/tdeabc/resourcekolab.cpp diff --git a/tderesources/kolab/kabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h similarity index 100% rename from tderesources/kolab/kabc/resourcekolab.h rename to tderesources/kolab/tdeabc/resourcekolab.h diff --git a/tderesources/kolab/kabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp similarity index 100% rename from tderesources/kolab/kabc/resourcekolab_plugin.cpp rename to tderesources/kolab/tdeabc/resourcekolab_plugin.cpp diff --git a/tderesources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt index 0be4fd95..9b5ce002 100644 --- a/tderesources/scalix/CMakeLists.txt +++ b/tderesources/scalix/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_subdirectory( shared ) -add_subdirectory( kabc ) +add_subdirectory( tdeabc ) add_subdirectory( kcal ) add_subdirectory( tdeioslave ) add_subdirectory( knotes ) diff --git a/tderesources/scalix/Makefile.am b/tderesources/scalix/Makefile.am index 6ba71e20..f779f1de 100644 --- a/tderesources/scalix/Makefile.am +++ b/tderesources/scalix/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = shared kabc kcal tdeioslave knotes scalixadmin +SUBDIRS = shared tdeabc kcal tdeioslave knotes scalixadmin messages: rc.cpp $(XGETTEXT) shared/*.cpp tdeabc/*.cpp kcal/*.cpp knotes/*.cpp -o $(podir)/kres_scalix.pot diff --git a/tderesources/scalix/kabc/CMakeLists.txt b/tderesources/scalix/tdeabc/CMakeLists.txt similarity index 100% rename from tderesources/scalix/kabc/CMakeLists.txt rename to tderesources/scalix/tdeabc/CMakeLists.txt diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am similarity index 100% rename from tderesources/scalix/kabc/Makefile.am rename to tderesources/scalix/tdeabc/Makefile.am diff --git a/tderesources/scalix/kabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp similarity index 100% rename from tderesources/scalix/kabc/contact.cpp rename to tderesources/scalix/tdeabc/contact.cpp diff --git a/tderesources/scalix/kabc/contact.h b/tderesources/scalix/tdeabc/contact.h similarity index 100% rename from tderesources/scalix/kabc/contact.h rename to tderesources/scalix/tdeabc/contact.h diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp similarity index 100% rename from tderesources/scalix/kabc/resourcescalix.cpp rename to tderesources/scalix/tdeabc/resourcescalix.cpp diff --git a/tderesources/scalix/kabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h similarity index 100% rename from tderesources/scalix/kabc/resourcescalix.h rename to tderesources/scalix/tdeabc/resourcescalix.h diff --git a/tderesources/scalix/kabc/resourcescalix_plugin.cpp b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp similarity index 100% rename from tderesources/scalix/kabc/resourcescalix_plugin.cpp rename to tderesources/scalix/tdeabc/resourcescalix_plugin.cpp diff --git a/tderesources/scalix/kabc/scalix.desktop b/tderesources/scalix/tdeabc/scalix.desktop similarity index 100% rename from tderesources/scalix/kabc/scalix.desktop rename to tderesources/scalix/tdeabc/scalix.desktop diff --git a/wizards/CMakeLists.txt b/wizards/CMakeLists.txt index 418d13b1..a82b735f 100644 --- a/wizards/CMakeLists.txt +++ b/wizards/CMakeLists.txt @@ -110,8 +110,8 @@ if( WITH_SLOX ) install( FILES slox.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) - process_kcfg( sloxwizard.cpp kabcsloxprefs.h tderesources/slox - tderesources_tdeabc_slox.kcfg kabcsloxprefs.kcfgc ) + process_kcfg( sloxwizard.cpp tdeabcsloxprefs.h tderesources/slox + tderesources_tdeabc_slox.kcfg tdeabcsloxprefs.kcfgc ) process_kcfg( sloxwizard.cpp kcalsloxprefs.h tderesources/slox tderesources_kcal_slox.kcfg kcalsloxprefs.kcfgc )