From e21553e674313e170a3aa8eff9df8f9a3c811324 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Thu, 17 Nov 2016 03:33:13 +0000
Subject: [PATCH] Added router to Makefile for Linux all build. Added gateway
 and router-ipv6 to the Makefile all build.

---
 bacnet-stack/Makefile      | 11 +++++++++--
 bacnet-stack/demo/Makefile |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index ff371f55..e687965f 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -56,12 +56,19 @@ endif
 endif
 CFLAGS  = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DEFINES)
 
+DEMO_LINUX =
+ifeq (${BACNET_PORT},linux)
+ifneq (${OSTYPE},cygwin)
+	DEMO_LINUX=router
+endif
+endif
+
 # Export the variables defined here to all subprocesses
 # (see http://www.gnu.org/software/automake/manual/make/Special-Targets.html)
 .EXPORT_ALL_VARIABLES:
 
-all: library demos
-.PHONY : all library demos clean
+all: library demos gateway router-ipv6 ${DEMO_LINUX}
+.PHONY : all library demos router gateway router-ipv6 ${DEMO_LINUX} clean
 
 library:
 	$(MAKE) -s -C lib all
diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile
index a452e145..54f15875 100644
--- a/bacnet-stack/demo/Makefile
+++ b/bacnet-stack/demo/Makefile
@@ -66,7 +66,6 @@ endif
 ifeq (${BACNET_PORT},linux)
 ifneq (${OSTYPE},cygwin)
 	SUBDIRS += mstpcap mstpcrc
-#SUBDIRS += router
 endif
 endif