Added Email interface, minor refactoring

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

1 files changed, 13 insertions, 32 deletions

diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 5a45e9f..d8e44c0 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -15,43 +15,24 @@ link_directories(
     ${DBUS_TQT_LIBRARY_DIRS}
 )
 
-set(interfaces filechooser)
+set(interfaces filechooser email)
+set(interface_HDRS introspectableInterface.h desktopNode.h dbusbaseNode.h)
+set(interface_SRCS introspectableInterface.cpp desktopNode.cpp dbusbaseNode.cpp)
 
 foreach(interface IN LISTS interfaces)
-    set(interface_HDRS
-        introspectableInterface.h
-        ${interface}Interface.h
-        ${interface}Proxy.h
-        desktopNode.h
-        dbusbaseNode.h
-    )
-
-    set(interface_SRCS
-        introspectableInterface.cpp
-        ${interface}Interface.cpp
-        ${interface}Proxy.cpp
-        desktopNode.cpp
-        dbusbaseNode.cpp
-    )
-
-    set(interface_xml ${CMAKE_CURRENT_SOURCE_DIR}/${interface}.xml)
-
-    add_custom_command(
-        OUTPUT ${interface_HDRS} ${interface_SRCS}
-        COMMAND ${DBUSXML2QT3_EXECUTABLE} ${interface_xml}
-        DEPENDS ${interface_xml}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    )
-
-    add_custom_target(${interface} DEPENDS ${interface_SRCS})
-
-    list(APPEND interfaces_SRCS ${interface_SRCS})
-
+    list(APPEND interface_HDRS ${interface}Interface.h ${interface}Proxy.h)
+    list(APPEND interface_SRCS ${interface}Interface.cpp ${interface}Proxy.cpp)
 endforeach()
 
+add_custom_command(
+    OUTPUT ${interface_HDRS} ${interface_SRCS}
+    COMMAND ${DBUSXML2QT3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/interfaces.xml
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+
 tde_add_library(portalinterfaces STATIC_PIC AUTOMOC
-    DEPENDENCIES ${interfaces}
-    SOURCES ${interfaces_SRCS}
+    SOURCES ${interface_SRCS}
     LINK ${DBUS_TQT_LIBRARIES}
 )