Fix FTBFS

11 years ago · 070482fcc3
parent 00260fbb76
commit 070482fcc3
21 changed files with 6 additions and 6 deletions
--- 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 )

--- 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
--- a/tderesources/kolab/tdeabc/CMakeLists.txt
+++ b/tderesources/kolab/tdeabc/CMakeLists.txt
--- a/tderesources/kolab/tdeabc/Makefile.am
+++ b/tderesources/kolab/tdeabc/Makefile.am
--- a/tderesources/kolab/tdeabc/contact.cpp
+++ b/tderesources/kolab/tdeabc/contact.cpp
--- a/tderesources/kolab/tdeabc/contact.h
+++ b/tderesources/kolab/tdeabc/contact.h
--- a/tderesources/kolab/tdeabc/kolab.desktop
+++ b/tderesources/kolab/tdeabc/kolab.desktop
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
--- a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
--- 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 )
--- 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
--- a/tderesources/scalix/tdeabc/CMakeLists.txt
+++ b/tderesources/scalix/tdeabc/CMakeLists.txt
--- a/tderesources/scalix/tdeabc/Makefile.am
+++ b/tderesources/scalix/tdeabc/Makefile.am
--- a/tderesources/scalix/tdeabc/contact.cpp
+++ b/tderesources/scalix/tdeabc/contact.cpp
--- a/tderesources/scalix/tdeabc/contact.h
+++ b/tderesources/scalix/tdeabc/contact.h
--- a/tderesources/scalix/tdeabc/resourcescalix.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix.cpp
--- a/tderesources/scalix/tdeabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
--- a/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
--- a/tderesources/scalix/tdeabc/scalix.desktop
+++ b/tderesources/scalix/tdeabc/scalix.desktop
--- 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 )