Updated unit tests for objects.

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