diff --git a/bacnet-stack/demo/object/ai.mak b/bacnet-stack/demo/object/ai.mak
index 122df9a0..8b4ea565 100755
--- a/bacnet-stack/demo/object/ai.mak
+++ b/bacnet-stack/demo/object/ai.mak
@@ -1,25 +1,25 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_ANALOG_INPUT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ANALOG_INPUT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       demo/object/ai.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = ai.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = analog_input
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -31,6 +31,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/ao.mak b/bacnet-stack/demo/object/ao.mak
index 151ed300..4570de9f 100755
--- a/bacnet-stack/demo/object/ao.mak
+++ b/bacnet-stack/demo/object/ao.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_ANALOG_OUTPUT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ANALOG_OUTPUT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/ao.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = ao.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = analog_output
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/av.mak b/bacnet-stack/demo/object/av.mak
index 172ad3aa..ca22cb45 100644
--- a/bacnet-stack/demo/object/av.mak
+++ b/bacnet-stack/demo/object/av.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_ANALOG_VALUE -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_ANALOG_VALUE
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/av.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = av.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = analog_value
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/bi.mak b/bacnet-stack/demo/object/bi.mak
index 1b555e1e..bc3ab221 100644
--- a/bacnet-stack/demo/object/bi.mak
+++ b/bacnet-stack/demo/object/bi.mak
@@ -1,25 +1,25 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_BINARY_INPUT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BINARY_INPUT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       demo/object/bi.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = bi.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = binary_input
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -31,6 +31,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/bo.mak b/bacnet-stack/demo/object/bo.mak
index 3c272587..bbf4f3b7 100755
--- a/bacnet-stack/demo/object/bo.mak
+++ b/bacnet-stack/demo/object/bo.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_BINARY_OUTPUT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_BINARY_OUTPUT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/bo.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = bo.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = binary_output
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/bv.mak b/bacnet-stack/demo/object/bv.mak
index 97355b1b..3c5cfe75 100644
--- a/bacnet-stack/demo/object/bv.mak
+++ b/bacnet-stack/demo/object/bv.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_BINARY_VALUE -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_BINARY_VALUE
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/bv.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = bv.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = binary_value
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/device.mak b/bacnet-stack/demo/object/device.mak
index 4c42ae9f..16573d12 100644
--- a/bacnet-stack/demo/object/device.mak
+++ b/bacnet-stack/demo/object/device.mak
@@ -1,31 +1,36 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -g -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_DEVICE -DBACDL_TEST -DMAX_TSM_TRANSACTIONS=0
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0
+DEFINES += -DTEST -DBACDL_TEST
+DEFINES += -DBACAPP_ALL
+DEFINES += -DMAX_TSM_TRANSACTIONS=0
+DEFINES += -DTEST_DEVICE
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       datetime.c \
-       bacint.c \
-       bacstr.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       apdu.c \
-       dcc.c \
-       version.c \
-       demo/object/device.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = device.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(SRC_DIR)/apdu.c \
+	$(SRC_DIR)/dcc.c \
+	$(SRC_DIR)/version.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = device
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -37,6 +42,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/lc.mak b/bacnet-stack/demo/object/lc.mak
index b9173849..10fa47ef 100644
--- a/bacnet-stack/demo/object/lc.mak
+++ b/bacnet-stack/demo/object/lc.mak
@@ -1,29 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_LOAD_CONTROL -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LOAD_CONTROL
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       datetime.c \
-       demo/object/ao.c \
-       demo/object/lc.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = lc.c ao.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
-TARGET = loadcontrol
+TARGET = load_control
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -35,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/lo.mak b/bacnet-stack/demo/object/lo.mak
index a31f2b49..9bc593b2 100755
--- a/bacnet-stack/demo/object/lo.mak
+++ b/bacnet-stack/demo/object/lo.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_LIGHTING_OUTPUT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LIGHTING_OUTPUT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/lo.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = lo.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = lighting_output
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/lsp.mak b/bacnet-stack/demo/object/lsp.mak
index 0d599a54..7e4e3a8b 100755
--- a/bacnet-stack/demo/object/lsp.mak
+++ b/bacnet-stack/demo/object/lsp.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_LIFE_SAFETY_POINT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LIFE_SAFETY_POINT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/lsp.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = lsp.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
-TARGET = lsp
+TARGET = life_safety_point
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/demo/object/mso.mak b/bacnet-stack/demo/object/mso.mak
index 11c7fd78..d38fabb7 100644
--- a/bacnet-stack/demo/object/mso.mak
+++ b/bacnet-stack/demo/object/mso.mak
@@ -1,28 +1,29 @@
 #Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Itest -DBIG_ENDIAN=0 -DTEST -DTEST_MULTISTATE_OUTPUT -g
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_MULTISTATE_OUTPUT
 
-# NOTE: this file is normally called by the unittest.sh from up directory
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       datetime.c \
-       bacapp.c \
-       bactext.c \
-       indtext.c \
-       demo/object/mso.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = mso.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
 
 TARGET = multistate_output
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -34,6 +35,6 @@ depend:
 	${CC} -MM ${CFLAGS} *.c >> .depend
 	
 clean:
-	rm -rf core ${TARGET} $(OBJS) *.bak *.1 *.ini
+	rm -rf core ${TARGET} $(OBJS)
 
 include: .depend
