Feature/makefile add apps library (#218)

* add BACnet stack library at apps/lib

* convert apps to use apps/lib for smaller binary

* fix -DBACDL_ALL=1 build

* fix piface build

* datalink MAX_MPDU and MAX_HEADER cleanup

* add bip6 to git workflow

* fix system library dependency of BACnet library

Co-authored-by: Steve Karg <skarg@users.sourceforge.net>

apps/Makefile

@@ -11,6 +11,12 @@
 BACNET_DEFINES ?=
 BACNET_LIB ?=
 
+# BACnet Library
+BACNET_LIB_DIR = $(realpath lib)
+BACNET_LIB_NAME = bacnet
+BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
+BACNET_LIB=-L$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME)
+
 # choose a datalink to build the example applications
 # Use BACDL=mstp or BACDL=bip and BBMD=server when invoking make
 
@@ -113,90 +119,19 @@ BACNET_DEFINES += -DBACNET_PROTOCOL_REVISION=17
 # put all the flags together
 INCLUDES = -I$(BACNET_SRC_DIR) -I$(BACNET_PORT_DIR)
 CFLAGS += $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(BACNET_DEFINES) $(INCLUDES)
-LFLAGS += -Wl,$(SYSTEM_LIB)
 ifneq (${BACNET_LIB},)
 LFLAGS += -Wl,$(BACNET_LIB)
 endif
+# BACnet library depends on system flags.
+# System flags must go after BACnet library flags.
+LFLAGS += -Wl,$(SYSTEM_LIB)
 # GCC dead code removal
 CFLAGS += -ffunction-sections -fdata-sections
 LFLAGS += -Wl,--gc-sections
 
