Drop automake build support.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

34 files changed, 68 insertions, 1417 deletions

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 934def7..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "admin"]
-	path = admin
-	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
diff --git a/INSTALL b/INSTALL
index 3fa5f0f..624d473 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,56 +1,16 @@
 Basic Installation
 ==================
 
-
-KPilot uses the CMake build system which is the native build system
-for KDE4; for KDE3 applications like KPilot, CMake is also useable.
-You need CMake installed on your system to compile KPilot, but CMake
-is becoming more widespread now. You can get it from www.cmake.org .
-
-First configure KPilot by running
-
-	./configure [options]
-
-If you run configure with no options it will tell you which ones
-are available; you *must* provide at least one for configure to
-work. A most-vanilla configure looks like this:
-
-	./configure --enable-tests=no
-
-Suggested options are at least:
-
-	./configure --enable-debug=yes --enable-tests=yes
-
-You may need to specify a prefix or a location where pilot-link
-is installed; run ./configure --show for a summary of options.
-
-Once configure is done, compile KPilot, by running
-
-	make -f Makefile.cmake
-
-in the KPilot source directory (that is the one containing this
-INSTALL file). This will run CMake to generate the real Makefiles,
-then run make again to build the project in a build-* subdirectory.
-Once it is done, you can run
-
-	make -f Makefile.cmake install
-
-to install KPilot in the KDE directory.
-
-
-
-
-Advanced Installation
-=====================
-
-In order to build KPilot somewhere else, or if the sources are on
-read-only media, use CMake directly instead of using the basic
-Makefile included with KPilot. To do this,
-	1) Create a build directory somewhere
-	2) cd into that build directory
-	3) Run cmake /path/to/kpilot/sources
-	4) Run make
-
-In order to install KPilot somewhere else, use -DCMAKE_INSTALL_PREFIX .
-
-
+KPilot relies on cmake to build.
+
+Here are suggested default options:
+
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 5e895ea..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-## Makefile.am
-## (C) 1997 Stephan Kulow
-## Modified by Adriaan de Groot
-
-SUBDIRS = lib kpilot conduits doc
-
-messages:
-	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"`  > rc.cpp
-	$(XGETTEXT) `find . -name "*.cpp" -o $(podir)/kpilot.pot   
-	-rm -f rc.cpp
-
-DOXYGEN_REFERENCES = kpilot/lib kpilot/kpilot
-include $(top_srcdir)/admin/Doxyfile.am
-
-# Just for the KPilot developers: grab all the strings, for checking.
-devel-pot :
-	extractrc `find . -name "*.rc" -o -name "*.ui"` > /tmp/rc.cpp
-	xgettext -C --keyword=i18n --keyword=I18N_NOOP -o /tmp/kpilot.po \
-		`find . -name "*.cpp"` /tmp/rc.cpp
-
diff --git a/Makefile.cmake b/Makefile.cmake
deleted file mode 100644
index c0265a7..0000000
--- a/Makefile.cmake
+++ /dev/null
@@ -1,65 +0,0 @@
-# This is a GNU makefile. You need GNU make to process it.
-# FreeBSD users should use gmake.
-#
-#
-
-# Unusual configuration things:
-#   CMAKE = path to cmake
-#   BUILD_DIR = directory to build things in
-#   CMAKE_FLAGS = extra flags to CMake.  These will get set by
-#      ./configure, saved to CMakeOptions.txt, and read in below...
-#
-
--include Makefile.cmake.in
-
-BUILD_DIR ?= build-$(shell uname -sr | tr -d [:space:] | tr -Cs a-zA-Z0-9 _ )
-# these come from CMakeOptions.txt (from ./configure)
-CMAKE_FLAGS ?=
-CMAKE ?= cmake
-
-all: build-check
-	@cd "$(BUILD_DIR)" && $(MAKE)
-
-check: lib tests
-	$(BUILD_DIR)/tests/testconstants
-	$(BUILD_DIR)/tests/testcategories --data-dir=tests/data
-	$(BUILD_DIR)/tests/testaddresses --data-dir=tests/data
-	$(BUILD_DIR)/tests/testdatebook --data-dir=tests/data
-
-install: build-check
-	@cd "$(BUILD_DIR)" && $(MAKE) install
-
-uninstall: 
-	@cd "$(BUILD_DIR)" && $(MAKE) uninstall
-
-lib: $(BUILD_DIR)/lib/libkpilot.so
-
-$(BUILD_DIR)/lib/libkpilot.so: build-check
-	@cd "$(BUILD_DIR)/lib" && $(MAKE)
-
-tests: build-check
-	@cd "$(BUILD_DIR)/tests" && $(MAKE)
-
-	
-build-check:
-	test -d "$(BUILD_DIR)" || mkdir -p "$(BUILD_DIR)"
-	test -d "$(BUILD_DIR)"
-	test -f "$(BUILD_DIR)/Makefile" || (cd "$(BUILD_DIR)" && $(CMAKE) .. )
-
-messages:
-	extractrc `find . -name *.rc` > rc.cpp
-	extractrc `find . -name *.ui` >> rc.cpp
-	xgettext -o kpilot.po --keyword=i18n rc.cpp `find . -name *.h` `find . -name *.cpp` 
-
-clean:
-	@rm -rf $(BUILD_DIR)
-
-svnclean:
-	@rm -rf `svn status --no-ignore | awk '/^[?I]/{print $2}'`
-
-help:
-	@echo "Usage: make ( all | install | uninstall | clean )"
-	@echo ""
-
-.PHONY : all check install uninstall lib build-check clean help 
-
diff --git a/README b/README
deleted file mode 100644
index bffacdb..0000000
--- a/README
+++ /dev/null
@@ -1,43 +0,0 @@
-KPILOT 4.9.1 by Adriaan de Groot
-=============================================
-	Additional work by Robert Ambrose,
-	Preston Brown, Adriaan de Groot,
-	Heiko Purnhagen, Joerg Habenicht,
-	David Bishop, Aaron Seigo,
-	Reinhold Kainhofer, Joern Ahrens,
-	Jason Kasper,
-	and probably many more.
-
-	KPilot is software for syncing PalmOS based handhelds
-such as the 3Com Palm Pilot with a machine running some flavor of UNIX.  
-
-	Developer's notes are listed in the file ChangeLog. This is
-probably only of interest if you want to see how certain features developed
-or if certain bugs have been reported before.
-
-	http://www.kpilot.org/
-
-
-
-STANDARD DISCLAIMER, WARNINGS, ETC..
-====================================
-	THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
-been tested anywhere but on my machine and only with my Palm Pilot.  I
-have been using it against XCopilot for development then verifying it
-works with a real Pilot with my Palm Pilot Professional running OS v2.0.4.
-I make no claims that it will work, or even try to work.  I take no
-responsibility for any data loss, damage, etc. done by this software.
-ie:  Should your Pilot burst into flames while trying to sync a new game..
-sorry.
-	That being said, I _really_ want comments regarding the software
-as well as suggestions.  Bug fixes are even snazzier and code
-contributions are welcome.  :)  Send mail to kde-pim@kde.org .
-
-	Dan Pilone
-	pilone@slac.com
-	July 20, 2000
-
-	Adriaan de Groot
-	groot@kde.org
-	November 18, 2006
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..844c0fb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,55 @@
+
+ KPilot – replacement for the Palm Desktop software
+
+KPilot is software for syncing PalmOS based handhelds
+such as the 3Com Palm Pilot with a machine running some flavor of UNIX.  
+
+By Adriaan de Groot
+Additional work by Robert Ambrose,
+Preston Brown, Adriaan de Groot,
+Heiko Purnhagen, Joerg Habenicht,
+David Bishop, Aaron Seigo,
+Reinhold Kainhofer, Joern Ahrens,
+Jason Kasper,
+and probably many more.
+
+
+STANDARD DISCLAIMER, WARNINGS, ETC..
+------------------------------------
+THIS SOFTWARE HAS BUGS.  Use at your own risk.  It has not even
+been tested anywhere but on my machine and only with my Palm Pilot.  I
+have been using it against XCopilot for development then verifying it
+works with a real Pilot with my Palm Pilot Professional running OS v2.0.4.
+I make no claims that it will work, or even try to work.  I take no
+responsibility for any data loss, damage, etc. done by this software.
+ie: Should your Pilot burst into flames while trying to sync a new game..
+sorry.
+
+	Dan Pilone
+	pilone@slac.com
+	July 20, 2000
+
+	Adriaan de Groot
+	groot@kde.org
+	November 18, 2006
+
+.
+
+Contributing
+--------------
+
+If you wish to contribute to kpilot (TDE), you might do so:
+
+- TDE Gitea Workspace (TGW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/gitea
+
+- TDE Weblate Translation Workspace (TWTW) collaboration tool.
+  https://mirror.git.trinitydesktop.org/weblate
+
+
+Translations status
+---------------------
+
+### messages
+[![Translations status](https://mirror.git.trinitydesktop.org/weblate/widgets/applications/-/kpilot/multi-auto.svg
+"Engage in translating")](https://mirror.git.trinitydesktop.org/weblate/projects/applications/kpilot/)
diff --git a/admin b/admin
deleted file mode 160000
-Subproject a7f75ac0ff587d5b8694a1b78557597161f8104
diff --git a/conduits/Makefile.am b/conduits/Makefile.am
deleted file mode 100644
index fed4498..0000000
--- a/conduits/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-###
-### The NULL conduit is a neat programming example, but shouldn't be
-### installed on user systems.
-###
-
-if include_malconduit
-MAL_SUBDIR = malconduit
-else
-MAL_SUBDIR = 
-endif
-
-SUBDIRS = \
-	  abbrowserconduit \
-	  docconduit \
-	  knotes \
-	  $(MAL_SUBDIR) \
-	  memofileconduit \
-	  notepadconduit \
-	  popmail \
-	  sysinfoconduit \
-	  timeconduit \
-	  vcalconduit
-
-###
-### Subdirs you might have for experimental purposes:
-###
-###	null             - a conduit that just logs a single message.
-###	$(PERL_SUBDIR)   - fires off a perl interpreter in a thread.
-###	$(PYTHON_SUBDIR) - starts a python interpreter in a thread.
-###
diff --git a/conduits/abbrowserconduit/Makefile.am b/conduits/abbrowserconduit/Makefile.am
deleted file mode 100644
index 0b99ba1..0000000
--- a/conduits/abbrowserconduit/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-
-kde_module_LTLIBRARIES = conduit_address.la
-
-conduit_address_la_SOURCES = \
-	resolutionDialog_base.ui \
-	kaddressbookConduit.ui \
-	abbrowserSettings.kcfgc \
-	resolutionDialog.cpp \
-	abbrowser-factory.cpp \
-	abbrowser-setup.cpp \
-	tdeabcRecord.cpp \
-	abbrowser-conduit.cpp
-conduit_address_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_address_la_LIBADD = ../../lib/libkpilot.la -ltdeabc -ltdeabc_file
-
-servicedir = $(kde_servicesdir)
-service_DATA = abbrowser_conduit.desktop
-kde_kcfg_DATA = abbrowserconduit.kcfg
-
-tdeabcustompagedir = $(kde_datadir)/kaddressbook/contacteditorpages
-tdeabcustompage_DATA = KPilotCustomFieldEditor.ui
-
-METASOURCES = AUTO
diff --git a/conduits/configure.in.bot b/conduits/configure.in.bot
deleted file mode 100644
index 688f775..0000000
--- a/conduits/configure.in.bot
+++ /dev/null
@@ -1,14 +0,0 @@
-dnl Configure.in.bot for KPilot conduits.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl Copyright (C) 2002 Reinhold Kainhofer
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-if test "$with_mal" = NOTFOUND -o "$with_mal" = no ; then
-    echo ""
-    echo "KPILOT: MAL headers or library not found. AvantGo conduit will not be compiled."
-    echo "KPILOT: Download libmal>=0.20 from http://jasonday.home.att.net/code/libmal/"
-    echo ""
-fi
diff --git a/conduits/configure.in.in b/conduits/configure.in.in
deleted file mode 100644
index ae2359d..0000000
--- a/conduits/configure.in.in
+++ /dev/null
@@ -1,241 +0,0 @@
-dnl Configure.in.in for KPilot conduits.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl Copyright (C) 2002 Reinhold Kainhofer
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-
-
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the MAL conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-dnl
-dnl
-dnl Check to see if MAL header and library are available
-dnl
-
-dnl
-dnl Questions and comments can be sent to kde-pim@kde.org
-dnl
-dnl This was copied and adapted from tdeabc's ldap configure.in.in
-
-
-AC_DEFUN([KPILOT_CHECK_MAL],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-AC_REQUIRE([KPILOT_CHECK_PISOCK])
-
-AC_MSG_CHECKING(for libmal (for KPilots MAL conduit))
-AC_ARG_WITH(mal,
-[  --with-mal=PATH         set path for libmal files @<:@default=check@:>@],
-[ case "$withval" in
-  yes)
-    with_mal=CHECK
-    ;;
-  esac ],
-[ with_mal=CHECK ]
-)dnl
-
-if test "x$with_mal" = "xCHECK" ; then
-  with_mal=NOTFOUND
-  search_incs_tmp="$kde_includes /usr/include /usr/local/include"
-	dnl build the list of include dirs, both with and without libmal appended
-	search_incs="";
-	for idir in $search_incs_tmp; do
-		search_incs="$search_incs $idir $idir/libmal"
-	done
-  AC_FIND_FILE(libmal.h, $search_incs, mal_incdir)
-  if test -r $mal_incdir/libmal.h ; then
-    test "x$mal_incdir" != "x/usr/include" && MAL_INCLUDE="-I$mal_incdir"
-    with_mal=FOUND
-  fi
-  if test $with_mal = FOUND ; then
-    with_mal=NOTFOUND
-    for ext in la so sl a ; do
-      AC_FIND_FILE(libmal.$ext, $kde_libraries $libdir /usr/lib$tdelibsuff /usr/local/lib$tdelibsuff $libdir/libmal /usr/lib/libmal /usr/local/lib/libmal,
-        mal_libdir)
-      if test -r $mal_libdir/libmal.$ext ; then
-        if test "x$mal_libdir" != "x/usr/lib$tdelibsuff" ; then
-          MAL_LIB="-L$mal_libdir "
-          test "$USE_RPATH" = yes && MAL_RPATH="-R $mal_libdir"
-        fi
-        MAL_LIB="${MAL_LIB}-lmal"
-        with_mal=FOUND
-        break
-      fi
-    done
-  fi
-fi
-
-case "$with_mal" in
-no) AC_MSG_RESULT(no) ;;
-NOTFOUND) AC_MSG_RESULT(searched but not found) ;;
-*)
-  if test "x$with_mal" = "xFOUND" ; then
-    msg="incs=$mal_incdir libs=$mal_libdir"
-  else
-    msg="$with_mal"
-    MAL_ROOT="$with_mal"
-    if test "x$MAL_ROOT" != "x/usr" ; then
-      MAL_INCLUDE="-I${MAL_ROOT}/include"
-      MAL_LIB="-L${MAL_ROOT}/lib$tdelibsuff "
-      if test "$USE_RPATH" = "yes" ; then
-        MAL_RPATH="-R ${MAL_ROOT}/lib$tdelibsuff"
-      fi
-    fi
-    MAL_LIB="${MAL_LIBS}-lmal"
-  fi
-
-  kde_save_LIBS="$LIBS"
-  kde_save_CFLAGS="$CFLAGS"
-  kde_save_CPPFLAGS="$CPPFLAGS"
-  kde_save_LDFLAGS="$LDFLAGS"
-  LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
-  CFLAGS="$CFLAGS $MAL_INCLUDE"
-  CPPFLAGS="$CPPFLAGS $all_includes $PISOCK_INCLUDE $MAL_INCLUDE"
-  LDFLAGS="$LDFLAGS $PISOCK_LDFLAGS $all_libraries"
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_LINK(dnl
-  [
-  #include <libmal.h>
-  ],
-  [
-  PalmSyncInfo *psi;
-  ],
-  , with_mal=no
-  )
-  if test "$with_mal" = "no" ; then
-    MAL_LIB="$MAL_LIB -ldl"
-    LIBS="$LIBS $PISOCK_LIB $MAL_LIB"
-    with_mal=yes
-    AC_TRY_LINK(dnl
-    [
-    #include <libmal.h>
-    ],
-    [
-    PalmSyncInfo *psi;
-    ],
-    , with_mal=no
-    )
-  fi
-  if test "$with_mal" = "no" ; then
-    MAL_INCLUDE=
-    MAL_LIB=
-    MAL_RPATH=
-    AC_MSG_RESULT(no (but first try gave $msg))
-  else
-    AC_DEFINE(HAVE_LIBMAL, 1, [Define if you have MAL libraries])
-		dnl check which version we have (pre 0.40 or >=0.40):
-    AC_TRY_LINK(dnl
-    [#include <libmal.h>],
-    [
-    PalmSyncInfo *psi;
-		psi->httpProxy;
-    ],
-    , mal_version20=yes
-    )
-    if test "$mal_version20" = "yes" ; then
-			AC_DEFINE(LIBMAL20, 1, [Define if we have the old libmal version (<0.40)])
-		fi
-    HAVE_LIBMAL=1
-    AC_MSG_RESULT($msg)
-  fi
-  AC_LANG_RESTORE
-  CFLAGS=$kde_save_CFLAGS
-  CPPFLAGS=$kde_save_CPPFLAGS
-  LIBS=$kde_save_LIBS
-  LDFLAGS=$kde_save_LDFLAGS
-  ;;
-esac
-
-AC_SUBST(MAL_INCLUDE)
-AC_SUBST(MAL_LIB)
-AC_SUBST(MAL_RPATH)
-
-AM_CONDITIONAL(include_malconduit, test "$HAVE_LIBMAL" = 1)
-
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the addressbook conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_KABC],[HAVE_KABC=0
-kpilot_save_cflags="$CPPFLAGS -Itderesources/factory.h"
-KDE_CHECK_HEADER(tderesources/factory.h,HAVE_KABC=1,
-	AC_MSG_WARN([KPILOT: No tderesources/factory.h found. No address book conduit will be compiled.]))
-AM_CONDITIONAL(include_abc, test "$HAVE_KABC" = 1)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for the notepad conduit
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_NOTEPAD],[HAVE_NOTEPAD=0
-kpilot_save_cflags="$CPPFLAGS -Ipi-notepad.h"
-kpilot_save_ldflags="$LDFLAGS"
-
-test -z "$PISOCK_INCLUDE" || CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
-KDE_CHECK_HEADER(pi-notepad.h,HAVE_NOTEPAD=1,
-	AC_MSG_WARN([KPILOT: No notepad.h for pilot-link found. No notepad conduit will be compiled.]))
-
-CPPFLAGS="$kpilot_save_cflags"
-LDFLAGS="$kpilot_save_ldflags"
-unset kpilot_save_cflags
-unset kpilot_save_ldflags
-
-AM_CONDITIONAL(include_notepad, test "$HAVE_NOTEPAD" = 1)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                     checks for embedded language conduits
-dnl
-dnl ----------------------------------------------------------------------------
-
-AC_DEFUN([KPILOT_CHECK_PERL],[HAVE_PERL=0
-AC_MSG_CHECKING([for Perl embedding])
-if perl -MExtUtils::Embed -e ccopts > /dev/null 2> /dev/null ; then
-	PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts 2> /dev/null`
-	PERL_LDFLAGS=`perl -MExtUtils::Embed -e ldopts 2> /dev/null`
-	HAVE_PERL=1
-	AC_MSG_RESULT(yes)
-else
-	PERL_CFLAGS=""
-	PERL_LDFLAGS=""
-	AC_MSG_RESULT(no)
-fi
-AC_SUBST(PERL_CFLAGS)
-AC_SUBST(PERL_LDFLAGS)
-AM_CONDITIONAL(include_perl, test "$HAVE_PERL" = 1)
-])
-
-AC_DEFUN([KPILOT_CHECK_PYTHON],[HAVE_PYTHON=0
-AC_MSG_CHECKING([for Python embedding])
-AM_CONDITIONAL(include_python, test "$HAVE_PYTHON" = 1)
-AC_MSG_RESULT(N/A)
-])
-
-dnl ----------------------------------------------------------------------------
-dnl
-dnl                   actually call the checks
-dnl
-dnl ----------------------------------------------------------------------------
-
-KPILOT_CHECK_MAL
-KPILOT_CHECK_KABC
-KPILOT_CHECK_PERL
-KPILOT_CHECK_PYTHON
-KPILOT_CHECK_NOTEPAD
-
diff --git a/conduits/docconduit/Icons/Makefile.am b/conduits/docconduit/Icons/Makefile.am
deleted file mode 100644
index f371f4a..0000000
--- a/conduits/docconduit/Icons/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-METASOURCES = AUTO
-
-kpalmdocicondir = $(kde_datadir)/kpilot/icons
-kpalmdocicon_ICON = kpalmdoc
-
-KDE_ICON = kpalmdoc
-
diff --git a/conduits/docconduit/Makefile.am b/conduits/docconduit/Makefile.am
deleted file mode 100644
index 98398c2..0000000
--- a/conduits/docconduit/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-### Makefile for KPilot's doc  conduit
-###
-### The doc conduit is Copyright (C) 2002 by Reinhold Kainhofer
-### the files makedoc9.{h,cpp} are also Copyright (C) 2000 by Pat Beirne
-
-SUBDIRS = Icons
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-METASOURCES = AUTO
-
-
-servicedir = $(kde_servicesdir)
-service_DATA = doc_conduit.desktop
-
-noinst_LTLIBRARIES = libpalmdoc_shared.la
-kde_module_LTLIBRARIES = conduit_doc.la
-bin_PROGRAMS = kpalmdoc
-
-libpalmdoc_shared_la_SOURCES = makedoc9.cpp pilotDOCHead.cpp pilotDOCEntry.cpp pilotDOCBookmark.cpp DOC-converter.cpp
-libpalmdoc_shared_la_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
-libpalmdoc_shared_la_LIBADD = $(PISOCK_LDFLAGS) $(PISOCK_LIB)
-
-conduit_doc_la_SOURCES = docconduitSettings.kcfgc doc-factory.cpp doc-setup.cpp doc-conduit.cpp doc-setupdialog.ui doc-conflictdialog.cpp
-conduit_doc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_doc_la_LIBADD = ../../lib/libkpilot.la libpalmdoc_shared.la \
-	$(LIB_TDEUI) $(LIB_TDEFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB)
-
-##libpalmdoc_shared.la
-
-kpalmdoc_SOURCES = kpalmdocSettings.kcfgc kpalmdoc_dlgbase.ui kpalmdoc_dlg.cpp kpalmdoc.cpp
-kpalmdoc_LDFLAGS = $(PISOCK_LDFLAGS) $(PISOCK_LIB) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kpalmdoc_LDADD = $(LIB_TDEFILE) $(PISOCK_LDFLAGS) $(PISOCK_LIB) ../../lib/libkpilot.la libpalmdoc_shared.la
-
-xdg_apps_DATA = kpalmdoc.desktop
-servicetypedir = $(kde_servicetypesdir)
-kde_kcfg_DATA = docconduit.kcfg kpalmdoc.kcfg
-
-update_DATA = kpalmdoc.upd
-updatedir = $(kde_datadir)/tdeconf_update
-
diff --git a/conduits/knotes/Makefile.am b/conduits/knotes/Makefile.am
deleted file mode 100644
index e6cf13b..0000000
--- a/conduits/knotes/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir) -I$(top_srcdir)/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = knotes-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_knotes.la
-
-
-conduit_knotes_la_SOURCES = \
-	knotesconduitSettings.kcfgc \
-	knotes-factory.cpp \
-	knotes-setup.cpp \
-	knotes-action.cpp \
-	setup_base.ui
-	
-conduit_knotes_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lkcal
-conduit_knotes_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
-
-kde_kcfg_DATA = knotesconduit.kcfg
diff --git a/conduits/malconduit/Makefile.am b/conduits/malconduit/Makefile.am
deleted file mode 100644
index e190ba7..0000000
--- a/conduits/malconduit/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-### Makefile for the avantgo conduit
-###
-### The mal conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-
-INCLUDES= $(PISOCK_INCLUDE)  $(MAL_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = mal_conduit.desktop
-kde_kcfg_DATA = malconduit.kcfg
-
-kde_module_LTLIBRARIES = conduit_mal.la
-
-conduit_mal_la_SOURCES = malconduitSettings.kcfgc mal-setup_dialog.ui mal-factory.cpp mal-setup.cpp mal-conduit.cpp 
-conduit_mal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_mal_la_LIBADD = ../../lib/libkpilot.la $(MAL_LIB) $(LIB_TDEUI)
-
diff --git a/conduits/memofileconduit/Makefile.am b/conduits/memofileconduit/Makefile.am
deleted file mode 100644
index 9521cae..0000000
--- a/conduits/memofileconduit/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = memofile-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_memofile.la
-
-
-conduit_memofile_la_SOURCES = memofileSettings.kcfgc setup_base.ui \
-	memofile-factory.cpp memofile.cpp memofiles.cpp memofile-conduit.cpp
-conduit_memofile_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_memofile_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEFILE)
-
-kde_kcfg_DATA = memofileconduit.kcfg
diff --git a/conduits/notepadconduit/Makefile.am b/conduits/notepadconduit/Makefile.am
deleted file mode 100644
index 05c8730..0000000
--- a/conduits/notepadconduit/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = notepad-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_notepad.la
-
-conduit_notepad_la_SOURCES = notepadconduit.kcfgc notepad-setup.ui \
-	notepad-conduit.cpp notepad-factory.cpp
-conduit_notepad_la_LDFLAGS= -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_notepad_la_LIBADD= ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO)
-
diff --git a/conduits/null/Makefile.am b/conduits/null/Makefile.am
deleted file mode 100644
index 9560cc5..0000000
--- a/conduits/null/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = null-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_null.la
-
-
-conduit_null_la_SOURCES = nullSettings.kcfgc setup_base.ui null-conduit.cpp null-factory.cpp
-conduit_null_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_null_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
-
-kde_kcfg_DATA = nullconduit.kcfg
diff --git a/conduits/popmail/Makefile.am b/conduits/popmail/Makefile.am
deleted file mode 100644
index fe88987..0000000
--- a/conduits/popmail/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-### Makefile for the popmail conduit
-###
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir  = $(kde_servicesdir)
-service_DATA = popmail-conduit.desktop
-kde_kcfg_DATA = popmail.kcfg
-
-####### This part is very kpilot specific
-# you can add here more. This one gets installed 
-kde_module_LTLIBRARIES = conduit_popmail.la
-
-# Which sources should be compiled for popmail_conduit
-conduit_popmail_la_SOURCES = popmailSettings.kcfgc setup-dialog.ui \
-	popmail-factory.cpp setupDialog.cpp \
-	popmail-conduit.cpp
-conduit_popmail_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lDCOP
-conduit_popmail_la_LIBADD  =  ../../lib/libkpilot.la $(LIB_TDEIO)
-
-# this option you can leave out. Just, if you use "make dist", you need it
-noinst_HEADERS = popmail-conduit.h setupDialog.h
-
diff --git a/conduits/recordconduit/Makefile.am b/conduits/recordconduit/Makefile.am
deleted file mode 100644
index dbefe35..0000000
--- a/conduits/recordconduit/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = record-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_record.la
-
-
-conduit_record_la_SOURCES = settings.kcfgc setup_base.ui factory.cpp
-conduit_record_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_record_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
-
-kde_kcfg_DATA = settings.kcfg
diff --git a/conduits/sysinfoconduit/Makefile.am b/conduits/sysinfoconduit/Makefile.am
deleted file mode 100644
index be840c2..0000000
--- a/conduits/sysinfoconduit/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-### Makefile for the sysinfo conduit
-###
-### The sysinfo conduit is Copyright (C) 2003 by Reinhold Kainhofer
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = sysinfo_conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_sysinfo.la
-
-conduit_sysinfo_la_SOURCES = sysinfoSettings.kcfgc \
-	sysinfo-factory.cpp \
-	sysinfo-setup.cpp \
-	sysinfo-conduit.cpp \
-	sysinfo-setup_dialog.ui
-conduit_sysinfo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_sysinfo_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI) $(LIB_TDEIO)
-
-kpilot_sysinfo_data_DATA = Template.html Template.txt
-kpilot_sysinfo_datadir = $(kde_datadir)/kpilot/sysinfoconduit
-EXTRA_DIST = $(kpilot_sysinfo_data_DATA)
-kde_kcfg_DATA = sysinfoconduit.kcfg
diff --git a/conduits/timeconduit/Makefile.am b/conduits/timeconduit/Makefile.am
deleted file mode 100644
index 2d8c8ae..0000000
--- a/conduits/timeconduit/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-### Makefile for the time conduit
-###
-### The time conduit is Copyright (C) 2002 by Reinhold Kainhofer
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-METASOURCES = AUTO
-
-servicedir = $(kde_servicesdir)
-service_DATA = time_conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_time.la
-
-
-conduit_time_la_SOURCES = timeConduitSettings.kcfgc \
-	time-factory.cpp \
-	time-setup.cpp \
-	time-conduit.cpp \
-	time-setup_dialog.ui
-conduit_time_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui
-conduit_time_la_LIBADD = ../../lib/libkpilot.la $(LIB_TDEUI)
- 
-kde_kcfg_DATA = timeconduit.kcfg
diff --git a/conduits/vcalconduit/Makefile.am b/conduits/vcalconduit/Makefile.am
deleted file mode 100644
index 67cbb91..0000000
--- a/conduits/vcalconduit/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-###
-### Makefile for vcal and todo conduits. These two conduits share most code,
-### so it seems logical to put them in one place.
-###
-
-INCLUDES= -I$(top_srcdir)/lib -I$(top_srcdir) \
-	$(PISOCK_INCLUDE) $(all_includes)
-
-METASOURCES = AUTO
-
-servicedir  = $(kde_servicesdir)
-service_DATA = vcal-conduit.desktop todo-conduit.desktop
-
-kde_module_LTLIBRARIES = conduit_vcal.la conduit_todo.la
-noinst_LTLIBRARIES = libvcalconduit_shared.la
-
-libvcalconduit_shared_la_SOURCES = vcalconduitSettings.kcfgc \
-	korganizerConduit.ui \
-	kcalRecord.cpp \
-	vcal-setupbase.cpp \
-	vcal-conduitbase.cpp \
-	cleanupstate.cpp deleteunsyncedhhstate.cpp deleteunsyncedpcstate.cpp \
-	hhtopcstate.cpp initstate.cpp pctohhstate.cpp teststate.cpp
-
-conduit_vcal_la_SOURCES = vcal-conduit.cpp vcalRecord.cpp \
-	vcal-factory.cpp vcal-setup.cpp
-conduit_vcal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
-conduit_vcal_la_LIBADD = ../../lib/libkpilot.la \
-	libvcalconduit_shared.la
-conduit_vcal_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
-
-conduit_todo_la_SOURCES = todo-conduit.cpp todoRecord.cpp \
-	todo-factory.cpp todo-setup.cpp
-conduit_todo_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(PISOCK_LIB) $(LIB_TQT) -ltdecore -ltdeio -ltdeui -lkcal -ltderesources
-conduit_todo_la_LIBADD = ../../lib/libkpilot.la \
-	libvcalconduit_shared.la
-conduit_todo_la_COMPILE_FIRST = vcalconduitSettings.h korganizerConduit.h
-
-
-kde_kcfg_DATA = vcalconduitbase.kcfg
-
diff --git a/configure.in.bot b/configure.in.bot
deleted file mode 100644
index aca4de5..0000000
--- a/configure.in.bot
+++ /dev/null
@@ -1,18 +0,0 @@
-if test "$HAVE_PISOCK" = "0" ; then
-	echo ""
-	echo "You're missing a compatible version of pilot-link for KPilot."
-	echo "KPilot will not be built."
-	echo ""
-	all_tests=bad
-else
-	if test "x$HAVE_BAD_PISOCK" = "xYES" ; then
-		echo ""
-		echo "You have a version of pilot-link < 0.12.0."
-		echo "This version is old and is known to cause problems"
-		echo "with KPilot.  Please compile KPilot with "
-		echo "pilot-link version 0.12.0 or greater."
-		echo "KPilot will not be built."
-		echo ""
-		all_tests=bad
-	fi
-fi
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index a709ef7..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,294 +0,0 @@
-#MIN_CONFIG(3.3)
-KDE_ENABLE_HIDDEN_VISIBILITY
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h)
-
-AC_CHECK_SETENV
-AC_CHECK_UNSETENV
-
-KDE_NEED_FLEX
-
-if test "$x_includes" != "NONE"; then
-  AC_DEFINE(HAVE_X11_HEADERS,1,Define if you have X11 header files)
-fi
-AC_CHECK_LIB(Xtst, XTestFakeKeyEvent, [LIBXTST=-lXtst],, -lX11)
-AC_SUBST(LIBXTST)
-if test "$LIBXTST" != ""; then
-  AC_CHECK_HEADER([X11/extensions/XTest.h],
-                  [AC_DEFINE(HAVE_XTEST, 1, [Define if you have X11 Xtest header files])])
-fi
-
-KDE_INIT_DOXYGEN([KDE PIM API Reference], [Version $VERSION])
-
-KDE_CHECK_THREADING
-
-dnl For apps that NEED threads
-if test -z "$LIBPTHREAD" && test -z "$USE_THREADS"; then
-  DO_NOT_COMPILE="$DO_NOT_COMPILE knode"
-fi
-
-CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
-
-dnl Configure.in.in for KPilot.
-dnl
-dnl Copyright (C) 2000,2001 Adriaan de Groot
-dnl
-dnl This file is released under the terms of the Gnu General Public
-dnl Licence (GPL) Version 2.
-
-dnl
-dnl Check to see if pisock header and library are available
-dnl
-
-dnl
-dnl Questions and comments can be sent to groot@kde.org
-dnl
-
-dnl Check for the headers first. The first test is the somewhat-
-dnl sophisticated one AC uses, and incorporates all the extra-includes
-dnl and whatnot stuff.
-dnl
-dnl We need to explicitly use the --with-extra-includes passed in,
-dnl since AC_CHECK_HEADER does not do so.
-dnl
-
-
-AC_DEFUN([KPILOT_CHECK_PISOCK],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_MSG_CHECKING(for pilot-link (for KPilot))
-AC_ARG_WITH(pilot_link,
-[  --with-pilot-link=PATH  set prefix for pilot-link files @<:@default=check@:>@],
-[
-  case "$withval" in
-  yes)
-    with_pilot_link=CHECK
-    ;;
-  esac ],
-[ with_pilot_link=CHECK ]
-)dnl
-
-case "$with_pilot_link" in
-CHECK)
-	AC_MSG_RESULT([autodetect])
-	;;
-*)
-	if test -d "$with_pilot_link" ; then
-		AC_MSG_RESULT([$with_pilot_link])
-	else
-		AC_MSG_RESULT([autodetect])
-		with_pilot_link=CHECK
-		AC_MSG_WARN([The path provided for pilot-link, $with_pilot_link, does not exist.])
-	fi
-	;;
-esac
-
-
-
-AC_LANG_PUSH(C++)
-
-kpilot_save_cflags="$CPPFLAGS -Ipi-file.h -Ipi-version.h"
-kpilot_save_ldflags="$LDFLAGS"
-
-
-CPPFLAGS="$CPPFLAGS $all_includes"
-LDFLAGS="$LDFLAGS $all_libraries"
-
-HAVE_PISOCK=0
-HAVE_BAD_PISOCK=NO
-
-PISOCK_LIB=""
-PISOCK_LDFLAGS=""
-PISOCK_INCLUDE=""
-pisock_path=""
-
-dnl Try looking normally
-dnl
-dnl
-if test "x$with_pilot_link" = "xCHECK" ; then
-KDE_CHECK_HEADER(pi-file.h,[HAVE_PISOCK=1], )
-fi
-
-dnl If nothing found, try some other places that might have
-dnl pilot-link installed. These can be extended for particular
-dnl distro's; /vol/kde is where I install stuff on Suns and BSD.
-dnl
-dnl
-if  test "$HAVE_PISOCK" = "0" ; then
-	pisock_path=""
-	AC_MSG_CHECKING([for pi-file.h alternate])
-	if test "x$with_pilot_link" = "xCHECK" ; then
-		for i in /usr/local/pilot/include /usr/local/include /vol/kde/support/include /usr/include /usr/include/libpisock ; do
-			test -f $i/pi-file.h && HAVE_PISOCK=1
-			test -f $i/pi-file.h && PISOCK_INCLUDE="-I$i"
-			test -f $i/pi-file.h && pisock_path="$i"
-		done
-	else
-		test -f "$with_pilot_link/include/pi-file.h" && HAVE_PISOCK=1
-		test -f "$with_pilot_link/include/pi-file.h" && PISOCK_INCLUDE="-I$with_pilot_link/include"
-		test -f "$with_pilot_link/include/pi-file.h" && pisock_path="$with_pilot_link/include"
-	fi
-
-	if test "$pisock_path" ; then
-		AC_MSG_RESULT([found $pisock_path])
-	else
-		AC_MSG_RESULT([still not found])
-		HAVE_PISOCK="0"
-	fi
-
-fi
-
-dnl Next, check the version of pilot-link to make sure it's sufficiently new.
-dnl
-dnl
-if test -z "$pisock_path" ; then
-	KDE_CHECK_HEADER(pi-version.h,[HAVE_PISOCK=1], )
-else
-	test -d "$pisock_path" || HAVE_PISOCK="0"
-	test -f "$pisock_path/pi-version.h" || HAVE_PISOCK="0"
-fi
-
-dnl Now we know where the includes are, we need to
-dnl check the version more closely.
-dnl
-dnl
-CPPFLAGS="$CPPFLAGS $PISOCK_INCLUDE"
-if test "$HAVE_PISOCK" = "1" ; then
-	LDFLAGS_save="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -ltqt"
-	AC_MSG_CHECKING([pilot-link version])
-	AC_TRY_RUN([
-	#include <pi-version.h>
-	int main()
-	{ if (PILOT_LINK_VERSION==0) {
-            if ((PILOT_LINK_MAJOR==12) && (PILOT_LINK_MINOR>=0)) return (0);
-	  }
-	  return (1);
-	}
-	]
-	,
-	[AC_MSG_RESULT([pilot-link version >= 0.12.0 found])],
-	[AC_MSG_RESULT([Your version of pilot-link won't work with KPilot])]
-	HAVE_PISOCK="0"
-	,
-	[AC_MSG_RESULT([Cross-compiling KPilot is doomed])
-	HAVE_PISOCK="0"
-	])
-	LDFLAGS="$LDFLAGS_save"
-fi
-
-if test "x$with_pilot_link" = "xCHECK" ; then
-
-# Fairly random collection of possible extra libraries needed
-# to link pilot-link against.
-if test "$HAVE_PISOCK" = "1" ; then
-	LDFLAGS_save="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -ltqt"
-	HAVE_PISOCK=0
-
-	AC_CHECK_LIB(pisock,
-		pi_accept,
-		[PISOCK_LIB="-lpisock"
-		HAVE_PISOCK=1
-		],
-		[
-		unset ac_cv_lib_pisock_pi_accept
-		AC_CHECK_LIB(pisock,
-			pi_accept,
-			[PISOCK_LIB="-lpisock -lsocket"
-			HAVE_PISOCK=1
-			],
-			[
-			unset ac_cv_lib_pisock_pi_accept
-			AC_CHECK_LIB(pisock,
-				pi_accept,
-				[PISOCK_LIB="-lpisock -lsocket -lxnet"
-				HAVE_PISOCK=1
-				],
-				[
-					AC_CHECK_LIB(pisock,
-					pi_accept,
-					[PISOCK_LIB="-lpisock -lnsl -lsocket"
-					HAVE_PISOCK=1
-					],
-					[HAVE_PISOCK=0
-					])
-				],
-				[-lsocket -lxnet]
-				)
-			],
-			[-lsocket]
-			)
-		]
-		)
-	LDFLAGS="$LDFLAGS_save"
-fi
-fi
-
-# No libpisock found yet, but the headers have been found
-if test -z "$PISOCK_LIB" ; then
-if test "$HAVE_PISOCK" = "1" ; then
-
-HAVE_PISOCK=0
-
-if test "x$with_pilot_link" = "xCHECK" ; then
-dnl Run through the loop *anyway*, even if we've already found
-dnl the library. The inner if makes sure that we only check until
-dnl we've found the library once.
-dnl
-dnl
-for i in /usr/local/pilot/lib /usr/local/lib /vol/kde/support/lib ; do
-	if test "$HAVE_PISOCK" = "0" ; then
-		CPPFLAGS="$kpilot_save_cflags  $all_includes $PISOCK_INCLUDE"
-		LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$i -R$i"
-
-		unset ac_cv_lib_pisock_pi_accept
-		AC_CHECK_LIB(pisock,pi_accept,
-			[PISOCK_LDFLAGS="-L$i -R$i"
-			PISOCK_LIB="-lpisock"
-			HAVE_PISOCK=1],[],[])
-	fi
-done
-else
-	CPPFLAGS="$kpilot_save_cflags  $all_includes $PISOCK_INCLUDE"
-	LDFLAGS="$kpilot_save_ldflags  $all_libraries -L$with_pilot_link/lib -R$with_pilot_link/lib"
-
-	unset ac_cv_lib_pisock_pi_accept
-	AC_CHECK_LIB(pisock,pi_accept,
-		[PISOCK_LDFLAGS="-L$with_pilot_link/lib -R$with_pilot_link/lib"
-		PISOCK_LIB="-lpisock"
-		HAVE_PISOCK=1],[],[])
-fi
-fi
-fi
-
-
-if test "$HAVE_PISOCK" = "0" ; then
-	PISOCK_LIB=""
-	PISOCK_LDFLAGS=""
-	PISOCK_INCLUDE=""
-	DO_NOT_COMPILE="$DO_NOT_COMPILE kpilot"
-fi
-
-AC_SUBST(PISOCK_LIB)
-AC_SUBST(PISOCK_LDFLAGS)
-AC_SUBST(PISOCK_INCLUDE)
-AM_CONDITIONAL(compile_kpilot, test "$HAVE_PISOCK" = 1)
-
-
-CPPFLAGS="$kpilot_save_cflags"
-LDFLAGS="$kpilot_save_ldflags"
-unset kpilot_save_cflags
-unset kpilot_save_ldflags
-
-AC_LANG_POP(C++)
-
-dnl Remainder is for standalone use
-AC_HEADER_TIME
-AC_CHECK_GETDOMAINNAME
-
-])
-KPILOT_CHECK_PISOCK
-
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 5c0b20e..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-KDE_LANG = en
-KDE_DOCS = AUTO
-SUBDIRS = $(AUTODIRS)
diff --git a/doc/kpilot/Makefile.am b/doc/kpilot/Makefile.am
deleted file mode 100644
index 6792fc5..0000000
--- a/doc/kpilot/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-KDE_DOCS = kpilot
-KDE_LANG = en
diff --git a/kpilot/Icons/Makefile.am b/kpilot/Icons/Makefile.am
deleted file mode 100644
index 9dc8ffc..0000000
--- a/kpilot/Icons/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-METASOURCES = AUTO
-
-kpilotDaemonicondir = $(kde_datadir)/kpilot/icons
-kpilotDaemonicon_ICON = hotsync busysync nosync
-
-kpiloticondir = $(kde_datadir)/kpilot/icons
-kpiloticon_ICON = backup fastsync fullsync listsync restore \
-	kpilotaddress \
-	kpilotknotes \
-	kpilotfileinstaller \
-	kpilotdb \
-	kpilotcalendar \
-	kpilottodo \
-	kpilotbhotsync
-
-KDE_ICON = kpilot kpilotDaemon
-
-kpilotpicsdir = $(kde_datadir)/kpilot/pics
-kpilotpics_DATA = kpilot-splash.png
diff --git a/kpilot/Makefile-standalone b/kpilot/Makefile-standalone
deleted file mode 100644
index ceab205..0000000
--- a/kpilot/Makefile-standalone
+++ /dev/null
@@ -1,167 +0,0 @@
-# Makefile for a standalone kpilotConfig
-
-TQTDIR=/usr/lib/qt-2.3.0
-TDEDIR=/vol/kde/kde-2.2
-
-MOC=$(TQTDIR)/bin/moc
-UIC=$(TQTDIR)/bin/uic
-DCOPIDL=$(TDEDIR)/bin/dcopidl
-DCOPIDL2CPP=$(TDEDIR)/bin/dcopidl2cpp
-
-CXX=g++
-CXXFLAGS=-DDEBUG -DDEBUG_CERR
-# INCLUDES=-I$(TQTDIR)/include -I$(TDEDIR)/include
-#
-# Or, for stupid RH 7.1 systems:
-INCLUDES=-I$(TQTDIR)/include -I$(TDEDIR)/include -I../lib
-LDFLAGS=-L$(TDEDIR)/lib -Wl,-R -Wl,$(TDEDIR)/lib \
-	-L$(TQTDIR)/lib -Wl,-R -Wl,$(TQTDIR)/lib \
-	-L../lib/.libs
-
-CONFIG_DISTDIR=kpilotConfig-0.2
-CONFIG_OBJS=kpilotConfig.o \
-	kpilotConfigDialog.o kpilotConfigDialog_base.o \
-	conduitConfigDialog.o conduitConfigDialog_base.o \
-	main-config.o
-CONFIG_MOCS=kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
-	conduitConfigDialog.moc conduitConfigDialog_base.moc
-	
-CONFIG_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui
-CONFIG_LIBS=-ltdeui -ltdefile -ltdecore -lqt -lkpilot
-
-TEST_DISTDIR=kpilotTest-0.2
-TEST_OBJS=kpilotConfig.o \
-	pilotComponent.o logWidget.o \
-	hotSync.o interactiveSync.o main-test.o
-TEST_MOCS= pilotComponent.moc logWidget.moc \
-	interactiveSync.moc hotSync.moc
-TEST_EXTRA=pilotUser.h
-TEST_LIBS=-lkpilot -ltdefile -ltdeui -lqt -lpisock 
-
-KPILOT_DISTDIR=kpilot-4.2.9
-KPILOT_OBJS= pilotDaemonDCOP_stub.o \
-	kpilotDCOP_skel.o \
-	kpilot.o kpilotConfig.o \
-	kpilotConfigDialog.o kpilotConfigDialog_base.o \
-	pilotComponent.o logWidget.o memoWidget.o addressWidget.o \
-	addressEditor.o \
-	listItems.o \
-	fileInstaller.o fileInstallWidget.o \
-	conduitConfigDialog.o conduitConfigDialog_base.o
-KPILOT_MOCS=pilotComponent.moc logWidget.moc memoWidget.moc addressWidget.moc \
-	fileInstaller.moc addressEditor.moc \
-	fileInstallWidget.moc \
-	kpilotConfigDialog_base.moc kpilotConfigDialog.moc \
-	kpilot.moc 
-KPILOT_EXTRA=kpilotConfigDialog_base.ui conduitConfigDialog_base.ui \
-	pilotDaemonDCOP.h kpilotDCOP.h \
-	pilotAppCategory.h pilotDatabase.h kpilot_on_pp.h
-KPILOT_LIBS=-ltdefile -ltdeui -lqt -lkpilot -lpisock
-
-DAEMON_DISTDIR=kpilotDaemon-4.2.9
-DAEMON_OBJS= pilotDaemonDCOP_skel.o kpilotDCOP_stub.o \
-	pilotDaemon.o kpilotConfig.o \
-	fileInstaller.o \
-	hotSync.o interactiveSync.o
-DAEMON_MOCS=pilotDaemon.moc \
-	fileInstaller.moc
-DAEMON_EXTRA=pilotDaemonDCOP.h kpilotDCOP.h pilotUser.h \
-	hotsync.h busysync.h
-DAEMON_LIBS=-ltdefile -ltdeui -lqt -lkpilot -lpisock
-
-DISTFILES=kpilotConfig.tar.gz kpilotTest.tar.gz kpilot.tar.gz kpilotDaemon.tar.gz
-
-all : kpilotConfig kpilotTest kpilot kpilotDaemon
-
-kpilotConfig : $(CONFIG_MOCS) $(CONFIG_OBJS)
-	g++ -o $@ $(CONFIG_OBJS) $(LDFLAGS) $(CONFIG_LIBS)
-
-kpilotTest : $(TEST_MOCS) $(TEST_OBJS)
-	g++ -o $@ $(TEST_OBJS) $(LDFLAGS) $(TEST_LIBS)
-
-kpilot : $(KPILOT_MOCS) $(KPILOT_OBJS)
-	g++ -o $@ $(KPILOT_OBJS) $(LDFLAGS) $(KPILOT_LIBS)
-
-kpilotDaemon : $(DAEMON_MOCS) $(DAEMON_OBJS)
-	g++ -o $@ $(DAEMON_OBJS) $(LDFLAGS) $(DAEMON_LIBS)
-	
-clean :
-	rm -f $(CONFIG_OBJS) $(CONFIG_MOCS) $(KPILOT_OBJS) $(DAEMON_OBJS)
-	rm -f $(TEST_OBJS) $(TEST_MOCS) $(KPILOT_MOCS) $(DAEMON_MOCS)
-	rm -f $(DISTFILES)
-
-dist : $(DISTFILES)
-
-kpilotConfig.tar.gz :
-	test -d $(CONFIG_DISTDIR) || mkdir $(CONFIG_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilotConfig/' Makefile-standalone \
-		> $(CONFIG_DISTDIR)/Makefile
-	-cp $(CONFIG_OBJS:%.o=%.cpp) $(CONFIG_OBJS:%.o=%.h) $(CONFIG_DISTDIR)
-	-cp $(CONFIG_EXTRA) $(CONFIG_DISTDIR)
-	tar cvzf $@ $(CONFIG_DISTDIR)
-	-rm -f $(CONFIG_DISTDIR)/*
-	-rmdir $(CONFIG_DISTDIR)
-
-kpilotTest.tar.gz :
-	test -d $(TEST_DISTDIR) || mkdir $(TEST_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilotTest/' Makefile-standalone \
-		> $(TEST_DISTDIR)/Makefile
-	-cp $(TEST_OBJS:%.o=%.cpp) $(TEST_OBJS:%.o=%.h) $(TEST_DISTDIR)
-	-cp $(TEST_EXTRA) $(TEST_DISTDIR)
-	tar cvzf $@ $(TEST_DISTDIR)
-	-rm -f $(TEST_DISTDIR)/*
-	-rmdir $(TEST_DISTDIR)
-
-kpilot.tar.gz :
-	test -d $(KPILOT_DISTDIR) || mkdir $(KPILOT_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilot/' Makefile-standalone \
-		> $(KPILOT_DISTDIR)/Makefile
-	-cp $(KPILOT_OBJS:%.o=%.cpp) $(KPILOT_OBJS:%.o=%.h) $(KPILOT_DISTDIR)
-	-cp $(KPILOT_EXTRA) $(KPILOT_DISTDIR)
-	tar cvzf $@ $(KPILOT_DISTDIR)
-	-rm -f $(KPILOT_DISTDIR)/*
-	-rmdir $(KPILOT_DISTDIR)
-
-kpilotDaemon.tar.gz :
-	test -d $(DAEMON_DISTDIR) || mkdir $(DAEMON_DISTDIR)
-	sed -e 's/^all *:.*/all : kpilotDaemon/' Makefile-standalone \
-		> $(DAEMON_DISTDIR)/Makefile
-	-cp $(DAEMON_OBJS:%.o=%.cpp) $(DAEMON_OBJS:%.o=%.h) $(DAEMON_DISTDIR)
-	-cp $(DAEMON_EXTRA) $(DAEMON_DISTDIR)
-	tar cvzf $@ $(DAEMON_DISTDIR)
-	-rm -f $(DAEMON_DISTDIR)/*
-	-rmdir $(DAEMON_DISTDIR)
-
-conduitConfigDialog_base.cpp : conduitConfigDialog_base.h conduitConfigDialog_base.ui
-	echo '#include <tdelocale.h>' > $@
-	$(UIC) -tr i18n -i conduitConfigDialog_base.h conduitConfigDialog_base.ui | \
-		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
-	echo '#include "conduitConfigDialog_base.moc"' >> $@
-
-conduitConfigDialog_base.h : conduitConfigDialog_base.ui
-	$(UIC) -o $@ $<
-
-kpilotConfigDialog_base.cpp : kpilotConfigDialog_base.h kpilotConfigDialog_base.ui
-	echo '#include <tdelocale.h>' > $@
-	$(UIC) -tr i18n -i kpilotConfigDialog_base.h kpilotConfigDialog_base.ui | \
-		sed -e "s,i18n( \"\" ),QString::null,g" >> $@
-	echo '#include "kpilotConfigDialog_base.moc"' >> $@
-
-kpilotConfigDialog_base.h : kpilotConfigDialog_base.ui
-	$(UIC) -o $@ $<
-
-
-%.kidl : %.h
-	$(DCOPIDL) $< > $@ || ( rm -f $@ ; /bin/false )
-
-%_stub.cpp : %.kidl
-	$(DCOPIDL2CPP) --c++-suffix cc --no-skel $<
-
-%_skel.cpp : %.kidl
-	$(DCOPIDL2CPP) --c++-suffix cc --no-stub $<
-	
-%.o : %.cpp
-	g++ -c $(CXXFLAGS) $(INCLUDES) -o $@ $<
-
-%.moc : %.h
-	$(MOC) -o $@ $<
diff --git a/kpilot/Makefile.am b/kpilot/Makefile.am
deleted file mode 100644
index a74c08e..0000000
--- a/kpilot/Makefile.am
+++ /dev/null
@@ -1,104 +0,0 @@
-### Makefile.am for KPilot
-###
-### This is a bit of a mess, but that's partly because we build two
-### executables and one library from the sources in this dir.
-###
-###
-###
-
-SUBDIRS = Icons
-
-noinst_LTLIBRARIES = libconfiguration.la
-noinst_PROGRAMS = kpilotTest
-bin_PROGRAMS = kpilot kpilotDaemon
-kde_module_LTLIBRARIES = kcm_kpilot.la
-
-METASOURCES = AUTO
-
-INCLUDES= $(PISOCK_INCLUDE) -I$(top_srcdir)/lib $(all_includes)
-
-libconfiguration_la_SOURCES = kpilotConfig.cpp kpilotSettings.kcfgc
-libconfiguration_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-
-kcm_kpilot_la_SOURCES = pilotDaemonDCOP.stub  kpilotConfigDialog.cpp \
-	kpilotConfigDialog_device.ui \
-	kpilotConfigDialog_sync.ui \
-	kpilotConfigDialog_startup.ui \
-	kpilotConfigDialog_viewers.ui \
-	kpilotConfigDialog_backup.ui \
-	conduitConfigDialog.cpp \
-	kpilotProbeDialog.cpp \
-	kpilotConfigWizard_address.kcfgc \
-	kpilotConfigWizard_notes.kcfgc \
-	kpilotConfigWizard_vcal.kcfgc \
-	kpilotConfigWizard_user.ui \
-	kpilotConfigWizard_app.ui \
-	kpilotConfigWizard.cpp \
-	dbSelectionDialog.cpp dbSelection_base.ui
-kcm_kpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -module -avoid-version -no-undefined
-kcm_kpilot_la_LIBADD = $(LIB_TDEFILE) $(PISOCK_LIB) \
-	../lib/libkpilot.la \
-	libconfiguration.la
-
-
-kpilot_SOURCES	= \
-	pilotDaemonDCOP.stub kpilotDCOP.skel loggerDCOP.skel \
-	kpilot.cpp \
-	pilotComponent.cpp logWidget.cpp memoWidget.cpp \
-	addressWidget.cpp addressEditor.cpp \
-	dbviewerWidget.cpp dbFlagsEditor.cpp dbFlagsEditor_base.ui \
-	dbRecordEditor.cpp dbAppInfoEditor.cpp \
-	datebookWidget.cpp \
-	todoWidget.cpp todoEditor.cpp todoEditor_base.ui \
-	fileInstaller.cpp fileInstallWidget.cpp \
-	listItems.cpp
-kpilot_COMPILE_FIRST = kpilotSettings.h
-
-
-kpilotDaemon_SOURCES = \
-	pilotDaemonDCOP.skel kpilotDCOP.stub loggerDCOP.stub loggerDCOP.skel \
-	pilotDaemon.cpp logFile.cpp \
-	hotSync.cpp internalEditorAction.cpp \
-	fileInstaller.cpp
-
-kpilotTest_SOURCES = \
-	logWidget.cpp pilotComponent.cpp \
-	hotSync.cpp internalEditorAction.cpp \
-	loggerDCOP.skel \
-	main-test.cpp
-
-
-kpilot_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kpilotDaemon_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-kpilotTest_LDFLAGS = $(PISOCK_LDFLAGS) $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-
-
-# the libraries to link against. Be aware of the order. First the libraries,
-# that depend on the following ones.
-kpilot_LDADD		= $(LIB_TDEFILE) $(PISOCK_LIB) -ltdeutils \
-	../lib/libkpilot.la  libconfiguration.la
-kpilotDaemon_LDADD	= $(LIB_TDEFILE) $(PISOCK_LIB) \
-	../lib/libkpilot.la libconfiguration.la
-kpilotTest_LDADD	= $(LIB_TDEFILE) $(PISOCK_LIB) \
-	../lib/libkpilot.la libconfiguration.la
-
-xdg_apps_DATA = kpilot.desktop  kpilotdaemon.desktop
-kde_kcfg_DATA = kpilot.kcfg
-kde_services_DATA = kpilot_config.desktop
-
-servicetypedir = $(kde_servicetypesdir)
-servicetype_DATA = kpilotconduit.desktop
-
-rcdir = $(kde_datadir)/kpilot
-rc_DATA = kpilotui.rc
-
-update_DATA = kpilot.upd
-updatedir = $(kde_datadir)/tdeconf_update
-
-DOXYGEN_REFERENCES = tdeui kpilot/lib
-include $(top_srcdir)/admin/Doxyfile.am
-
-### Some additional dependencies:
-
-kpilotConfigDialog.lo : kpilotSettings.h
-
diff --git a/kpilot/main-config.cpp b/kpilot/main-config.cpp
deleted file mode 100644
index e69de29..0000000
--- a/kpilot/main-config.cpp
+++ /dev/null
diff --git a/kpilot/stamp-h.in b/kpilot/stamp-h.in
deleted file mode 100644
index e69de29..0000000
--- a/kpilot/stamp-h.in
+++ /dev/null
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index 6562f5b..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-### Makefile.am for kpilot/lib
-###
-###
-
-METASOURCES = AUTO
-
-INCLUDES = $(PISOCK_INCLUDE) -I$(top_srcdir) $(all_includes)
-
-### If you must get debugging output on a platform where
-### the libs are built without debugging support, define
-### DEBUG_CERR. Define DEBUG to get debugging support anywhere.
-###
-### KDE_CXXFLAGS=-DDEBUG -DDEBUG_CERR
-##KDE_CXXFLAGS=-DNDEBUG -UDEBUG
-##KDE_CXXFLAGS=-DDEBUG
-
-lib_LTLIBRARIES = libkpilot.la
-
-libkpilot_la_SOURCES = kpilotlibSettings.kcfgc \
-	options.cpp plugin.cpp syncAction.cpp \
-	kpilotlink.cpp kpilotdevicelink.cpp kpilotlocallink.cpp \
-	actions.cpp actionQueue.cpp \
-	pilot.cpp \
-	pilotAppInfo.cpp pilotRecord.cpp pilotDatabase.cpp \
-	pilotLocalDatabase.cpp pilotSerialDatabase.cpp \
-	pilotMemo.cpp \
-	pilotAddress.cpp \
-	pilotDateEntry.cpp \
-	pilotTodoEntry.cpp
-
-libkpilot_la_LDFLAGS = $(PISOCK_LDFLAGS) -no-undefined $(all_libraries) $(KDE_EXTRA_RPATH) $(KDE_RPATH)
-libkpilot_la_LIBADD = $(PISOCK_LIB) $(LIB_TDEUI) $(LIB_TDEABC) -lkcal $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEIO)
-
-kpilotincludedir = $(includedir)/kpilot
-kpilotinclude_HEADERS = \
-	kpilotlink.h kpilotlocallink.h kpilotdevicelink.h \
-	pilot.h \
-	pilotDatabase.h \
-	pilotLinkVersion.h \
-	pilotLocalDatabase.h \
-	pilotRecord.h \
-	pilotSerialDatabase.h \
-	plugin.h \
-	pluginfactory.h \
-	syncAction.h
-
-
-kde_kcfg_DATA = kpilotlib.kcfg
-
-check-local:
-	rm -f FAILED
-	for i in $(srcdir)/*.h ; do \
-		( echo "#include <kdemacros.h>" ; echo "#include \"$$i\"" ; echo "int main(int argc,char **argv){return 0;}" ) > header-test.cpp; \
-		echo "$$i" ; \
-		g++ $(all_includes) -I$(top_builddir) -DTQT_THREAD_SUPPORT -c header-test.cpp || echo "$$i" >> FAILED; \
-	done
-	test ! -e FAILED
-
-DOXYGEN_REFERENCES=libkcal tdecore
-include $(top_srcdir)/admin/Doxyfile.am
diff --git a/lib/data/.gitignore b/lib/data/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/lib/data/.gitignore
+++ /dev/null