cleanup cmake config

src/CMakeLists.txt

@@ -1,19 +1,15 @@
-set(CMAKE_C_FLAGS "-std=gnu11") 
-add_definitions(-D__USE_GNU)
-add_definitions(-D_GNU_SOURCE)
+set(CMAKE_C_FLAGS "-std=gnu11")
 
 add_subdirectory(shared)
 add_subdirectory(wifi)
 add_subdirectory(dhcp)
 add_subdirectory(ctl)
 
-
-########### next target ###############
-
 set(miracled_SRCS miracled.h miracled.c)
 add_executable(miracled ${miracled_SRCS})
 target_link_libraries(miracled miracle-shared)
 install(TARGETS miracled DESTINATION bin)
+
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/shared)
 
 

src/shared/CMakeLists.txt

@@ -1,9 +1,8 @@
 set(CMAKE_C_FLAGS "-std=gnu11") 
 
-########### next target ###############
 find_package(PkgConfig)
 pkg_check_modules (SYSTEMD REQUIRED systemd>=213)
-set(miracle-shared_SRCS rtsp.h 
+set(miracle-shared_SOURCES rtsp.h
                              rtsp.c 
                              shl_dlist.h 
                              shl_htable.h 
@@ -18,9 +17,7 @@ set(miracle-shared_SRCS rtsp.h
                              util.h 
                              wpas.h 
                              wpas.c)
-include_directories(/usr/include)
-link_directories(/usr/lib)
-add_library(miracle-shared STATIC ${miracle-shared_SRCS})
+add_library(miracle-shared STATIC ${miracle-shared_SOURCES})
 target_link_libraries (miracle-shared systemd)
 
 

src/wifi/CMakeLists.txt

@@ -19,11 +19,11 @@ target_link_libraries(miracle-wifid miracle-shared)
 find_package(PkgConfig)
 pkg_check_modules (GLIB2 REQUIRED glib-2.0)
 pkg_check_modules (UDEV REQUIRED libudev)
-link_directories( ${UDEV_LIBRARY_DIRS})
-include_directories( ${UDEV_INCLUDE_DIRS})
+#link_directories( ${UDEV_LIBRARY_DIRS})
+#include_directories( ${UDEV_INCLUDE_DIRS})
 target_link_libraries(miracle-wifid ${UDEV_LIBRARIES})
-link_directories( ${GLIB2_LIBRARY_DIRS})
-include_directories( ${GLIB2_INCLUDE_DIRS})
+#link_directories( ${GLIB2_LIBRARY_DIRS})
+#include_directories( ${GLIB2_INCLUDE_DIRS})
 target_link_libraries(miracle-wifid ${GLIB2_LIBRARIES})
 
 install(TARGETS miracle-wifid DESTINATION bin)

src/wifi/wifid-supplicant.c

@@ -34,6 +34,7 @@
 #include "util.h"
 #include "wifid.h"
 #include "wpas.h"
+#include "config.h"
 
 struct supplicant_group {
 	unsigned long users;