Updated unit test makefiles.

bacnet-stack/test/arf.mak

@@ -14,7 +14,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = atomicreadfile
+TARGET = arf
 
 all: ${TARGET}
  

bacnet-stack/test/awf.mak

@@ -15,7 +15,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 
 OBJS = ${SRCS:.c=.o}
 
-TARGET = atomicwritefile
+TARGET = awf
 
 all: ${TARGET}
  

bacnet-stack/test/dcc.mak

@@ -1,24 +1,24 @@
 #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_DEVICE_COMMUNICATION_CONTROL -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DEVICE_COMMUNICATION_CONTROL
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       dcc.c \
-       test/ctest.c
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-OBJS = ${SRCS:.c=.o}
+SRCS = $(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/dcc.c \
+	ctest.c
 
 TARGET = dcc
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 

bacnet-stack/test/rd.mak

@@ -13,7 +13,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 	$(SRC_DIR)/rd.c \
 	ctest.c
 
-TARGET = reinitialize_device
+TARGET = rd
 
 all: ${TARGET}
  

bacnet-stack/test/rp.mak

@@ -13,7 +13,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 	$(SRC_DIR)/rp.c \
 	ctest.c
 
-TARGET = readproperty
+TARGET = rp
 
 all: ${TARGET}
  

bacnet-stack/test/wp.mak

@@ -17,7 +17,7 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 	$(SRC_DIR)/wp.c \
 	ctest.c
 
-TARGET = writeproperty
+TARGET = wp
 
 all: ${TARGET}