Simplify app makefiles
authorHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 28 Jan 2015 07:38:03 +0000 (08:38 +0100)
committerHenning Rogge <henning.rogge@fkie.fraunhofer.de>
Wed, 28 Jan 2015 07:38:03 +0000 (08:38 +0100)
src/dlep-radio/CMakeLists.txt
src/dlep-radio/dlep_config.cmake [deleted file]
src/olsrd2/CMakeLists.txt
src/olsrd2/olsrd2_config.cmake [deleted file]
src/oonf/CMakeLists.txt
src/oonf/oonf_config.cmake [deleted file]

index 4e111ef..0bfc2b4 100644 (file)
@@ -1,8 +1,52 @@
-# create application data for including
-include (./dlep_config.cmake)
+###########################################
+#### Default Application configuration ####
+###########################################
 
-# link framework libraries
-include(../../cmake/link_app.cmake)
+# set name of program the executable and library prefix
+set (OONF_APP "DLEP Radio")
+set (OONF_EXE dlep_radio)
+
+# setup custom text before and after default help message
+set (OONF_HELP_PREFIX "DLEP Radio daemon\\n")
+set (OONF_HELP_SUFFIX "Visit http://www.olsr.org\\n")
+
+# setup custom text after version string
+set (OONF_VERSION_TRAILER "Visit http://www.olsr.org\\n")
+
+# set to true to stop application running without root privileges (true/false)
+set (OONF_NEED_ROOT true)
+
+# name of default configuration handler
+set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
+#################################
+####  set static subsystems  ####
+#################################
+
+set (OONF_STATIC_PLUGINS class
+                         clock
+                         interface
+                         layer2
+                         packet_socket
+                         socket
+                         stream_socket
+                         telnet
+                         timer
+                         viewer
+                         os_clock
+                         os_socket
+                         os_interface
+                         os_system
+                         cfg_compact
+                         layer2info
+                         nl80211_listener
+                         systeminfo
+                         dlep_radio
+                         )
+
+##################################
+#### link framework libraries ####
+##################################
+
+include(../../cmake/link_app.cmake)
 oonf_create_app("${OONF_EXE}" "${OONF_STATIC_PLUGINS}")
\ No newline at end of file
diff --git a/src/dlep-radio/dlep_config.cmake b/src/dlep-radio/dlep_config.cmake
deleted file mode 100644 (file)
index 12a3556..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-###########################################
-#### Default Application configuration ####
-###########################################
-
-# set name of program the executable and library prefix
-set (OONF_APP "DLEP Radio")
-set (OONF_EXE dlep_radio)
-
-# setup custom text before and after default help message
-set (OONF_HELP_PREFIX "DLEP Radio daemon\\n")
-set (OONF_HELP_SUFFIX "Visit http://www.olsr.org\\n")
-
-# setup custom text after version string
-set (OONF_VERSION_TRAILER "Visit http://www.olsr.org\\n")
-
-# set to true to stop application running without root privileges (true/false)
-set (OONF_NEED_ROOT true)
-
-# name of default configuration handler
-set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
-
-#################################
-####  set static subsystems  ####
-#################################
-
-set (OONF_STATIC_PLUGINS class
-                         clock
-                         interface
-                         layer2
-                         packet_socket
-                         socket
-                         stream_socket
-                         telnet
-                         timer
-                         viewer
-                         os_clock
-                         os_socket
-                         os_interface
-                         os_system
-                         cfg_compact
-                         layer2info
-                         nl80211_listener
-                         systeminfo
-                         dlep_radio
-                         )
index 79cf973..2bce13c 100644 (file)
@@ -1,8 +1,61 @@
-# create application data for including
-include (./olsrd2_config.cmake)
+###########################################
+#### Default Application configuration ####
+###########################################
 
-# link framework libraries
-include(../../cmake/link_app.cmake)
+# set name of program the executable and library prefix
+set (OONF_APP OLSRd2)
+set (OONF_EXE olsrd2)
+
+# setup custom text before and after default help message
+set (OONF_HELP_PREFIX "OLSRv2 routing agent\\n")
+set (OONF_HELP_SUFFIX "Visit http://www.olsr.org\\n")
+
+# setup custom text after version string
+set (OONF_VERSION_TRAILER "Visit http://www.olsr.org\\n")
+
+# set to true to stop application running without root privileges (true/false)
+set (OONF_NEED_ROOT true)
+
+# name of default configuration handler
+set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
+#################################
+####  set static subsystems  ####
+#################################
+
+set (OONF_STATIC_PLUGINS class
+                         clock
+                         duplicate_set
+                         interface
+                         layer2
+                         packet_socket
+                         rfc5444
+                         socket
+                         stream_socket
+                         telnet
+                         timer
+                         viewer
+                         os_clock
+                         os_socket
+                         os_interface
+                         os_routing
+                         os_system
+                         cfg_compact
+                         layer2info
+                         nl80211_listener
+                         systeminfo
+                         nhdp
+                         ff_dat_metric
+                         link_config
+                         neighbor_probing
+                         nhdpinfo
+                         olsrv2
+                         olsrv2info
+                         )
+
+##################################
+#### link framework libraries ####
+##################################
+
+include(../../cmake/link_app.cmake)
 oonf_create_app("${OONF_EXE}" "${OONF_STATIC_PLUGINS}")
