diff --git a/kabc/CMakeLists.txt b/kabc/CMakeLists.txt
index 505dc2c07..854b3a580 100644
--- a/kabc/CMakeLists.txt
+++ b/kabc/CMakeLists.txt
@@ -1,187 +1,192 @@
 kde4_header()
 
 project(kabc)
 
 include_directories( ${KDE4_KIO_INCLUDES} )
 
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}/kab
  ${CMAKE_CURRENT_BINARY_DIR}/kab
  ${CMAKE_CURRENT_SOURCE_DIR}/vcardparser
 )
 
 # kabc/vcardparser/Makefile.am: vcards
 
 set(vcards_STAT_SRCS
   ${CMAKE_SOURCE_DIR}/kabc/vcardparser/vcard.cpp
   ${CMAKE_SOURCE_DIR}/kabc/vcardparser/vcardline.cpp
   ${CMAKE_SOURCE_DIR}/kabc/vcardparser/vcardparser.cpp
 )
 
 add_subdirectory( kab )
 add_subdirectory( vcardparser )
 add_subdirectory( formats )
 add_subdirectory( plugins )
 add_subdirectory( scripts )
 add_subdirectory( tests )
 
 
 
 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts
    COMMAND ${PERL_EXECUTABLE}
    ARGS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/makeaddressee
    DEPENDS  ${CMAKE_CURRENT_SOURCE_DIR}/scripts/makeaddressee
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/addressee.src.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/addressee.src.h
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/entrylist
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/field.src.cpp
    )
 
