move upgrade to its own subfolder

Signed-off-by: John Crispin <blogic@openwrt.org>

4 files changed, 19 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b90cdd7..dc7ecd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ IF(DEBUG)
   ADD_DEFINITIONS(-DDEBUG -g3)
 ENDIF()
 
+add_subdirectory(upgraded)
 
 ADD_EXECUTABLE(procd ${SOURCES})
 TARGET_LINK_LIBRARIES(procd ${LIBS})
@@ -42,14 +43,6 @@ INSTALL(TARGETS udevtrigger
 )
 
 
-ADD_EXECUTABLE(upgraded upgraded.c watchdog.c)
-TARGET_LINK_LIBRARIES(upgraded ubox.a rt.a -static -lc -lgcc)
-set_target_properties(upgraded PROPERTIES LINK_SEARCH_END_STATIC 1)
-INSTALL(TARGETS upgraded
-	RUNTIME DESTINATION sbin
-)
-
-
 ADD_EXECUTABLE(askfirst utils/askfirst.c)
 INSTALL(TARGETS askfirst
 	RUNTIME DESTINATION sbin
diff --git a/upgraded/CMakeLists.txt b/upgraded/CMakeLists.txt
new file mode 100644
index 0000000..7e08c0e
--- /dev/null
+++ b/upgraded/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(upgraded C)
+ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations)
+set(CMAKE_EXE_LINKER_FLAGS -static)
+set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
+set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)
+set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
+set(CMAKE_SHARED_LIBRARY_C_FLAGS)
+set(CMAKE_SHARED_LIBRARY_CXX_FLAGS)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)
+set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
+ADD_EXECUTABLE(upgraded upgraded.c ../watchdog.c)
+TARGET_LINK_LIBRARIES(upgraded ubox rt)
+INSTALL(TARGETS upgraded
+	RUNTIME DESTINATION sbin
+)
diff --git a/upgraded/upgraded b/upgraded/upgraded
new file mode 100755
index 0000000..a78470c
--- /dev/null
+++ b/upgraded/upgraded
diff --git a/upgraded.c b/upgraded/upgraded.c
index 345a30a..1e4057a 100644
--- a/upgraded.c
+++ b/upgraded/upgraded.c
@@ -21,7 +21,7 @@
 
 #include <libubox/uloop.h>
 
-#include "watchdog.h"
+#include "../watchdog.h"
 
 static struct uloop_process upgrade_proc;
 unsigned int debug = 2;