projects
/
project
/
procd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgraded: improve error handling
[project/procd.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
7299d9c
..
7d05e97
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-18,14
+18,17
@@
INSTALL(TARGETS setlbf
)
)
-SET(SOURCES procd.c signal.c
watchdog.c state.c inittab.c rcS.c ubus.c system
.c
+SET(SOURCES procd.c signal.c
state.c inittab.c rcS.c ubus.c system.c sysupgrade
.c
service/service.c service/instance.c service/validate.c service/trigger.c service/watch.c
service/service.c service/instance.c service/validate.c service/trigger.c service/watch.c
- plug/coldplug.c plug/hotplug.c utils/utils.c)
+ utils/utils.c)
+IF(NOT DISABLE_INIT)
+ SET(SOURCES ${SOURCES} watchdog.c plug/coldplug.c plug/hotplug.c)
+ENDIF()
SET(LIBS ubox ubus json-c blobmsg_json json_script)
IF(DEBUG)
SET(LIBS ubox ubus json-c blobmsg_json json_script)
IF(DEBUG)
- ADD_DEFINITIONS(-DDEBUG -g3)
+ ADD_DEFINITIONS(-D
UDEV_
DEBUG -g3)
ENDIF()
IF(EARLY_PATH)
ENDIF()
IF(EARLY_PATH)
@@
-37,9
+40,7
@@
IF(ZRAM_TMPFS)
SET(SOURCES_ZRAM initd/zram.c)
ENDIF()
SET(SOURCES_ZRAM initd/zram.c)
ENDIF()
-IF(BUILD_UPGRADED)
- add_subdirectory(upgraded)
-ENDIF()
+add_subdirectory(upgraded)
ADD_EXECUTABLE(procd ${SOURCES})
TARGET_LINK_LIBRARIES(procd ${LIBS})
ADD_EXECUTABLE(procd ${SOURCES})
TARGET_LINK_LIBRARIES(procd ${LIBS})
@@
-47,20
+48,24
@@
INSTALL(TARGETS procd
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
-IF(NOT DISABLE_INIT)
-ADD_EXECUTABLE(init initd/init.c initd/early.c initd/preinit.c initd/mkdev.c watchdog.c
+FIND_PATH(ubox_include_dir libubox/uloop.h)
+INCLUDE_DIRECTORIES(${ubox_include_dir})
+
+IF(DISABLE_INIT)
+ADD_DEFINITIONS(-DDISABLE_INIT)
+ELSE()
+ADD_EXECUTABLE(init initd/init.c initd/early.c initd/preinit.c initd/mkdev.c sysupgrade.c watchdog.c
utils/utils.c ${SOURCES_ZRAM})
TARGET_LINK_LIBRARIES(init ${LIBS})
INSTALL(TARGETS init
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
utils/utils.c ${SOURCES_ZRAM})
TARGET_LINK_LIBRARIES(init ${LIBS})
INSTALL(TARGETS init
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
-ENDIF()
-
ADD_EXECUTABLE(udevtrigger plug/udevtrigger.c)
INSTALL(TARGETS udevtrigger
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
ADD_EXECUTABLE(udevtrigger plug/udevtrigger.c)
INSTALL(TARGETS udevtrigger
RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
)
+ENDIF()
ADD_EXECUTABLE(askfirst utils/askfirst.c)
ADD_EXECUTABLE(askfirst utils/askfirst.c)