Merge pull request #32 from jfsmig/M-cleanup

General cosmetic cleanup
open-io · Sep 11, 2018 · ce3b8e6 · ce3b8e6
2 parents f2c0eb2 + 78a76f9
commit ce3b8e6
Show file tree

Hide file tree

Showing 18 changed files with 145 additions and 864 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,6 +96,8 @@ set(CMAKE_LIBRARY_PATH "")
 set(CMAKE_INCLUDE_PATH "")
 include_directories(AFTER ${GLIB2_INCLUDE_DIRS})
 
-add_subdirectory(./lib)
+add_definitions(-DLOG_DOMAIN="gridinit")
+add_definitions(-DGRIDINIT_DOMAIN="gridinit")
+
 add_subdirectory(./main)
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
diff --git a/lib/command.c b/lib/command.c
diff --git a/lib/gridinit-internals.h b/lib/gridinit-internals.h
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
@@ -1,35 +1,24 @@
-
-include_directories(BEFORE .
-		../lib)
-
-add_library(gridinit-internals STATIC
-		utils.c
-		cnx.c
-		gridinit_internals.h)
-target_link_libraries(gridinit-internals
-		${GLIB2_LIBRARIES})
+include_directories(BEFORE .)
 
 add_executable(gridinit
+		uid.c
+		common.c
+		limits.c
+		children.c
 		gridinit.c
-		alerting.c
-		gridinit_alerts.h)
+		utils.c
+		cnx.c)
 target_link_libraries(gridinit
-		gridinit-utils gridinit-internals
 		${GLIB2_LIBRARIES} ${LIBEVENT_LIBRARIES})
 
 add_executable(gridinit_cmd
 		gridinit_cmd.c
-		format_output.c)
+		format_output.c
+		utils.c
+		cnx.c)
 target_link_libraries(gridinit_cmd
-		gridinit-internals
 		${GLIB2_LIBRARIES} ${LIBEVENT_LIBRARIES})
 
-add_executable(gridinit_testcmd
-		test_cmd.c)
-target_link_libraries(gridinit_testcmd
-		gridinit-utils gridinit-internals
-		${GLIB2_LIBRARIES})
-
 install(TARGETS gridinit gridinit_cmd
 		LIBRARY DESTINATION ${LD_LIBDIR}
 		PUBLIC_HEADER DESTINATION include

diff --git a/main/alerting.c b/main/alerting.c