From 7ca5478da35776afdadb76cd950990646b15ed0b Mon Sep 17 00:00:00 2001
From: Sebastien Lorquet <sebastien@lorquet.fr>
Date: Thu, 9 Jun 2016 08:59:16 -0600
Subject: [PATCH] Rearrange to eliminate Kmenu files

---
 Directory.mk          | 2 +-
 canutils/Kmenu        | 1 -
 canutils/Makefile     | 2 ++
 examples/Kmenu        | 1 -
 examples/Makefile     | 2 ++
 fsutils/Kmenu         | 1 -
 fsutils/Makefile      | 2 ++
 gpsutils/Kmenu        | 1 -
 gpsutils/Makefile     | 2 ++
 graphics/Kmenu        | 1 -
 graphics/Makefile     | 2 ++
 interpreters/Kmenu    | 1 -
 interpreters/Makefile | 2 ++
 netutils/Kmenu        | 1 -
 netutils/Makefile     | 2 ++
 system/Kmenu          | 1 -
 system/Makefile       | 2 ++
 17 files changed, 17 insertions(+), 9 deletions(-)
 delete mode 100644 canutils/Kmenu
 delete mode 100644 examples/Kmenu
 delete mode 100644 fsutils/Kmenu
 delete mode 100644 gpsutils/Kmenu
 delete mode 100644 graphics/Kmenu
 delete mode 100644 interpreters/Kmenu
 delete mode 100644 netutils/Kmenu
 delete mode 100644 system/Kmenu

diff --git a/Directory.mk b/Directory.mk
index e02230dd0..eb528b696 100644
--- 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)
 
diff --git a/canutils/Kmenu b/canutils/Kmenu
deleted file mode 100644
index 695c934b6..000000000
--- a/canutils/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-CAN Utilities
diff --git a/canutils/Makefile b/canutils/Makefile
index abe102db3..19e8bab6b 100644
--- a/canutils/Makefile
+++ b/canutils/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "CAN Utilities"
+
 include $(APPDIR)/Directory.mk
diff --git a/examples/Kmenu b/examples/Kmenu
deleted file mode 100644
index ad6b7fb4b..000000000
--- a/examples/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-Examples
diff --git a/examples/Makefile b/examples/Makefile
index 70315d06c..501c30ac9 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "Examples"
+
 include $(APPDIR)/Directory.mk
diff --git a/fsutils/Kmenu b/fsutils/Kmenu
deleted file mode 100644
index 4e61ee913..000000000
--- a/fsutils/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-File System Utilities
diff --git a/fsutils/Makefile b/fsutils/Makefile
index 55351c3f3..f7e640083 100644
--- a/fsutils/Makefile
+++ b/fsutils/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "File System Utilities"
+
 include $(APPDIR)/Directory.mk
diff --git a/gpsutils/Kmenu b/gpsutils/Kmenu
deleted file mode 100644
index 3fd21d77b..000000000
--- a/gpsutils/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-GPS Utilities
diff --git a/gpsutils/Makefile b/gpsutils/Makefile
index f34706ee0..3d85b0b0d 100644
--- a/gpsutils/Makefile
+++ b/gpsutils/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "GPS Utilities"
+
 include $(APPDIR)/Directory.mk
diff --git a/graphics/Kmenu b/graphics/Kmenu
deleted file mode 100644
index 453def533..000000000
--- a/graphics/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-Graphics Support
diff --git a/graphics/Makefile b/graphics/Makefile
index 60b1c91ae..dfff4b917 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "Graphics Support"
+
 include $(APPDIR)/Directory.mk
diff --git a/interpreters/Kmenu b/interpreters/Kmenu
deleted file mode 100644
index ec50152c2..000000000
--- a/interpreters/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-Interpreters
diff --git a/interpreters/Makefile b/interpreters/Makefile
index 0e499e268..edd4ec0c6 100644
--- a/interpreters/Makefile
+++ b/interpreters/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "Interpreters"
+
 include $(APPDIR)/Directory.mk
diff --git a/netutils/Kmenu b/netutils/Kmenu
deleted file mode 100644
index 3919aa206..000000000
--- a/netutils/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-Network Utilities
diff --git a/netutils/Makefile b/netutils/Makefile
index 3cab860f7..ce267013b 100644
--- a/netutils/Makefile
+++ b/netutils/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "Network Utilities"
+
 include $(APPDIR)/Directory.mk
diff --git a/system/Kmenu b/system/Kmenu
deleted file mode 100644
index 038615da8..000000000
--- a/system/Kmenu
+++ /dev/null
@@ -1 +0,0 @@
-System Libraries and NSH Add-Ons
diff --git a/system/Makefile b/system/Makefile
index eae61b31c..2bbcf2c8a 100644
--- a/system/Makefile
+++ b/system/Makefile
@@ -33,4 +33,6 @@
 #
 ############################################################################
 
+MENUDESC = "System Libraries and NSH Add-Ons"
+
 include $(APPDIR)/Directory.mk