-PORT_ARCNET_SRC = \
-	$(BACNET_PORT_DIR)/arcnet.c
-
-PORT_MSTP_SRC = \
-	$(BACNET_PORT_DIR)/rs485.c \
-	$(BACNET_PORT_DIR)/dlmstp.c \
-	$(BACNET_SRC_DIR)/bacnet/datalink/mstp.c \
-	$(BACNET_SRC_DIR)/bacnet/datalink/mstptext.c \
-	$(BACNET_SRC_DIR)/bacnet/datalink/crc.c
-
-PORT_ETHERNET_SRC = \
-	$(BACNET_PORT_DIR)/ethernet.c
-
-PORT_BIP_SRC = \
-	$(BACNET_PORT_DIR)/bip-init.c \
-	$(BACNET_SRC_DIR)/bacnet/datalink/bvlc.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/bbmd/h_bbmd.c
-
-PORT_BIP6_SRC = \
-	$(BACNET_PORT_DIR)/bip6.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/bbmd6/h_bbmd6.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/bbmd6/vmac.c \
-	$(BACNET_SRC_DIR)/bacnet/datalink/bvlc6.c
-
-PORT_ALL_SRC = \
-	$(BACNET_SRC_DIR)/bacnet/datalink/datalink.c \
-	$(PORT_ARCNET_SRC) \
-	$(PORT_MSTP_SRC) \
-	$(PORT_ETHERNET_SRC) \
-	$(PORT_BIP_SRC) \
-	$(PORT_BIP6_SRC)
-
-PORT_NONE_SRC = \
-	$(BACNET_SRC_DIR)/bacnet/datalink/datalink.c
-
-ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
-BACNET_PORT_SRC = ${PORT_BIP_SRC}
-endif
-ifeq (${BACDL_DEFINE},-DBACDL_BIP6=1)
-BACNET_PORT_SRC = ${PORT_BIP6_SRC}
-endif
-ifeq (${BACDL_DEFINE},-DBACDL_MSTP=1)
-BACNET_PORT_SRC = ${PORT_MSTP_SRC}
-endif
-ifeq (${BACDL_DEFINE},-DBACDL_ARCNET=1)
-BACNET_PORT_SRC = ${PORT_ARCNET_SRC}
-endif
-ifeq (${BACDL_DEFINE},-DBACDL_ETHERNET=1)
-BACNET_PORT_SRC = ${PORT_ETHERNET_SRC}
-endif
-ifeq (${BACDL_DEFINE},-DBACDL_NONE=1)
-BACNET_PORT_SRC = ${PORT_NONE_SRC}
-endif
-ifdef BACDL_ALL
-BACNET_PORT_SRC = ${PORT_ALL_SRC}
-endif
-
-BACNET_PORT_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/datalink/dlenv.c \
-	$(BACNET_PORT_DIR)/mstimer-init.c \
-	$(BACNET_PORT_DIR)/datetime-init.c \
-
-BACNET_SRC ?= \
-	$(wildcard $(BACNET_SRC_DIR)/bacnet/*.c) \
-
-BACNET_BASIC_SRC ?= \
-	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/*.c) \
-	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/binding/*.c) \
-	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/sys/*.c) \
-	$(BACNET_SRC_DIR)/bacnet/basic/npdu/h_npdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/npdu/s_router.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c
-
 .EXPORT_ALL_VARIABLES:
 
-SUBDIRS = readprop writeprop readfile writefile reinit server dcc \
+SUBDIRS = lib readprop writeprop readfile writefile reinit server dcc \
 	whohas whois iam ucov scov timesync epics readpropm readrange \
 	writepropm uptransfer getevent uevent abort error event ack-alarm
 
@@ -225,13 +160,55 @@ $(TARGETS): %: $(patsubst %, %.%, $(SUBDIRS))
 $(foreach TGT, $(TARGETS), $(patsubst %, %.$(TGT), $(SUBDIRS))):
 	$(MAKE) -b -C $(subst ., , $@)
 
+.PHONY: lib
+lib: lib/Makefile Makefile $(BACNET_LIB_TARGET)
+
+$(BACNET_LIB_TARGET):
+	$(MAKE) -b -C lib
+
 .PHONY: gateway
-gateway:
+gateway: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C gateway
 
-.PHONY: server
-server:
-	$(MAKE) -s -b -C $@
+.PHONY: abort
+abort: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: ack-alarm
+ack-alarm: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: dcc
+dcc: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: epics
+epics: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: error
+error: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: event
+event: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: getevent
+getevent: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: iam
+iam: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: iamrouter
+iamrouter: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: initrouter
+initrouter: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
 
 .PHONY: mstpcap
 mstpcap:
@@ -241,79 +218,79 @@ mstpcap:
 mstpcrc:
 	$(MAKE) -b -C $@
 
-.PHONY: abort
-abort:
+.PHONY: ptransfer
+ptransfer: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
-.PHONY: ack-alarm
-ack-alarm:
+.PHONY: readprop
+readprop: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
-.PHONY: dcc
-dcc:
-	$(MAKE) -b -C $@
-
-.PHONY: epics
-epics:
-	$(MAKE) -b -C $@
-
-.PHONY: error
-error:
-	$(MAKE) -b -C $@
-
-.PHONY: event
-event:
-	$(MAKE) -b -C $@
-
-.PHONY: getevent
-getevent:
-	$(MAKE) -b -C $@
-
-.PHONY: iam
-iam:
-	$(MAKE) -b -C $@
-
-.PHONY: iamrouter
-iamrouter:
-	$(MAKE) -b -C $@
-
-.PHONY: initrouter
-initrouter:
+.PHONY: readpropm
+readpropm: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: readbdt
-readbdt:
+readbdt: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: readfdt
-readfdt:
+readfdt: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: readfile
+readfile: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: readrange
+readrange: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: reinit
+reinit: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: scov
+scov: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: server
+server: $(BACNET_LIB_TARGET)
+	$(MAKE) -s -b -C $@
+
+.PHONY: timesync
+timesync: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: uevent
-uevent:
-	$(MAKE) -b -C $@
+uevent: $(BACNET_LIB_TARGET)
+	$(MAKE) -C $@
 
 .PHONY: whois
-whois:
+whois: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: writebdt
-writebdt:
+writebdt: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
+
+.PHONY: writefile
+writefile: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: router
-router:
-	$(MAKE) -s -b -C $@
+router: $(BACNET_LIB_TARGET)
+	$(MAKE) -b -C $@
 
 .PHONY: router-ipv6
-router-ipv6:
+router-ipv6: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: router-mstp
-router-mstp:
+router-mstp: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 
 .PHONY: writepropm
-writepropm:
+writepropm: $(BACNET_LIB_TARGET)
 	$(MAKE) -b -C $@
 

apps/abort/Makefile

@@ -1,38 +1,28 @@
-#Makefile to build BACnet Application for the GCC port
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacabort
-
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_abort.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -43,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/ack-alarm/Makefile

@@ -1,44 +1,28 @@
-#Makefile to build BACnet Application with GNU Make
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacackalarm
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
-
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
 
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rr_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_ack_alarm.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
-
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -49,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/dcc/Makefile

@@ -1,38 +1,28 @@
-#Makefile to build BACnet Application for GCC compiler
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacdcc
-
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_dcc.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_dcc.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -43,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/epics/Makefile

@@ -1,38 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacepics
+# BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rpm_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rpm.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -43,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/error/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacerror
+# BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_error.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/event/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application with GNU Make
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacevent
@@ -11,32 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rr_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_cevent.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -47,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/gateway/Makefile

@@ -1,14 +1,8 @@
-#Makefile to build BACnet Gateway Demonstration Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacgateway
-
-TARGET_BIN = ${TARGET}$(TARGET_EXT)
-
+# BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/gateway/gw_device.c \
@@ -54,6 +48,9 @@ BACNET_BASIC_SRC = \
 	$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c \
 	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/service/*.c)
 
+# TARGET_EXT is defined in apps/Makefile as .exe or nothing
+TARGET_BIN = ${TARGET}$(TARGET_EXT)
+
 SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
 
 OBJS += ${SRCS:.c=.o}

apps/getevent/Makefile

@@ -2,37 +2,27 @@
 
 # Executable file name
 TARGET = bacge
+# BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_getevent.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rr_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_getevent.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -43,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/iam/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = baciam
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/iamrouter/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = baciamr
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/initrouter/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacinitr
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/lib/Makefile

@@ -0,0 +1,124 @@
+# BACnet Stack library
+# Build all the non-OS or port specific code
+
+BACNET_LIB_NAME ?= bacnet
+BACNET_LIB_DIR ?= $(realpath .)
+BACNET_LIB_TARGET ?= $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
+BACNET_SRC_DIR ?= $(realpath ../../src)
+BACNET_PORT_DIR ?= $(realpath ../../ports/linux)
+BACNET_DEFINES ?=
+
+#build for release (default) or debug
+OPTIMIZATION ?= -Os
+DEBUGGING ?=
+WARNINGS ?= -Wall -Wmissing-prototypes
+# dead code removal
+ifeq (${BUILD},debug)
+OPTIMIZATION = -O0
+DEBUGGING = -g -DDEBUG_ENABLED=1
+endif
+
+# put all the flags together
+INCLUDES = -I$(BACNET_SRC_DIR)
+CFLAGS += $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(BACNET_DEFINES) $(INCLUDES)
+CFLAGS += -ffunction-sections -fdata-sections
+
+PORT_ARCNET_SRC = \
+	$(BACNET_PORT_DIR)/arcnet.c
+
+PORT_MSTP_SRC = \
+	$(BACNET_PORT_DIR)/rs485.c \
+	$(BACNET_PORT_DIR)/dlmstp.c \
+	$(BACNET_SRC_DIR)/bacnet/datalink/mstp.c \
+	$(BACNET_SRC_DIR)/bacnet/datalink/mstptext.c \
+	$(BACNET_SRC_DIR)/bacnet/datalink/crc.c
+
+PORT_ETHERNET_SRC = \
+	$(BACNET_PORT_DIR)/ethernet.c
+
+PORT_BIP_SRC = \
+	$(BACNET_PORT_DIR)/bip-init.c \
+	$(BACNET_SRC_DIR)/bacnet/datalink/bvlc.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/bbmd/h_bbmd.c
+
+PORT_BIP6_SRC = \
+	$(BACNET_PORT_DIR)/bip6.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/bbmd6/h_bbmd6.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/bbmd6/vmac.c \
+	$(BACNET_SRC_DIR)/bacnet/datalink/bvlc6.c
+
+PORT_ALL_SRC = \
+	$(BACNET_SRC_DIR)/bacnet/datalink/datalink.c \
+	$(PORT_ARCNET_SRC) \
+	$(PORT_MSTP_SRC) \
+	$(PORT_ETHERNET_SRC) \
+	$(PORT_BIP_SRC) \
+	$(PORT_BIP6_SRC)
+
+PORT_NONE_SRC = \
+	$(BACNET_SRC_DIR)/bacnet/datalink/datalink.c
+
+ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
+BACNET_PORT_SRC = ${PORT_BIP_SRC}
+endif
+ifeq (${BACDL_DEFINE},-DBACDL_BIP6=1)
+BACNET_PORT_SRC = ${PORT_BIP6_SRC}
+endif
+ifeq (${BACDL_DEFINE},-DBACDL_MSTP=1)
+BACNET_PORT_SRC = ${PORT_MSTP_SRC}
+endif
+ifeq (${BACDL_DEFINE},-DBACDL_ARCNET=1)
+BACNET_PORT_SRC = ${PORT_ARCNET_SRC}
+endif
+ifeq (${BACDL_DEFINE},-DBACDL_ETHERNET=1)
+BACNET_PORT_SRC = ${PORT_ETHERNET_SRC}
+endif
+ifeq (${BACDL_DEFINE},-DBACDL_NONE=1)
+BACNET_PORT_SRC = ${PORT_NONE_SRC}
+endif
+ifeq (${BACDL_DEFINE},-DBACDL_ALL=1)
+BACNET_PORT_SRC = ${PORT_ALL_SRC}
+endif
+ifneq (${BACDL_DEFINE},)
+CFLAGS += ${BACDL_DEFINE}
+endif
+
+BACNET_PORT_SRC += \
+	$(BACNET_SRC_DIR)/bacnet/datalink/dlenv.c \
+	$(BACNET_PORT_DIR)/mstimer-init.c \
+	$(BACNET_PORT_DIR)/datetime-init.c \
+
+BACNET_SRC ?= \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/*.c) \
+
+BACNET_BASIC_SRC ?= \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/*.c) \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/binding/*.c) \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/service/*.c) \
+	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/sys/*.c) \
+	$(BACNET_SRC_DIR)/bacnet/basic/npdu/h_npdu.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/npdu/s_router.c \
+	$(BACNET_SRC_DIR)/bacnet/basic/tsm/tsm.c
+
+SRCS := $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+
+OBJS = ${SRCS:.c=.o}
+
+all: $(BACNET_LIB_TARGET)
+
+lib: $(BACNET_LIB_TARGET)
+
+$(BACNET_LIB_TARGET): $(OBJS) Makefile
+	${AR} rcs $@ $(OBJS)
+
+.c.o:
+	${CC} -c ${CFLAGS} $*.c -o $@
+
+depend:
+	rm -f .depend
+	${CC} -MM ${CFLAGS} *.c >> .depend
+
+clean:
+	rm -rf core $(OBJS) $(BACNET_LIB_TARGET)
+
+include: .depend

apps/mstpcap/main.c

@@ -72,8 +72,8 @@ static volatile struct mstp_port_struct_t MSTP_Port;
 /* track the receive state to know when there is a broken packet */
 static MSTP_RECEIVE_STATE MSTP_Receive_State = MSTP_RECEIVE_STATE_IDLE;
 /* buffers needed by mstp port struct */
-static uint8_t RxBuffer[MAX_MPDU];
-static uint8_t TxBuffer[MAX_MPDU];
+static uint8_t RxBuffer[DLMSTP_MPDU_MAX];
+static uint8_t TxBuffer[DLMSTP_MPDU_MAX];
 /* method to tell main loop to exit from CTRL-C or other signals */
 static volatile bool Exit_Requested;
 /* flag to indicate Wireshark is running the show - no stdout or stderr */

apps/piface/Makefile

@@ -4,220 +4,53 @@
 
 ## General Flags
 TARGET = bacpiface
+# BACnet objects that are used with this app
+BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
+SRC = main.c \
+	$(BACNET_OBJECT_DIR)/device.c \
+	$(BACNET_OBJECT_DIR)/netport.c \
+	$(BACNET_OBJECT_DIR)/bi.c \
+	$(BACNET_OBJECT_DIR)/bo.c
+
+CFLAGS += -DMAX_TSM_TRANSACTIONS=1
+CFLAGS += -DMAX_BINARY_INPUTS=4
+CFLAGS += -DMAX_BINARY_OUTPUTS=8
+
+# TARGET_EXT is defined in apps/Makefile as .exe or nothing
+TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 # Source locations
-BACNET_CORE = ../../src
-BACNET_INCLUDE = ../../include
-BACNET_HANDLER = ../../demo/handler
-BACNET_OBJECT = ../../demo/object
-BACNET_DEMO = ../../demo
-BACNET_PORT_DIR = ../../ports/linux
 PIFACE_INCLUDE = libpifacedigital/src
 PIFACE_LIB = libpifacedigital
 MCP23S17_LIB = libmcp23s17
 
-## BACnet options
-BACDL_DEFINE ?= -DBACDL_BIP=1
-# Declare your level of BBMD support
-BBMD_DEFINE ?= -DBBMD_ENABLED=1
-
-# local files for this project
-CSRC = main.c \
-	device.c
-
-# common demo files needed
-DEMOSRC = \
-        $(BACNET_HANDLER)/dlenv.c \
-        $(BACNET_HANDLER)/txbuf.c \
-        $(BACNET_HANDLER)/noserv.c \
-        $(BACNET_HANDLER)/h_npdu.c \
-        $(BACNET_HANDLER)/h_whois.c \
-        $(BACNET_HANDLER)/h_iam.c  \
-        $(BACNET_HANDLER)/h_rp.c \
-        $(BACNET_HANDLER)/h_rp_a.c \
-        $(BACNET_HANDLER)/h_rpm.c \
-        $(BACNET_HANDLER)/h_rpm_a.c \
-        $(BACNET_HANDLER)/h_rr.c \
-        $(BACNET_HANDLER)/h_wp.c  \
-        $(BACNET_HANDLER)/h_wpm.c \
-        $(BACNET_HANDLER)/h_alarm_ack.c  \
-        $(BACNET_HANDLER)/h_arf.c  \
-        $(BACNET_HANDLER)/h_arf_a.c  \
-        $(BACNET_HANDLER)/h_awf.c  \
-        $(BACNET_HANDLER)/h_rd.c  \
-        $(BACNET_HANDLER)/h_dcc.c  \
-        $(BACNET_HANDLER)/h_ts.c  \
-        $(BACNET_HANDLER)/h_whohas.c  \
-        $(BACNET_HANDLER)/h_ihave.c  \
-        $(BACNET_HANDLER)/h_cov.c  \
-        $(BACNET_HANDLER)/h_ccov.c  \
-        $(BACNET_HANDLER)/h_ucov.c  \
-        $(BACNET_HANDLER)/h_getevent.c  \
-        $(BACNET_HANDLER)/h_gas_a.c  \
-        $(BACNET_HANDLER)/h_get_alarm_sum.c  \
-        $(BACNET_HANDLER)/h_getevent_a.c  \
-        $(BACNET_HANDLER)/h_pt.c  \
-        $(BACNET_HANDLER)/h_pt_a.c  \
-        $(BACNET_HANDLER)/h_upt.c  \
-        $(BACNET_HANDLER)/s_arfs.c \
-        $(BACNET_HANDLER)/s_awfs.c \
-        $(BACNET_HANDLER)/s_dcc.c \
-        $(BACNET_HANDLER)/s_ihave.c \
-        $(BACNET_HANDLER)/s_get_alarm_sum.c  \
-        $(BACNET_HANDLER)/s_get_event.c  \
-        $(BACNET_HANDLER)/s_iam.c  \
-        $(BACNET_HANDLER)/s_cov.c  \
-        $(BACNET_HANDLER)/s_ptransfer.c \
-        $(BACNET_HANDLER)/s_rd.c \
-        $(BACNET_HANDLER)/s_rp.c  \
-        $(BACNET_HANDLER)/s_rpm.c  \
-        $(BACNET_HANDLER)/s_ts.c \
-        $(BACNET_HANDLER)/s_cevent.c  \
-        $(BACNET_HANDLER)/s_router.c  \
-        $(BACNET_HANDLER)/s_uevent.c  \
-        $(BACNET_HANDLER)/s_whohas.c \
-        $(BACNET_HANDLER)/s_whois.c  \
-        $(BACNET_HANDLER)/s_wpm.c  \
-        $(BACNET_HANDLER)/s_upt.c \
-        $(BACNET_HANDLER)/s_wp.c
-
-OBJSRC = \
-	$(BACNET_OBJECT)/bi.c \
-	$(BACNET_OBJECT)/bo.c \
-	$(BACNET_OBJECT)/netport.c
-
-# core BACnet stack files
-CORESRC =  \
-        $(BACNET_CORE)/apdu.c \
-        $(BACNET_CORE)/npdu.c \
-        $(BACNET_CORE)/bacdcode.c \
-        $(BACNET_CORE)/bacint.c \
-        $(BACNET_CORE)/bacreal.c \
-        $(BACNET_CORE)/bacstr.c \
-        $(BACNET_CORE)/bacapp.c \
-        $(BACNET_CORE)/bacprop.c \
-        $(BACNET_CORE)/bactext.c \
-        $(BACNET_CORE)/datetime.c \
-        $(BACNET_CORE)/indtext.c \
-        $(BACNET_CORE)/key.c \
-        $(BACNET_CORE)/keylist.c \
-        $(BACNET_CORE)/proplist.c \
-        $(BACNET_CORE)/debug.c \
-        $(BACNET_CORE)/bigend.c \
-        $(BACNET_CORE)/arf.c \
-        $(BACNET_CORE)/awf.c \
-        $(BACNET_CORE)/cov.c \
-        $(BACNET_CORE)/dcc.c \
-        $(BACNET_CORE)/iam.c \
-        $(BACNET_CORE)/ihave.c \
-        $(BACNET_CORE)/rd.c \
-        $(BACNET_CORE)/rp.c \
-        $(BACNET_CORE)/rpm.c \
-        $(BACNET_CORE)/timesync.c \
-        $(BACNET_CORE)/whohas.c \
-        $(BACNET_CORE)/whois.c \
-        $(BACNET_CORE)/wp.c \
-        $(BACNET_CORE)/wpm.c \
-        $(BACNET_CORE)/abort.c \
-        $(BACNET_CORE)/reject.c \
-        $(BACNET_CORE)/bacerror.c \
-        $(BACNET_CORE)/ptransfer.c \
-        $(BACNET_CORE)/memcopy.c \
-        $(BACNET_CORE)/filename.c \
-        $(BACNET_CORE)/tsm.c \
-        $(BACNET_CORE)/bacaddr.c \
-        $(BACNET_CORE)/address.c \
-        $(BACNET_CORE)/bacdevobjpropref.c \
-        $(BACNET_CORE)/bacpropstates.c \
-        $(BACNET_CORE)/alarm_ack.c \
-        $(BACNET_CORE)/event.c \
-        $(BACNET_CORE)/getevent.c \
-        $(BACNET_CORE)/get_alarm_sum.c \
-        $(BACNET_CORE)/readrange.c \
-        $(BACNET_CORE)/timestamp.c \
-        $(BACNET_CORE)/lighting.c \
-        $(BACNET_CORE)/version.c
-
-PORT_BIP_SRC = \
-        $(BACNET_PORT_DIR)/bip-init.c \
-        $(BACNET_CORE)/bvlc.c \
-        $(BACNET_CORE)/bip.c
-
-ifeq (${BACDL_DEFINE},-DBACDL_BIP=1)
-PORT_SRC = ${PORT_BIP_SRC}
-endif
-
-## Include Directories
-INCLUDES = -I. -I$(BACNET_INCLUDE) -I$(BACNET_HANDLER) -I$(BACNET_OBJECT)
-INCLUDES += -I$(BACNET_PORT_DIR)
-INCLUDES += -I$(PIFACE_INCLUDE)
-
-# Source to Object conversion
-COBJ = $(CSRC:%.c=%.o)
-DEMOOBJ = $(DEMOSRC:.c=.o)
-COREOBJ = $(CORESRC:.c=.o)
-OBJOBJ = $(OBJSRC:.c=.o)
-PORTOBJ = $(PORT_SRC:.c=.o)
-
-# define something from the Makefile or batch file
-DEFINES = $(BACDL_DEFINE) $(BBMD_DEFINE)
-OPTIMIZATION = -Os  $(OPTIMIZE_FLAGS)
-DEBUGGING = -g
-ifeq (${BUILD},debug)
-OPTIMIZATION = -O0
-DEBUGGING = -g
-endif
-ifeq (${BUILD},release)
-OPTIMIZATION = -Os $(OPTIMIZE_FLAGS)
-DEBUGGING = -DNDEBUG
-endif
-
-BFLAGS += -DBACNET_PROTOCOL_REVISION=17
-BFLAGS += -DMAX_TSM_TRANSACTIONS=1
-BFLAGS += -DMAX_BINARY_INPUTS=4
-BFLAGS += -DMAX_BINARY_OUTPUTS=8
-
-## Compile options for C files
-CFLAGS = $(DEFINES)
-CFLAGS += $(DEBUGGING)
-CFLAGS += $(INCLUDES)
-# warnings
-CFLAGS += -Wall
-CFLAGS += -Wstrict-prototypes
-CFLAGS += -Wmissing-prototypes
-# put it all together
-CFLAGS += $(BFLAGS) $(OPTIMIZATION)
-CFLAGS += -MD -MP -MT $(*F).o -MF dep/$(@F).d
-
-## Linker flags
 LDPIFACE = -Wl,-L$(PIFACE_LIB),-lpifacedigital,-L$(MCP23S17_LIB),-lmcp23s17
-LDFLAGS = -Wl,-lc,-lgcc,-lrt,-lm
-LFLAGS := $(LDPIFACE) $(LDFLAGS)
+LFLAGS += $(LDPIFACE)
 
-## Objects not in library that must be built in order to link
-OBJECTS = $(COBJ) $(DEMOOBJ) $(COREOBJ) $(OBJOBJ) $(PORTOBJ)
+OBJS += ${SRC:.c=.o}
 
-all: $(TARGET)
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-$(TARGET): $(OBJECTS) $(LIBRARY)
-	$(CC) $(OBJECTS) $(LFLAGS) -o $@
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
+	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
+	size $@
+	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
+.PHONY: depend
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
 
+.PHONY: clean
 clean:
-	rm -f core ${TARGET} ${OBJECTS}
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
+.PHONY: include
 include: .depend
 
-
-.PHONY: clean all include depend
-
-## Other dependencies
--include $(shell mkdir dep 2>/dev/null) $(wildcard dep/*)
-

apps/piface/configure.sh

@@ -3,8 +3,15 @@
 # The library is located at github.com/piface
 # Since the PiFace library is GPLv3, we have to keep it separate.
 
-git clone https://github.com/piface/libmcp23s17.git
-git clone https://github.com/piface/libpifacedigital.git
+if [ ! -d "libmcp23s17" ]
+then
+    git clone git@github.com:piface/libmcp23s17.git
+fi
+
+if [ ! -d "libpifacedigital" ]
+then
+    git clone git@github.com:piface/libpifacedigital.git
+fi
 
 # Build the library
 

apps/ptransfer/Makefile

@@ -1,24 +1,17 @@
 #Makefile to build BACnet Application using GCC compiler
 
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
-# AR = ar
-# MAKE = make
-# SIZE = size
-#
-# Assumes rm and cp are available
-
 # Executable file name
 TARGET = ptransfer
+# BACnet objects that are used with this app
+BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
+SRC = main.c \
+	$(BACNET_OBJECT_DIR)/client/device-client.c \
+	$(BACNET_OBJECT_DIR)/netport.c
 
+# TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = main.c \
-	../object/netport.c \
-	../object/device-client.c
-
-OBJS = ${SRCS:.c=.o}
+OBJS += ${SRC:.c=.o}
 
 all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
@@ -27,19 +20,21 @@ ${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	size $@
 	cp $@ ../../bin
 
-lib: ${BACNET_LIB_TARGET}
-
 ${BACNET_LIB_TARGET}:
-	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) )
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
 
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
+.PHONY: depend
 depend:
 	rm -f .depend
 	${CC} -MM ${CFLAGS} *.c >> .depend
 
+.PHONY: clean
 clean:
-	rm -rf core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET}
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
+.PHONY: include
 include: .depend
+

apps/readbdt/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the GCC Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacrbdt
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/readfdt/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the GCC Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacrfdt
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/readfile/Makefile

@@ -1,40 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacarf
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_arfs.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -45,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/readprop/Makefile

@@ -7,32 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -43,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/readpropm/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacrpm
@@ -11,34 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rpm_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rpm.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -49,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/readrange/Makefile

@@ -7,32 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rr_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_readrange.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -43,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/reinit/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacrd
@@ -11,31 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rd.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -46,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/router-ipv6/main.c

@@ -99,10 +99,11 @@ static DNET *Router_Table_Head;
 static uint16_t BIP_Net;
 static uint16_t BIP6_Net;
 /* buffer for receiving packets from the directly connected ports */
-static uint8_t BIP_Rx_Buffer[MAX_MPDU];
-static uint8_t BIP6_Rx_Buffer[MAX_MPDU];
+static uint8_t BIP_Rx_Buffer[BIP_MPDU_MAX];
+static uint8_t BIP6_Rx_Buffer[BIP6_MPDU_MAX];
 /* buffer for transmitting from any port */
-static uint8_t Tx_Buffer[MAX_MPDU];
+#define MAX(a,b) (((a)>(b))?(a):(b))
+static uint8_t Tx_Buffer[MAX(BIP_MPDU_MAX,BIP6_MPDU_MAX)];
 /* main loop exit control */
 static bool Exit_Requested;
 
@@ -1150,14 +1151,16 @@ int main(int argc, char *argv[])
         /* input */
         current_seconds = time(NULL);
         /* returns 0 bytes on timeout */
-        pdu_len = bip_receive(&src, &BIP_Rx_Buffer[0], MAX_MPDU, 5);
+        pdu_len = bip_receive(&src, &BIP_Rx_Buffer[0],
+            sizeof(BIP_Rx_Buffer), 5);
         /* process */
         if (pdu_len) {
             debug_printf("BACnet/IP Received packet\n");
             my_routing_npdu_handler(BIP_Net, &src, &BIP_Rx_Buffer[0], pdu_len);
         }
         /* returns 0 bytes on timeout */
-        pdu_len = bip6_receive(&src, &BIP6_Rx_Buffer[0], MAX_MPDU, 5);
+        pdu_len = bip6_receive(&src, &BIP6_Rx_Buffer[0],
+            sizeof(BIP6_Rx_Buffer), 5);
         /* process */
         if (pdu_len) {
             debug_printf("BACnet/IPv6 Received packet\n");

apps/router-mstp/main.c

@@ -97,10 +97,11 @@ static DNET *Router_Table_Head;
 static uint16_t BIP_Net;
 static uint16_t MSTP_Net;
 /* buffer for receiving packets from the directly connected ports */
-static uint8_t BIP_Rx_Buffer[MAX_MPDU];
-static uint8_t MSTP_Rx_Buffer[MAX_MPDU];
+static uint8_t BIP_Rx_Buffer[BIP_MPDU_MAX];
+static uint8_t MSTP_Rx_Buffer[DLMSTP_MPDU_MAX];
 /* buffer for transmitting from any port */
-static uint8_t Tx_Buffer[MAX_MPDU];
+#define MAX(a,b) (((a)>(b))?(a):(b))
+static uint8_t Tx_Buffer[MAX(DLMSTP_MPDU_MAX,BIP_MPDU_MAX)];
 /* main loop exit control */
 static bool Exit_Requested;
 
@@ -1161,14 +1162,16 @@ int main(int argc, char *argv[])
         /* input */
         current_seconds = time(NULL);
         /* returns 0 bytes on timeout */
-        pdu_len = bip_receive(&src, &BIP_Rx_Buffer[0], MAX_MPDU, 5);
+        pdu_len = bip_receive(&src, &BIP_Rx_Buffer[0],
+            sizeof(BIP_Rx_Buffer), 5);
         /* process */
         if (pdu_len) {
             debug_printf("BACnet/IP Received packet\n");
             my_routing_npdu_handler(BIP_Net, &src, &BIP_Rx_Buffer[0], pdu_len);
         }
         /* returns 0 bytes on timeout */
-        pdu_len = dlmstp_receive(&src, &MSTP_Rx_Buffer[0], MAX_MPDU, 5);
+        pdu_len = dlmstp_receive(&src, &MSTP_Rx_Buffer[0],
+            sizeof(MSTP_Rx_Buffer), 5);
         /* process */
         if (pdu_len) {
             debug_printf("BACnet MS/TP Received packet\n");

apps/scov/Makefile

@@ -7,33 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_ccov.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_ucov.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_cov.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -44,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/server/Makefile

@@ -1,7 +1,8 @@
-#Makefile to build BACnet Application for the GCC port
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacserv
+# BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/device.c \
@@ -37,24 +38,21 @@ SRC = main.c \
 	$(BACNET_OBJECT_DIR)/acc.c \
 	$(BACNET_OBJECT_DIR)/bacfile.c
 
-BACNET_BASIC_SRC += \
-	$(wildcard $(BACNET_SRC_DIR)/bacnet/basic/service/*.c)
-
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS = ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -65,7 +63,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/timesync/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacts
@@ -11,32 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_ts.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_ts.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -47,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/ucov/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacucov
@@ -11,31 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_cov.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -46,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/uevent/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application with GNU Make
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacuevent
@@ -11,32 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rr_a.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_uevent.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -47,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/uptransfer/Makefile

@@ -7,33 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_upt.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_upt.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -44,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/whohas/Makefile

@@ -1,8 +1,4 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacwh
@@ -11,32 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_ihave.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whohas.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -47,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/whois/Makefile

@@ -1,39 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacwi
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -44,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/whoisrouter/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacwir
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/writebdt/Makefile

@@ -1,35 +1,28 @@
-#Makefile to build BACnet Application for the GCC Port
+#Makefile to build BACnet Application using GCC compiler
 
+# Executable file name
 TARGET = bacwbdt
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -40,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/writefile/Makefile

@@ -1,42 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacawf
-
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_awfs.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -47,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/writeprop/Makefile

@@ -1,4 +1,4 @@
-#Makefile to build BACnet Application for the Linux Port
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacwp
@@ -7,31 +7,22 @@ BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_wp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -42,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend

apps/writepropm/Makefile

@@ -1,43 +1,28 @@
-#Makefile to build BACnet Application for the Linux Port
-
-# tools - only if you need them.
-# Most platforms have this already defined
-# CC = gcc
+#Makefile to build BACnet Application using GCC compiler
 
 # Executable file name
 TARGET = bacwpm
-
 # BACnet objects that are used with this app
 BACNET_OBJECT_DIR = $(BACNET_SRC_DIR)/bacnet/basic/object
 SRC = main.c \
 	$(BACNET_OBJECT_DIR)/client/device-client.c \
 	$(BACNET_OBJECT_DIR)/netport.c
-BACNET_BASIC_SRC += \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_apdu.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_noserv.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/h_whois.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_iam.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_rp.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_wpm.c \
-	$(BACNET_SRC_DIR)/bacnet/basic/service/s_whois.c
 
 # TARGET_EXT is defined in apps/Makefile as .exe or nothing
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
-SRCS = $(SRC) $(BACNET_SRC) $(BACNET_BASIC_SRC) $(BACNET_PORT_SRC)
+OBJS += ${SRC:.c=.o}
 
-OBJS += ${SRCS:.c=.o}
+all: ${BACNET_LIB_TARGET} Makefile ${TARGET_BIN}
 
-.PHONY: all
-all: Makefile ${TARGET_BIN}
-
-${TARGET_BIN}: ${OBJS}
+${TARGET_BIN}: ${OBJS} Makefile ${BACNET_LIB_TARGET}
 	${CC} ${PFLAGS} ${OBJS} ${LFLAGS} -o $@
 	size $@
 	cp $@ ../../bin
 
+${BACNET_LIB_TARGET}:
+	( cd ${BACNET_LIB_DIR} ; $(MAKE) clean ; $(MAKE) -s )
+
 .c.o:
 	${CC} -c ${CFLAGS} $*.c -o $@
 
@@ -48,7 +33,7 @@ depend:
 
 .PHONY: clean
 clean:
-	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map
+	rm -f core ${TARGET_BIN} ${OBJS} $(TARGET).map ${BACNET_LIB_TARGET}
 
 .PHONY: include
 include: .depend