summaryrefslogtreecommitdiffstats
path: root/tderesources/scalix
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 23:41:27 +0000
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-17 23:41:27 +0000
commit070482fcc398b8c5c25c8d3add69ed975ea2edd4 (patch)
tree0f100dc5bc86b0f5877cb74a02669ecf16122a4a /tderesources/scalix
parent00260fbb76eae21106094be8736ef0f1dabde387 (diff)
downloadtdepim-070482fcc398b8c5c25c8d3add69ed975ea2edd4.tar.gz
tdepim-070482fcc398b8c5c25c8d3add69ed975ea2edd4.zip
Fix FTBFS
Diffstat (limited to 'tderesources/scalix')
-rw-r--r--tderesources/scalix/CMakeLists.txt2
-rw-r--r--tderesources/scalix/Makefile.am2
-rw-r--r--tderesources/scalix/tdeabc/CMakeLists.txt (renamed from tderesources/scalix/kabc/CMakeLists.txt)0
-rw-r--r--tderesources/scalix/tdeabc/Makefile.am (renamed from tderesources/scalix/kabc/Makefile.am)0
-rw-r--r--tderesources/scalix/tdeabc/contact.cpp (renamed from tderesources/scalix/kabc/contact.cpp)0
-rw-r--r--tderesources/scalix/tdeabc/contact.h (renamed from tderesources/scalix/kabc/contact.h)0
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix.cpp (renamed from tderesources/scalix/kabc/resourcescalix.cpp)0
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix.h (renamed from tderesources/scalix/kabc/resourcescalix.h)0
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix_plugin.cpp (renamed from tderesources/scalix/kabc/resourcescalix_plugin.cpp)0
-rw-r--r--tderesources/scalix/tdeabc/scalix.desktop (renamed from tderesources/scalix/kabc/scalix.desktop)0
10 files changed, 2 insertions, 2 deletions
diff --git a/tderesources/scalix/CMakeLists.txt b/tderesources/scalix/CMakeLists.txt
index 0be4fd954..9b5ce002b 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 6ba71e205..f779f1ded 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
index bfdaa3478..bfdaa3478 100644
--- a/tderesources/scalix/kabc/CMakeLists.txt
+++ b/tderesources/scalix/tdeabc/CMakeLists.txt
diff --git a/tderesources/scalix/kabc/Makefile.am b/tderesources/scalix/tdeabc/Makefile.am
index e8bbc3bbc..e8bbc3bbc 100644
--- a/tderesources/scalix/kabc/Makefile.am
+++ b/tderesources/scalix/tdeabc/Makefile.am
diff --git a/tderesources/scalix/kabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp
index 457a34e77..457a34e77 100644
--- a/tderesources/scalix/kabc/contact.cpp
+++ b/tderesources/scalix/tdeabc/contact.cpp
diff --git a/tderesources/scalix/kabc/contact.h b/tderesources/scalix/tdeabc/contact.h
index 33ea1a9cb..33ea1a9cb 100644
--- a/tderesources/scalix/kabc/contact.h
+++ b/tderesources/scalix/tdeabc/contact.h
diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp
index ea3928a59..ea3928a59 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix.cpp
diff --git a/tderesources/scalix/kabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index dbb0b93c6..dbb0b93c6 100644
--- a/tderesources/scalix/kabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
diff --git a/tderesources/scalix/kabc/resourcescalix_plugin.cpp b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
index cdfc8f301..cdfc8f301 100644
--- a/tderesources/scalix/kabc/resourcescalix_plugin.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
diff --git a/tderesources/scalix/kabc/scalix.desktop b/tderesources/scalix/tdeabc/scalix.desktop
index cc2a8c464..cc2a8c464 100644
--- a/tderesources/scalix/kabc/scalix.desktop
+++ b/tderesources/scalix/tdeabc/scalix.desktop