\ No newline at end of file
diff --git a/src/olsrd2/olsrd2_config.cmake b/src/olsrd2/olsrd2_config.cmake
deleted file mode 100644 (file)
index 298841c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-###########################################
-#### Default Application configuration ####
-###########################################
-
-# set name of program the executable and library prefix
-set (OONF_APP OLSRd2)
-set (OONF_EXE olsrd2)
-
-# setup custom text before and after default help message
-set (OONF_HELP_PREFIX "OLSRv2 routing agent\\n")
-set (OONF_HELP_SUFFIX "Visit http://www.olsr.org\\n")
-
-# setup custom text after version string
-set (OONF_VERSION_TRAILER "Visit http://www.olsr.org\\n")
-
-# set to true to stop application running without root privileges (true/false)
-set (OONF_NEED_ROOT true)
-
-# name of default configuration handler
-set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
-
-#################################
-####  set static subsystems  ####
-#################################
-
-set (OONF_STATIC_PLUGINS class
-                         clock
-                         duplicate_set
-                         interface
-                         layer2
-                         packet_socket
-                         rfc5444
-                         socket
-                         stream_socket
-                         telnet
-                         timer
-                         viewer
-                         os_clock
-                         os_socket
-                         os_interface
-                         os_routing
-                         os_system
-                         cfg_compact
-                         layer2info
-                         nl80211_listener
-                         systeminfo
-                         nhdp
-                         ff_dat_metric
-                         link_config
-                         neighbor_probing
-                         nhdpinfo
-                         olsrv2
-                         olsrv2info
-                         )
index 2a2b6ea..4dc5874 100644 (file)
@@ -1,8 +1,33 @@
-# create application data for including
-include (./oonf_config.cmake)
+###########################################
+#### Default Application configuration ####
+###########################################
 
-# link framework libraries
-include(../../cmake/link_app.cmake)
+# set name of program the executable and library prefix
+set (OONF_APP "Minimal OONF Daemon")
+set (OONF_EXE oonf)
+
+# setup custom text before and after default help message
+set (OONF_HELP_PREFIX "OONF Daemon daemon\\n")
+set (OONF_HELP_SUFFIX "Visit http://www.olsr.org\\n")
+
+# setup custom text after version string
+set (OONF_VERSION_TRAILER "Visit http://www.olsr.org\\n")
+
+# set to true to stop application running without root privileges (true/false)
+set (OONF_NEED_ROOT false)
+
+# name of default configuration handler
+set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
 
+#################################
+####  set static subsystems  ####
+#################################
+
+set (OONF_STATIC_PLUGINS cfg_compact)
+
+##################################
+#### link framework libraries ####
+##################################
+
+include(../../cmake/link_app.cmake)
 oonf_create_app("${OONF_EXE}" "${OONF_STATIC_PLUGINS}")
\ No newline at end of file
diff --git a/src/oonf/oonf_config.cmake b/src/oonf/oonf_config.cmake
deleted file mode 100644 (file)
index edcb53d..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-###########################################
-#### Default Application configuration ####
-###########################################
-
-# set name of program the executable and library prefix
-set (OONF_APP "Minimal OONF Daemon")
-set (OONF_EXE oonf)
-
-# setup custom text before and after default help message
-set (OONF_HELP_PREFIX "OONF Daemon daemon\\n")
-set (OONF_HELP_SUFFIX "Visit http://www.olsr.org\\n")
-
-# setup custom text after version string
-set (OONF_VERSION_TRAILER "Visit http://www.olsr.org\\n")
-
-# set to true to stop application running without root privileges (true/false)
-set (OONF_NEED_ROOT false)
-
-# name of default configuration handler
-set (OONF_APP_DEFAULT_CFG_HANDLER Compact)
-
-#################################
-####  set static subsystems  ####
-#################################
-
-set (OONF_STATIC_PLUGINS cfg_compact)