diff --git a/bacnet-stack/test.mak b/bacnet-stack/test.mak
index fd6b2ee3..2ba9ff2e 100644
--- a/bacnet-stack/test.mak
+++ b/bacnet-stack/test.mak
@@ -202,3 +202,71 @@ wp: logfile test/wp.mak
 	( cd test ; make -f wp.mak )
 	( ./test/wp >> ${LOGFILE} )
 	( cd test ; make -f wp.mak clean )
+
+# Objects
+ai: logfile demo/object/ai.mak
+	( cd demo/object ; make -f ai.mak clean )
+	( cd demo/object ; make -f ai.mak )
+	( ./demo/object/analog_input >> ${LOGFILE} )
+	( cd demo/object ; make -f ai.mak clean )
+
+ao: logfile demo/object/ao.mak
+	( cd demo/object ; make -f ao.mak clean )
+	( cd demo/object ; make -f ao.mak )
+	( ./demo/object/analog_output >> ${LOGFILE} )
+	( cd demo/object ; make -f ao.mak clean )
+
+av: logfile demo/object/av.mak
+	( cd demo/object ; make -f av.mak clean )
+	( cd demo/object ; make -f av.mak )
+	( ./demo/object/analog_value >> ${LOGFILE} )
+	( cd demo/object ; make -f av.mak clean )
+
+bi: logfile demo/object/bi.mak
+	( cd demo/object ; make -f bi.mak clean )
+	( cd demo/object ; make -f bi.mak )
+	( ./demo/object/binary_input >> ${LOGFILE} )
+	( cd demo/object ; make -f bi.mak clean )
+
+bo: logfile demo/object/bo.mak
+	( cd demo/object ; make -f bo.mak clean )
+	( cd demo/object ; make -f bo.mak )
+	( ./demo/object/binar_output >> ${LOGFILE} )
+	( cd demo/object ; make -f bo.mak clean )
+
+bv: logfile demo/object/bv.mak
+	( cd demo/object ; make -f bv.mak clean )
+	( cd demo/object ; make -f bv.mak )
+	( ./demo/object/binary_value >> ${LOGFILE} )
+	( cd demo/object ; make -f bv.mak clean )
+
+device: logfile demo/object/device.mak
+	( cd demo/object ; make -f device.mak clean )
+	( cd demo/object ; make -f device.mak )
+	( ./demo/object/device >> ${LOGFILE} )
+	( cd demo/object ; make -f device.mak clean )
+
+lc: logfile demo/object/lc.mak
+	( cd demo/object ; make -f lc.mak clean )
+	( cd demo/object ; make -f lc.mak )
+	( ./demo/object/load_control >> ${LOGFILE} )
+	( cd demo/object ; make -f lc.mak clean )
+
+lo: logfile demo/object/lo.mak
+	( cd demo/object ; make -f lo.mak clean )
+	( cd demo/object ; make -f lo.mak )
+	( ./demo/object/lighting_output >> ${LOGFILE} )
+	( cd demo/object ; make -f lo.mak clean )
+
+lsp: logfile demo/object/lsp.mak
+	( cd demo/object ; make -f lsp.mak clean )
+	( cd demo/object ; make -f lsp.mak )
+	( ./demo/object/life_safety_point >> ${LOGFILE} )
+	( cd demo/object ; make -f lsp.mak clean )
+
+mso: logfile demo/object/mso.mak
+	( cd demo/object ; make -f mso.mak clean )
+	( cd demo/object ; make -f mso.mak )
+	( ./demo/object/multistate_output >> ${LOGFILE} )
+	( cd demo/object ; make -f mso.mak clean )
+
diff --git a/bacnet-stack/unittest.sh b/bacnet-stack/unittest.sh
index 4dcd796e..79942e8d 100755
--- a/bacnet-stack/unittest.sh
+++ b/bacnet-stack/unittest.sh
@@ -3,54 +3,3 @@
 
 make -f test.mak clean
 make -f test.mak
-
-make -f demo/object/ai.mak clean
-make -f demo/object/ai.mak
-./analog_input >> test.log
-make -f demo/object/ai.mak clean
-
-make -f demo/object/ao.mak clean
-make -f demo/object/ao.mak
-./analog_output >> test.log
-make -f demo/object/ao.mak clean
-
-make -f demo/object/av.mak clean
-make -f demo/object/av.mak
-./analog_value >> test.log
-make -f demo/object/av.mak clean
-
-make -f demo/object/bi.mak clean
-make -f demo/object/bi.mak
-./binary_input >> test.log
-make -f demo/object/bi.mak clean
-
-make -f demo/object/bo.mak clean
-make -f demo/object/bo.mak
-./binary_output >> test.log
-make -f demo/object/bo.mak clean
-
-make -f demo/object/bv.mak clean
-make -f demo/object/bv.mak
-./binary_value >> test.log
-make -f demo/object/bv.mak clean
-
-make -f demo/object/device.mak clean
-make -f demo/object/device.mak
-./device >> test.log
-make -f demo/object/device.mak clean
-
-make -f demo/object/lc.mak clean
-make -f demo/object/lc.mak
-./loadcontrol >> test.log
-make -f demo/object/lc.mak clean
-
-make -f demo/object/lsp.mak clean
-make -f demo/object/lsp.mak
-./lsp >> test.log
-make -f demo/object/lsp.mak clean
-
-make -f demo/object/mso.mak clean
-make -f demo/object/mso.mak
-./multistate_output >> test.log
-make -f demo/object/mso.mak clean
-