rename miracle-wfdctl to miracle-dispd

src/CMakeLists.txt

@@ -5,6 +5,7 @@ add_subdirectory(wifi)
 add_subdirectory(dhcp)
 add_subdirectory(ctl)
 add_subdirectory(uibc)
+add_subdirectory(disp)
 
 set(miracled_SRCS miracled.h miracled.c)
 add_executable(miracled ${miracled_SRCS})

src/ctl/CMakeLists.txt

@@ -43,46 +43,8 @@ endif(READLINE_FOUND)
 
 target_link_libraries(miracle-sinkctl miracle-shared)
 
-include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
-
-########### next target ###############
-set(miracle-wfdctl_SRCS ctl-cli.c
-						ctl-wifi.c
-						wfd-sink.c
-						wfd-dbus.c
-						wfd-session.c
-						wfd-out-session.c
-						wfdctl.c
-						wfd.c
-						wfd-arg.c)
-
 include_directories(${CMAKE_BINARY_DIR}
-					${GSTREAMER_INCLUDE_DIRS}
-					${GSTREAMER_BASE_INCLUDE_DIRS}
-					${CMAKE_SOURCE_DIR}/src
-					${CMAKE_SOURCE_DIR}/src/shared)
-
-add_executable(miracle-wfdctl ${miracle-wfdctl_SRCS})
-
-install(TARGETS miracle-wfdctl DESTINATION bin)
-
-if(READLINE_FOUND)
-	message(STATUS "Compiling with Readline support")
-	set_property(TARGET miracle-wfdctl
-						APPEND
-						PROPERTY COMPILE_DEFINITIONS HAVE_READLINE)
-	target_link_libraries(miracle-wfdctl ${READLINE_LIBRARY})
-endif(READLINE_FOUND)
-
-target_link_libraries(miracle-wfdctl
-				miracle-shared
-				${GSTREAMER_LIBRARIES}
-				${GSTREAMER_BASE_LIBRARIES})
-
-########### install files ###############
-
-
-
+         ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
 
 #original Makefile.am contents follow:
 

src/disp/CMakeLists.txt

@@ -0,0 +1,35 @@
+set(miracle-dispd_SRCS ../ctl/ctl-cli.c
+						../ctl/ctl-wifi.c
+						wfd-sink.c
+						wfd-dbus.c
+						wfd-session.c
+						wfd-out-session.c
+						dispd.c
+						../ctl/wfd.c
+						wfd-arg.c)
+
+include_directories(${CMAKE_SOURCE_DIR}/src/ctl
+					${CMAKE_BINARY_DIR}
+					${GSTREAMER_INCLUDE_DIRS}
+					${GSTREAMER_BASE_INCLUDE_DIRS}
+					${CMAKE_SOURCE_DIR}/src
+					${CMAKE_SOURCE_DIR}/src/shared)
+
+add_executable(miracle-dispd ${miracle-dispd_SRCS})
+
+install(TARGETS miracle-dispd DESTINATION bin)
+
+if(READLINE_FOUND)
+	message(STATUS "Compiling with Readline support")
+	set_property(TARGET miracle-dispd
+						APPEND
+						PROPERTY COMPILE_DEFINITIONS HAVE_READLINE)
+	target_link_libraries(miracle-dispd ${READLINE_LIBRARY})
+endif(READLINE_FOUND)
+
+target_link_libraries(miracle-dispd
+				miracle-shared
+				${GSTREAMER_LIBRARIES}
+				${GSTREAMER_BASE_LIBRARIES}
+				${READLINE_LIBRARY})
+