+add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
+   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
+   )
+
 add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripts
    COMMAND  ${PERL_EXECUTABLE}
    ARGS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/makeaddressee
    DEPENDS  ${CMAKE_CURRENT_SOURCE_DIR}/scripts/makeaddressee
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/addressee.src.cpp
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/addressee.src.h
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/entrylist
    ${CMAKE_CURRENT_SOURCE_DIR}/scripts/field.src.cpp
    )
 
 ########### next target ###############
 
 set(kabc_LIB_SRCS
    address.cpp
    addressbook.cpp
-   addressee.cpp
+   ${CMAKE_CURRENT_BINARY_DIR}/addressee.cpp
+   ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
+   ${CMAKE_CURRENT_BINARY_DIR}/field.cpp
    addresseedialog.cpp
    distributionlist.cpp
    distributionlistdialog.cpp
    distributionlisteditor.cpp
    errorhandler.cpp
-   field.cpp
    formatfactory.cpp
    geo.cpp
    key.cpp
    phonenumber.cpp
    picture.cpp
    plugin.cpp
    resource.cpp
    secrecy.cpp
    sound.cpp
    stdaddressbook.cpp
    vcardconverter.cpp
    timezone.cpp
    vcardformat.cpp
    ldifconverter.cpp
    addresslineedit.cpp
    addresseelist.cpp
    vcardtool.cpp
    addresseehelper.cpp
    lock.cpp
    locknull.cpp
    ldif.cpp
    ldapurl.cpp
    ldapconfigwidget.cpp
    sortmode.cpp
    ${vcards_STAT_SRCS}
 )
 
 kde4_automoc(${kabc_LIB_SRCS})
 
 kde4_add_dcop_skels(kabc_LIB_SRCS addresseehelper.h)
 
 kde4_add_library(kabc SHARED ${kabc_LIB_SRCS})
 
 target_link_libraries(kabc  ${KDE4_KDECORE_LIBS} kio kresources )
 
 set_target_properties(kabc PROPERTIES VERSION 1.2.0 SOVERSION 1 )
 install_targets(${LIB_INSTALL_DIR} kabc )
 
 ########### install files ###############
 
 install_files( /share/autostart FILES kab2kabc.desktop )
 install_files( ${DATA_INSTALL_DIR}/kabc FILES countrytransl.map )
 install_files( ${SERVICES_INSTALL_DIR}/kresources FILES kabc_manager.desktop )
 install_files( /include/kabc FILES address.h addressbook.h addressee.h addresseedialog.h    distributionlist.h distributionlistdialog.h distributionlisteditor.h    errorhandler.h field.h format.h formatfactory.h format.h geo.h key.h    phonenumber.h picture.h plugin.h resource.h    secrecy.h sound.h stdaddressbook.h timezone.h    vcardformat.h vcardconverter.h ldifconverter.h    addresslineedit.h addresseelist.h lock.h locknull.h ldif.h    ldapurl.h ldapconfigwidget.h sortmode.h )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #SUBDIRS = kab vcardparser . formats plugins scripts tests
 #
 ## Make sure $(all_includes) remains last!
 #INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc -I$(top_srcdir)/kabc/kab \
 #           -I$(srcdir)/vcardparser $(all_includes)
 #
 #field.cpp: addressee.h addressee.cpp
 #addressee.cpp: addressee.h
 #addressee.cpp addressee.h field.cpp: \
 #				$(srcdir)/scripts/makeaddressee \
 #				$(srcdir)/scripts/addressee.src.cpp \
 #				$(srcdir)/scripts/addressee.src.h \
 #				$(srcdir)/scripts/entrylist \
 #				$(srcdir)/scripts/field.src.cpp
 #	mysrcdir=`cd $(srcdir)/scripts && pwd` ;\
 #	cd scripts && $(PERL) $$mysrcdir/makeaddressee
 #
 #CLEANFILES = addressee.h addressee.cpp field.cpp
 #
 #lib_LTLIBRARIES = libkabc.la
 #libkabc_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 3:0:2 -no-undefined
 #libkabc_la_LIBADD = vcardparser/libvcards.la $(LIB_KIO) \
 #                    $(top_builddir)/kresources/libkresources.la
 #libkabc_la_COMPILE_FIRST = addressee.h
 #
 #libkabc_la_SOURCES = \
 #  address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp \
 #  distributionlist.cpp distributionlistdialog.cpp distributionlisteditor.cpp \
 #  errorhandler.cpp field.cpp formatfactory.cpp geo.cpp key.cpp \
 #  phonenumber.cpp picture.cpp plugin.cpp resource.cpp \
 #  secrecy.cpp sound.cpp stdaddressbook.cpp \
 #  vcardconverter.cpp timezone.cpp \
 #  vcardformat.cpp ldifconverter.cpp addresslineedit.cpp \
 #  addresseelist.cpp vcardtool.cpp addresseehelper.cpp \
 #  addresseehelper.skel lock.cpp locknull.cpp ldif.cpp ldapurl.cpp ldapconfigwidget.cpp \
 #  sortmode.cpp
 #
 #
 #kabcincludedir = $(includedir)/kabc
 #kabcinclude_HEADERS = address.h addressbook.h addressee.h addresseedialog.h \
 #  distributionlist.h distributionlistdialog.h distributionlisteditor.h \
 #  errorhandler.h field.h format.h formatfactory.h format.h geo.h key.h \
 #  phonenumber.h picture.h plugin.h resource.h \
 #  secrecy.h sound.h stdaddressbook.h timezone.h \
 #  vcardformat.h vcardconverter.h ldifconverter.h \
 #  addresslineedit.h addresseelist.h lock.h locknull.h ldif.h \
 #  ldapurl.h ldapconfigwidget.h sortmode.h
 #
 #METASOURCES = AUTO
 #
 #bin_PROGRAMS = kab2kabc
 #
 #kab2kabc_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #kab2kabc_LDADD = libkabc.la ./kab/libkab.la
 #kab2kabc_SOURCES = kab2kabc.cpp
 #
 #autostart_DATA = kab2kabc.desktop
 #autostartdir = $(datadir)/autostart
 #
 #manager_DATA = kabc_manager.desktop
 #managerdir = $(kde_servicesdir)/kresources
 #
 #DOXYGEN_REFERENCES = kdecore kdeui
 #DOXYGEN_EXCLUDE = scripts
 #
 #map_DATA = countrytransl.map
 #mapdir = $(kde_datadir)/kabc
 #
 #EXTRA_DIST = $(map_DATA)
 #
 #include ../admin/Doxyfile.am
diff --git a/kabc/kab/CMakeLists.txt b/kabc/kab/CMakeLists.txt
index 8fc06cdb4..13eeecb8c 100644
--- a/kabc/kab/CMakeLists.txt
+++ b/kabc/kab/CMakeLists.txt
@@ -1,14 +1,14 @@
 kde4_header()
 
 set(kab2kabc_SRCS kab2kabc.cpp kabapi.cc kabaddressbook.cc qconfigDB.cc)
 
 kde4_automoc(${kab2kabc_SRCS})
 
