From b060c15679cf87b00ee8d7133550f85e283589e7 Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Tue, 6 Nov 2007 19:10:52 +0000
Subject: [PATCH] Updated unit test makefiles.

---
 bacnet-stack/test/abort.mak  |  4 ++--
 bacnet-stack/test/mstp.mak   | 22 +++++++++++++---------
 bacnet-stack/test/npdu.mak   | 28 ++++++++++++++--------------
 bacnet-stack/test/rd.mak     | 24 ++++++++++++------------
 bacnet-stack/test/reject.mak | 24 ++++++++++++------------
 5 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/bacnet-stack/test/abort.mak b/bacnet-stack/test/abort.mak
index 1230a345..92c41e9c 100644
--- a/bacnet-stack/test/abort.mak
+++ b/bacnet-stack/test/abort.mak
@@ -15,10 +15,10 @@ SRCS = $(SRC_DIR)/bacdcode.c \
 
 TARGET = abort
 
-OBJS = ${SRCS:.c=.o}
-
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/mstp.mak b/bacnet-stack/test/mstp.mak
index a2c7d535..5628dc2e 100644
--- a/bacnet-stack/test/mstp.mak
+++ b/bacnet-stack/test/mstp.mak
@@ -1,17 +1,22 @@
-#Makefile to build BACnet MS/TP tests
+#Makefile to build test case
 CC      = gcc
-BASEDIR = .
-#CFLAGS  = -Wall -I.
-# -g for debugging with gdb
-#CFLAGS  = -Wall -I. -g
-CFLAGS  = -Wall -I. -Iports/linux -Itest -DTEST -DTEST_MSTP -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I. -I../ports/linux
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_MSTP
 
-OBJS    = mstp.o crc.o ringbuf.o test/ctest.o
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = $(SRC_DIR)/mstp.c \
+	$(SRC_DIR)/crc.c \
+	$(SRC_DIR)/ringbuf.c \
+	ctest.c
 
 TARGET = mstp
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
@@ -23,7 +28,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/npdu.mak b/bacnet-stack/test/npdu.mak
index c691e2ed..da781dd6 100644
--- a/bacnet-stack/test/npdu.mak
+++ b/bacnet-stack/test/npdu.mak
@@ -1,26 +1,26 @@
 #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_NPDU -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_NPDU
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       npdu.c \
-       apdu.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)/npdu.c \
+	$(SRC_DIR)/apdu.c \
+	$(SRC_DIR)/dcc.c \
+	ctest.c
 
 TARGET = npdu
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/rd.mak b/bacnet-stack/test/rd.mak
index dd4bd3ac..16a5468b 100644
--- a/bacnet-stack/test/rd.mak
+++ b/bacnet-stack/test/rd.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_REINITIALIZE_DEVICE -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_REINITIALIZE_DEVICE
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       rd.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)/rd.c \
+	ctest.c
 
 TARGET = reinitialize_device
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS} 
 
diff --git a/bacnet-stack/test/reject.mak b/bacnet-stack/test/reject.mak
index 5e4f1a1d..089df9d5 100644
--- a/bacnet-stack/test/reject.mak
+++ b/bacnet-stack/test/reject.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_REJECT -g
+SRC_DIR = ../src
+INCLUDES = -I../include -I.
+DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_REJECT
 
-SRCS = bacdcode.c \
-       bacint.c \
-       bacstr.c \
-       bigend.c \
-       reject.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)/reject.c \
+	ctest.c
 
 TARGET = reject
 
 all: ${TARGET}
  
+OBJS = ${SRCS:.c=.o}
+
 ${TARGET}: ${OBJS}
 	${CC} -o $@ ${OBJS}