[Olsr-dev] [PATCH 20/20] Makefile: sort plugins

[Ferry Huberts]

From: Ferry Huberts <(spam-protected)>

Signed-off-by: Ferry Huberts <(spam-protected)>
---
 Makefile |  139 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 74 insertions(+), 65 deletions(-)

diff --git a/Makefile b/Makefile
index f512eaf..8322f56 100644
--- a/Makefile
+++ b/Makefile
@@ -186,25 +186,29 @@ libs_uninstall uninstall_libs:
 		set -e;for dir in $(SUBDIRS);do $(MAKECMD) -C lib/$$dir LIBDIR=$(LIBDIR) uninstall;done
 		rmdir -p --ignore-fail-on-non-empty $(LIBDIR)
 
-httpinfo:
-		$(MAKECMD) -C lib/httpinfo clean
-		$(MAKECMD) -C lib/httpinfo 
+#
+# PLUGINS
+#
 
-httpinfo_install:
-		$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) install 
+arprefresh:
+		$(MAKECMD) -C lib/arprefresh clean
+		$(MAKECMD) -C lib/arprefresh
 
-httpinfo_uninstall:
-		$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) uninstall
+arprefresh_install:
+		$(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) install
 
-tas:
-		$(MAKECMD) -C lib/tas clean
-		$(MAKECMD) -C lib/tas
+arprefresh_uninstall:
+		$(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) uninstall
 
-tas_install:
-		$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) install
+bmf:
+		$(MAKECMD) -C lib/bmf clean
+		$(MAKECMD) -C lib/bmf
 
-tas_uninstall:
-		$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) uninstall
+bmf_install:
+		$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) install
+
+bmf_uninstall:
+		$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) uninstall
 
 dot_draw:
 		$(MAKECMD) -C lib/dot_draw clean
@@ -216,16 +220,6 @@ dot_draw_install:
 dot_draw_uninstall:
 		$(MAKECMD) -C lib/dot_draw DESTDIR=$(DESTDIR) uninstall
 
-nameservice:
-		$(MAKECMD) -C lib/nameservice clean
-		$(MAKECMD) -C lib/nameservice
-
-nameservice_install:
-		$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) install
-
-nameservice_uninstall:
-		$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) uninstall
-
 dyn_gw:
 		$(MAKECMD) -C lib/dyn_gw clean
 		$(MAKECMD) -C lib/dyn_gw
@@ -246,15 +240,49 @@ dyn_gw_plain_install:
 dyn_gw_plain_uninstall:
 		$(MAKECMD) -C lib/dyn_gw_plain DESTDIR=$(DESTDIR) uninstall
 
-secure:
-		$(MAKECMD) -C lib/secure clean
-		$(MAKECMD) -C lib/secure
+httpinfo:
+		$(MAKECMD) -C lib/httpinfo clean
+		$(MAKECMD) -C lib/httpinfo
 
-secure_install:
-		$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) install
+httpinfo_install:
+		$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) install
 
-secure_uninstall:
-		$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) uninstall
+httpinfo_uninstall:
+		$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) uninstall
+
+mdns:
+		$(MAKECMD) -C lib/mdns clean
+		$(MAKECMD) -C lib/mdns
+
+mdns_install:
+		$(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) install
+
+mdns_uninstall:
+		$(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) uninstall
+
+#
+# no targets for mini: it's an example plugin
+#
+
+nameservice:
+		$(MAKECMD) -C lib/nameservice clean
+		$(MAKECMD) -C lib/nameservice
+
+nameservice_install:
+		$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) install
+
+nameservice_uninstall:
+		$(MAKECMD) -C lib/nameservice DESTDIR=$(DESTDIR) uninstall
+
+p2pd:
+		$(MAKECMD) -C lib/p2pd clean
+		$(MAKECMD) -C lib/p2pd
+
+p2pd_install:
+		$(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) install
+
+p2pd_uninstall:
+		$(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) uninstall
 
 pgraph:
 		$(MAKECMD) -C lib/pgraph clean
@@ -266,16 +294,6 @@ pgraph_install:
 pgraph_uninstall:
 		$(MAKECMD) -C lib/pgraph DESTDIR=$(DESTDIR) uninstall
 
-bmf:
-		$(MAKECMD) -C lib/bmf clean
-		$(MAKECMD) -C lib/bmf 
-
-bmf_install:
-		$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) install 
-
-bmf_uninstall:
-		$(MAKECMD) -C lib/bmf DESTDIR=$(DESTDIR) uninstall
-
 quagga:
 		$(MAKECMD) -C lib/quagga clean
 		$(MAKECMD) -C lib/quagga 
@@ -286,25 +304,25 @@ quagga_install:
 quagga_uninstall:
 		$(MAKECMD) -C lib/quagga DESTDIR=$(DESTDIR) uninstall
 
-mdns:
-		$(MAKECMD) -C lib/mdns clean
-		$(MAKECMD) -C lib/mdns 
+secure:
+		$(MAKECMD) -C lib/secure clean
+		$(MAKECMD) -C lib/secure
 
-mdns_install:
-		$(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) install 
+secure_install:
+		$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) install
 
-mdns_uninstall:
-		$(MAKECMD) -C lib/mdns DESTDIR=$(DESTDIR) uninstall
+secure_uninstall:
+		$(MAKECMD) -C lib/secure DESTDIR=$(DESTDIR) uninstall
 
-p2pd:
-		$(MAKECMD) -C lib/p2pd clean
-		$(MAKECMD) -C lib/p2pd
+tas:
+		$(MAKECMD) -C lib/tas clean
+		$(MAKECMD) -C lib/tas
 
-p2pd_install:
-		$(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) install
+tas_install:
+		$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) install
 
-p2pd_uninstall:
-		$(MAKECMD) -C lib/p2pd DESTDIR=$(DESTDIR) uninstall
+tas_uninstall:
+		$(MAKECMD) -C lib/tas DESTDIR=$(DESTDIR) uninstall
 
 txtinfo:
 		$(MAKECMD) -C lib/txtinfo clean
@@ -316,16 +334,6 @@ txtinfo_install:
 txtinfo_uninstall:
 		$(MAKECMD) -C lib/txtinfo DESTDIR=$(DESTDIR) uninstall
 
-arprefresh:
-		$(MAKECMD) -C lib/arprefresh clean
-		$(MAKECMD) -C lib/arprefresh
-
-arprefresh_install:
-		$(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) install
-
-arprefresh_uninstall:
-		$(MAKECMD) -C lib/arprefresh DESTDIR=$(DESTDIR) uninstall
-
 watchdog:
 		$(MAKECMD) -C lib/watchdog clean
 		$(MAKECMD) -C lib/watchdog
@@ -337,6 +345,7 @@ watchdog_install:
 watchdog_uninstall:
 		$(MAKECMD) -C lib/watchdog DESTDIR=$(DESTDIR) uninstall
 
+
 build_all:	all switch libs
 install_all:	install install_libs
 uninstall_all:	uninstall uninstall_libs
-- 
1.7.6