Rearrange to eliminate Kmenu files

2016-06-09 08:59:16 -06:00 · 2016-06-09 08:59:16 -06:00 · 7ca5478da3
commit 7ca5478da3
parent bfd5ca7cd2
17 changed files with 17 additions and 9 deletions
--- a/Directory.mk
+++ b/Directory.mk
@ -60,7 +60,7 @@ nothing:
 install:

 preconfig: $(foreach SDIR, $(SUBDIRS), $(SDIR)_preconfig)
-	$(Q) $(MKKCONFIG) -m "$(shell cat Kmenu)"
+	$(Q) $(MKKCONFIG) -m $(MENUDESC)

 context: $(foreach SDIR, $(SUBDIRS), $(SDIR)_context)

--- a/canutils/Kmenu
+++ b/canutils/Kmenu
@ -1 +0,0 @@
-CAN Utilities
--- a/canutils/Makefile
+++ b/canutils/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "CAN Utilities"
+
 include $(APPDIR)/Directory.mk
--- a/examples/Kmenu
+++ b/examples/Kmenu
@ -1 +0,0 @@
-Examples
--- a/examples/Makefile
+++ b/examples/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "Examples"
+
 include $(APPDIR)/Directory.mk
--- a/fsutils/Kmenu
+++ b/fsutils/Kmenu
@ -1 +0,0 @@
-File System Utilities
--- a/fsutils/Makefile
+++ b/fsutils/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "File System Utilities"
+
 include $(APPDIR)/Directory.mk
--- a/gpsutils/Kmenu
+++ b/gpsutils/Kmenu
@ -1 +0,0 @@
-GPS Utilities
--- a/gpsutils/Makefile
+++ b/gpsutils/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "GPS Utilities"
+
 include $(APPDIR)/Directory.mk
--- a/graphics/Kmenu
+++ b/graphics/Kmenu
@ -1 +0,0 @@
-Graphics Support
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "Graphics Support"
+
 include $(APPDIR)/Directory.mk
--- a/interpreters/Kmenu
+++ b/interpreters/Kmenu
@ -1 +0,0 @@
-Interpreters
--- a/interpreters/Makefile
+++ b/interpreters/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "Interpreters"
+
 include $(APPDIR)/Directory.mk
--- a/netutils/Kmenu
+++ b/netutils/Kmenu
@ -1 +0,0 @@
-Network Utilities
--- a/netutils/Makefile
+++ b/netutils/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "Network Utilities"
+
 include $(APPDIR)/Directory.mk
--- a/system/Kmenu
+++ b/system/Kmenu
@ -1 +0,0 @@
-System Libraries and NSH Add-Ons
--- a/system/Makefile
+++ b/system/Makefile
@ -33,4 +33,6 @@
 #
 ############################################################################

+MENUDESC = "System Libraries and NSH Add-Ons"
+
 include $(APPDIR)/Directory.mk