[Olsr-dev] [PATCH v1 044/115] Makefile: add pseudo plugin info

Ferry Huberts (spam-protected)
Wed Dec 2 21:28:17 CET 2015


From: Ferry Huberts <(spam-protected)>

And make jsoninfo and txtinfo depend on it.

Signed-off-by: Ferry Huberts <(spam-protected)>
---
 Makefile | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4d8a7d8..1bb722a 100644
--- a/Makefile
+++ b/Makefile
@@ -219,15 +219,15 @@ rpm:
 
 # This is quite ugly but at least it works
 ifeq ($(OS),linux)
-SUBDIRS := arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns mini nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog
+SUBDIRS := arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo info jsoninfo mdns mini nameservice p2pd pgraph pud quagga secure sgwdynspeed txtinfo watchdog
 else
 ifeq ($(OS),win32)
-SUBDIRS := dot_draw httpinfo jsoninfo mini pgraph secure txtinfo
+SUBDIRS := dot_draw httpinfo info jsoninfo mini pgraph secure txtinfo
 else
 ifeq ($(OS),android)
-SUBDIRS := arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo mdns mini nameservice p2pd pgraph pud secure sgwdynspeed txtinfo watchdog
+SUBDIRS := arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo info jsoninfo mdns mini nameservice p2pd pgraph pud secure sgwdynspeed txtinfo watchdog
 else
-SUBDIRS := dot_draw httpinfo jsoninfo mini nameservice pgraph secure txtinfo watchdog
+SUBDIRS := dot_draw httpinfo info jsoninfo mini nameservice pgraph secure txtinfo watchdog
 endif
 endif
 endif
@@ -331,7 +331,19 @@ httpinfo_install:
 httpinfo_uninstall:
 		$(MAKECMDPREFIX)$(MAKECMD) -C lib/httpinfo DESTDIR=$(DESTDIR) uninstall
 
-jsoninfo:
+info:
+		$(MAKECMDPREFIX)$(MAKECMD) -C lib/info
+
+info_clean:
+		$(MAKECMDPREFIX)$(MAKECMD) -C lib/info DESTDIR=$(DESTDIR) clean
+
+info_install:
+		$(MAKECMDPREFIX)$(MAKECMD) -C lib/info DESTDIR=$(DESTDIR) install
+
+info_uninstall:
+		$(MAKECMDPREFIX)$(MAKECMD) -C lib/info DESTDIR=$(DESTDIR) uninstall
+
+jsoninfo: info
 		$(MAKECMDPREFIX)$(MAKECMD) -C lib/jsoninfo
 
 jsoninfo_clean:
@@ -453,7 +465,7 @@ sgwdynspeed_install:
 sgwdynspeed_uninstall:
 		$(MAKECMDPREFIX)$(MAKECMD) -C lib/sgwdynspeed DESTDIR=$(DESTDIR) uninstall
 
-txtinfo:
+txtinfo: info
 		$(MAKECMDPREFIX)$(MAKECMD) -C lib/txtinfo
 
 txtinfo_clean:
-- 
2.5.0




More information about the Olsr-dev mailing list