-kde4_add_executable(kab2kabc ${kab2kabc_SRCS})
+kde4_add_executable(kab2kabc NOGUI ${kab2kabc_SRCS})
 
 target_link_libraries(kab2kabc ${KDE4_KDECORE_LIBS} kabc)
 
 install_targets(/bin kab2kabc)
 
 kde4_footer()
 
diff --git a/kabc/vcardparser/CMakeLists.txt b/kabc/vcardparser/CMakeLists.txt
index 04dd12af1..d96fa5409 100644
--- a/kabc/vcardparser/CMakeLists.txt
+++ b/kabc/vcardparser/CMakeLists.txt
@@ -1,95 +1,83 @@
 kde4_header()
 
 include_directories( ${CMAKE_SOURCE_DIR}/kabc )
 
 
 ########### next target ###############
 
 
 ########### next target ###############
 
-set(testread_SRCS
-testread.cpp
-)
-
-kde4_automoc(${testread_SRCS})
-
-if(KDE4_BUILD_TESTS)
-kde4_add_executable(testread ${testread_SRCS})
-
-target_link_libraries(testread  ${KDE4_KDECORE_LIBS} kabc )
-
-endif(KDE4_BUILD_TESTS)
-
-########### next target ###############
-
-set(testwrite_SRCS
-testwrite.cpp
-)
-
-kde4_automoc(${testwrite_SRCS})
-
-if(KDE4_BUILD_TESTS)
-kde4_add_executable(testwrite ${testwrite_SRCS})
-
-target_link_libraries(testwrite  ${KDE4_KDECORE_LIBS} kabc )
-
-endif(KDE4_BUILD_TESTS)
-
-########### next target ###############
-
-set(testread2_SRCS
-testread2.cpp
-testutils.cpp
-)
-
-kde4_automoc(${testread2_SRCS})
-
 if(KDE4_BUILD_TESTS)
-kde4_add_executable(testread2 ${testread2_SRCS})
 
-target_link_libraries(testread2  ${KDE4_KDECORE_LIBS} kabc )
+   set(testread_SRCS testread.cpp )
+   
+   kde4_automoc(${testread_SRCS})
+   
+   kde4_add_executable(testread ${testread_SRCS})
+   
+   target_link_libraries(testread  ${KDE4_KDECORE_LIBS} kabc )
+   
+   ########### next target ###############
+   
+   set(testwrite_SRCS testwrite.cpp )
+   
+   kde4_automoc(${testwrite_SRCS})
+   
+   kde4_add_executable(testwrite ${testwrite_SRCS})
+   
+   target_link_libraries(testwrite  ${KDE4_KDECORE_LIBS} kabc )
+   
+   ########### next target ###############
+   
+   set(testread2_SRCS testread2.cpp testutils.cpp )
+   
+   kde4_automoc(${testread2_SRCS})
+   
+   kde4_add_executable(testread2 ${testread2_SRCS})
+   
+   target_link_libraries(testread2  ${KDE4_KDECORE_LIBS} kabc )
 
 endif(KDE4_BUILD_TESTS)
 
 ########### install files ###############
 install_files( /include/kabc FILES vcard.h vcardline.h vcardparser.h )
 
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #INCLUDES = -I$(top_builddir)/kabc -I$(top_srcdir)/kabc $(all_includes)
 #
 #noinst_LTLIBRARIES = libvcards.la
 #libvcards_la_SOURCES = vcard.cpp vcardline.cpp vcardparser.cpp
 #
 #vcardsincludedir = $(includedir)/kabc
 #vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
 #
 #check_PROGRAMS = testread testwrite testread2
 #
 #testread_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 #testread_SOURCES = testread.cpp
 #
 #testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 #testread2_SOURCES = testread2.cpp testutils.cpp
 #
 #testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
 #testwrite_SOURCES = testwrite.cpp
 #
 #TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
 #
 #check-local: testread
 #	rm -f FAILED; \
 #	for i in $(TESTFILES); \
 #	  do perl $(top_srcdir)/kabc/vcardparser/checkvcard.pl \
 #	    $(top_srcdir)/kabc/vcardparser/tests/$$i; \
 #	done; \
 #	[ ! -e FAILED ]
diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt
index f45e679bc..b3d8be2e6 100644
--- a/kresources/CMakeLists.txt
+++ b/kresources/CMakeLists.txt
@@ -1,125 +1,125 @@
 kde4_header()
 
 project(kresources)
 
 include_directories( ${KDE4_KIO_INCLUDES} )
 
 
 ########### next target ###############
 
 set(kresources_LIB_SRCS
    resource.cpp
    factory.cpp
    managerimpl.cpp
    configwidget.cpp
    configdialog.cpp
    selectdialog.cpp
    configpage.cpp
    )
 
 kde4_automoc(${kresources_LIB_SRCS})
 
 set( kresources_DCOP_SKEL_SRCS manageriface.h )
 
 kde4_add_dcop_skels(kresources_LIB_SRCS ${kresources_DCOP_SKEL_SRCS})
 
 set( kresources_DCOP_STUB_SRCS manageriface.h )
 
 kde4_add_dcop_stubs(kresources_LIB_SRCS ${kresources_DCOP_STUB_SRCS})
 
 kde4_add_library(kresources SHARED ${kresources_LIB_SRCS})
 
 target_link_libraries(kresources  ${KDE4_KDECORE_LIBS} kdeui kio )
 
 set_target_properties(kresources PROPERTIES VERSION 1.2.0 SOVERSION 1 )
 install_targets(${LIB_INSTALL_DIR} kresources )
 
 
 ########### next target ###############
 
 set(kcm_kresources_PART_SRCS kcmkresources.cpp )
 
 kde4_automoc(${kcm_kresources_PART_SRCS})
 
 kde4_add_plugin(kcm_kresources ${kcm_kresources_PART_SRCS})
 
 target_link_libraries(kcm_kresources  ${KDE4_KDECORE_LIBS} kresources )
 
 kde4_install_libtool_file(${PLUGIN_INSTALL_DIR} kcm_kresources )
 install_targets(${PLUGIN_INSTALL_DIR} kcm_kresources )
 
 ########### next target ###############
 
 if(KDE4_BUILD_TESTS)
 
-set(testresources_SRCS testresources.cpp )
-
-kde4_automoc(${testresources_SRCS})
-
-kde4_add_executable(testresources ${testresources_SRCS})
-
-target_link_libraries(testresources  ${KDE4_KDECORE_LIBS} kresources)
-
+   set(testresources_SRCS testresources.cpp )
+   
+   kde4_automoc(${testresources_SRCS})
+   
+   kde4_add_executable(testresources ${testresources_SRCS})
+   
+   target_link_libraries(testresources  ${KDE4_KDECORE_LIBS} kresources)
+   
 endif(KDE4_BUILD_TESTS)
 
 ########### install files ###############
 
 install_files( ${XDG_APPS_DIR} FILES kresources.desktop )
 install_files( ${SERVICETYPES_INSTALL_DIR} FILES kresources_plugin.desktop kresources_manager.desktop )
 install_files( /include/kresources FILES resource.h    configwidget.h    factory.h    manageriface.h    managerimpl.h    manager.h    selectdialog.h    configdialog.h    configpage.h )
 
 kde4_footer()
 
 
 
 #original Makefile.am contents follow:
 
 #INCLUDES = $(all_includes)
 #
 #METASOURCES = AUTO
 #
 #lib_LTLIBRARIES = libkresources.la
 #
 #libkresources_la_SOURCES = resource.cpp \
 #  factory.cpp \
 #  manageriface.skel \
 #  manageriface.stub \
 #  managerimpl.cpp \
 #  configwidget.cpp \
 #  configdialog.cpp \
 #  selectdialog.cpp \
 #  configpage.cpp
 #
 #libkresources_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 #libkresources_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
 #
 #kresincludedir = $(includedir)/kresources
 #kresinclude_HEADERS = resource.h \
 #  configwidget.h \
 #  factory.h \
 #  manageriface.h \
 #  managerimpl.h \
 #  manager.h \
 #  selectdialog.h \
 #  configdialog.h \
 #  configpage.h
 #
 #kde_module_LTLIBRARIES = kcm_kresources.la
 #
 #kcm_kresources_la_SOURCES = kcmkresources.cpp
 #kcm_kresources_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 #kcm_kresources_la_LIBADD = libkresources.la
 #
 #
 #check_PROGRAMS = testresources
 #
 #testresources_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 #testresources_LDADD   = libkresources.la
 #testresources_SOURCES = testresources.cpp
 #
 #xdg_apps_DATA = kresources.desktop
 #
 #servicetypedir = $(kde_servicetypesdir)
 #servicetype_DATA = kresources_plugin.desktop kresources_manager.desktop
 #
 #include ../admin/Doxyfile.am