Revert "Split non-ui functions in separate lib"

[gregoa/zavai.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 06cacbd24af4981a1bdd7369afb890176ec5f950..657b95d057efe46d58b2b2ad6138acf9fc446ce6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -6,7 +6,7 @@ set(zavai_version 0.1)
 set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua5.1 libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
 add_packages(ZAVAI ${packages})
 
-set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist libzavai)
+set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist)
 set(VFLAGS --vapidir=${zavai_SOURCE_DIR} --vapidir=${gtkfisheyelist_BINARY_DIR})
 add_definitions(-Wall)
 # -Werror 
@@ -22,15 +22,14 @@ else()
   message("-- Not using devkit-power-gobject")
 endif ()
 
-set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR} --vapidir=${libzavai_SOURCE_DIR} --vapidir=${libzavai_BINARY_DIR})
-
 file(GLOB libvala [a-y]*.vala widgets/*.vala)
-add_vala_library(libzavaiui ${libvala})
-add_library(libzavaiui STATIC ${libzavaiui_CSOURCES})
+add_vala_library(libzavai ${libvala})
+add_library(libzavai STATIC ${libzavai_CSOURCES})
 
-add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR} -I${libzavai_BINARY_DIR})
-set(VALA_PACKAGES ${VALA_PACKAGES} libzavai libzavaiui)
-link_libraries(gtkfisheyelist-static libzavai libzavaiui)
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
+set(VFLAGS ${VFLAGS} --vapidir=${zavai_BINARY_DIR})
+set(VALA_PACKAGES ${VALA_PACKAGES} libzavai)
+link_libraries(gtkfisheyelist-static libzavai)
 
 file(GLOB zavala zavai.vala)
 add_vala_program(zavai ${zavala})