Issue 2 move folders and use deep path include file names to prevent collisions (#4)

* moving folders and files and adjust server demo build

* Fix Makefile for apps/server on Linux

* fix unit test source file folders

* fix datetime convert UTC functions. Add Code::Blocks project for datetime testing

* added some ignore extensions

* disable parallel make option

* fix build for abort, dcc, and epics apps

* fix build for dcc, epics, error, and getevent apps.

* Fixed building of all apps

* fix the ipv4 to ipv6 router app build

* Change indent style from Google to Webkit

* make pretty to re-format style

* removed common Makefile since we already had one and two was too many

* remove scripts from root folder that are no longer maintained or used

* remove mercurial EOL and ignore files for git repo

* remove .vscodeconfig files from repo

* tweak clang-format style

* clang-format src and apps with tweaked style

* added clang-tidy to fix readability if braces in src

* result of make tidy for src and apps

* fix clang-tidy mangling

* Added code::blocks project for BACnet server simulation

* added code::blocks linux project for WhoIs app

* update text files for EOL

* fix EOL in some files

* fixed make win32 apps for older gcc

* Removed Borland C++ Makefile in apps. Unable to maintain support for Borland C++ compiler.

* created codeblocks project for apps/epics for Windows

* fixing ports/xplained to work with new data structure.

* fix ports/xplained example for Atmel Studio compile

* fix ports/stm32f10x example for gcc Makefile compile

* fix ports/stm32f10x example for IAR EWARM compile

* fix ports/xplained timer callback

* fix ports/bdk_atxx_mspt build with subdirs

* fix ports/bdk_atxx_mspt build with subdirs

* updated git ignore for IAR build artifacts

* updated gitignore for non-tracked files and folders

* fixed bdk-atxx4-mstp port for Rowley Crossworks project file

* fixed bdk-atxx4-mstp port for GCC AVR Makefile

* fixed atmega168 port for IAR AVR and GCC AVR Makefile

* fixed at91sam7s port for IAR ARM and GCC ARM Makefile

* removed unmaintainable DOS, RTOS32, and atmega8 ports.  Updated rx62n (untested).

* changed arm7 to uip port

test/abort.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
-CC      = gcc
+
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ABORT
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/abort.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/abort.c \
 	ctest.c
 
 TARGET = abort

test/address.mak

@@ -1,23 +1,23 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_ADDRESS -DBACNET_ADDRESS_CACHE_FILE
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/address.c \
-	$(SRC_DIR)/bacaddr.c \
-	$(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
+SRCS = $(SRC_DIR)/bacnet/basic/binding/address.c \
+	$(SRC_DIR)/bacnet/bacaddr.c \
+	$(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/arf.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../demo/object
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object
 DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_READ_FILE
 DEFINES += -DBACNET_READ_FILE_RECORD_COUNT=2
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/arf.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/arf.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/awf.mak

@@ -2,15 +2,15 @@
 CC      = gcc
 
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../demo/object
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object
 DEFINES = -DBACFILE=1 -DBIG_ENDIAN=0 -DTEST -DTEST_ATOMIC_WRITE_FILE
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/awf.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/awf.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bacapp.mak

@@ -2,20 +2,20 @@
 CC      = gcc
 
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACNET_APPLICATION_DATA
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/indtext.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/indtext.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bacdcode.mak

@@ -1,17 +1,17 @@
 #Makefile to build unit tests
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DECODE -DMAX_APDU=50
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 TARGET = bacdcode
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bacdevobjpropref.mak

@@ -2,20 +2,20 @@
 CC      = gcc
 
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DEV_ID_PROP_REF
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/indtext.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/indtext.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bacerror.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACERROR
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacerror.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacerror.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bacint.mak

@@ -1,15 +1,15 @@
 #Makefile to build unit tests
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACINT
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 TARGET = bacint
 
-SRCS = $(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
+SRCS = $(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bacstr.mak

@@ -1,14 +1,14 @@
 #Makefile to build unit tests
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BACSTR
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
 TARGET = bacstr
 
-SRCS = $(SRC_DIR)/bacstr.c \
+SRCS = $(SRC_DIR)/bacnet/bacstr.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bbmd6.mak

@@ -9,14 +9,14 @@ DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BBMD6
 
 CFLAGS  = -Wall -Wmissing-prototypes $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bvlc6.c \
-	$(SRC_DIR)/debug.c \
-	$(SRC_DIR)/keylist.c \
-	$(SRC_DIR)/vmac.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bvlc6.c \
+	$(SRC_DIR)/bacnet/debug.c \
+	$(SRC_DIR)/bacnet/basic/sys/keylist.c \
+	$(SRC_DIR)/bacnet/basic/bbmd6/vmac.c \
 	$(DEMO_DIR)/h_bbmd6.c \
 	ctest.c
 

test/bvlc.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../ports/linux
+INCLUDES = -I$(SRC_DIR) -I. -I../ports/linux
 DEFINES = -DBACDL_BIP -DBIG_ENDIAN=0 -DTEST -DTEST_BVLC
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bvlc.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bvlc.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/bvlc6.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_BVLC6
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bvlc6.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/datalink/bvlc6.c \
 	ctest.c
 
 TARGET = bvlc6

test/cov.mak

@@ -1,23 +1,23 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../demo/object
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_COV -DBACAPP_ALL
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(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)/bacdevobjpropref.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/memcopy.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/cov.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/memcopy.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/cov.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/crc.mak

@@ -1,12 +1,12 @@
 #Makefile to build CRC tests
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../demo/object 
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object 
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_CRC
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/crc.c \
+SRCS = $(SRC_DIR)/bacnet/datalink/crc.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/datetime.cbp

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="datetime" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin/Debug/datetime" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DBIG_ENDIAN=0" />
+					<Add option="-DTEST" />
+					<Add option="-DTEST_DATE_TIME" />
+					<Add directory="../src" />
+					<Add directory="." />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin/Release/datetime" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Release/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add option="-DTEST" />
+			<Add option="-DTEST_DATE_TIME" />
+			<Add directory="." />
+			<Add directory="../src" />
+		</Compiler>
+		<Unit filename="../src/bacnet/datetime.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bacdcode.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bacint.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bacstr.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bacreal.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bacapp.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bacdevobjpropref.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/lighting.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/bactext.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="../src/bacnet/indtext.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="ctest.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="ctest.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

test/datetime.mak

@@ -1,21 +1,21 @@
 #Makefile to build test case
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DATE_TIME
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
+SRCS = $(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/dcc.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_DEVICE_COMMUNICATION_CONTROL
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/dcc.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/dcc.c \
 	ctest.c
 
 TARGET = dcc

test/event.mak

@@ -1,26 +1,26 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../demo/object
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_EVENT
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacerror.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/memcopy.c \
-	$(SRC_DIR)/timestamp.c \
-	$(SRC_DIR)/bacpropstates.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/event.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacerror.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/memcopy.c \
+	$(SRC_DIR)/bacnet/timestamp.c \
+	$(SRC_DIR)/bacnet/bacpropstates.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/event.c \
 	ctest.c
 
 TARGET = event

test/fifo.mak

@@ -1,12 +1,12 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_FIFO_BUFFER
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/fifo.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/fifo.c \
 	ctest.c
 
 TARGET = fifo

test/filename.mak

@@ -1,12 +1,12 @@
 #Makefile to build filename tests
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_FILENAME
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/filename.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/filename.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/getevent.mak

@@ -1,23 +1,23 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_GET_EVENT_INFORMATION
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/timestamp.c \
-	$(SRC_DIR)/getevent.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/timestamp.c \
+	$(SRC_DIR)/bacnet/getevent.c \
 	ctest.c
 
 TARGET = getevent

test/iam.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../demo/object
+INCLUDES = -I$(SRC_DIR) -I. -I../demo/object
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_IAM
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/iam.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/iam.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/ihave.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_I_HAVE
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/ihave.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/ihave.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/indtext.mak

@@ -1,12 +1,12 @@
 #Makefile to build unit tests
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_INDEX_TEXT
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/indtext.c \
+SRCS = $(SRC_DIR)/bacnet/indtext.c \
 	ctest.c
 
 OBJS = ${SRCS:.c=.o}

test/key.mak

@@ -1,12 +1,12 @@
 #Makefile to build unit tests
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_KEY
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/key.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/key.c \
 	ctest.c
 
 TARGET = key 

test/keylist.mak

@@ -1,12 +1,12 @@
 #Makefile to build unit tests
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_KEYLIST
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/keylist.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/keylist.c \
 	ctest.c
 
 TARGET = keylist 

test/lighting.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_LIGHTING_COMMAND
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/lighting.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/lighting.c \
 	ctest.c
 
 TARGET = lighting

test/lso.mak

@@ -1,24 +1,24 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_LSO
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacerror.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/memcopy.c \
-	$(SRC_DIR)/lso.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacerror.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/memcopy.c \
+	$(SRC_DIR)/bacnet/lso.c \
 	ctest.c
 
 TARGET = lso

test/memcopy.mak

@@ -1,12 +1,12 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_MEM_COPY
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/memcopy.c \
+SRCS = $(SRC_DIR)/bacnet/memcopy.c \
 	ctest.c
 
 TARGET = memcopy

test/mstp.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I. -I../ports/linux
+INCLUDES = -I$(SRC_DIR) -I. -I../ports/linux
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_MSTP
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/mstp.c \
-	$(SRC_DIR)/mstptext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/crc.c \
-	$(SRC_DIR)/ringbuf.c \
+SRCS = $(SRC_DIR)/bacnet/datalink/mstp.c \
+	$(SRC_DIR)/bacnet/datalink/mstptext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/datalink/crc.c \
+	$(SRC_DIR)/bacnet/basic/sys/ringbuf.c \
 	ctest.c
 
 TARGET = mstp

test/npdu.mak

@@ -1,18 +1,18 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_NPDU
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-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 \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/npdu.c \
+	$(SRC_DIR)/bacnet/basic/service/h_apdu.c \
+	$(SRC_DIR)/bacnet/dcc.c \
 	ctest.c
 
 TARGET = npdu

test/objects.mak

@@ -1,14 +1,14 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_OBJECT_LIST
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/objects.c \
-	$(SRC_DIR)/keylist.c \
-	$(SRC_DIR)/key.c \
+SRCS = $(SRC_DIR)/bacnet/objects.c \
+	$(SRC_DIR)/bacnet/basic/sys/keylist.c \
+	$(SRC_DIR)/bacnet/basic/sys/key.c \
 	ctest.c
 
 TARGET = rp

test/proplist.mak

@@ -1,19 +1,20 @@
 #Makefile to build unit tests
 CC = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_PROPLIST
 DEFINES += -DBACNET_PROPERTY_LISTS=1
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/proplist.c \
-	$(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
+SRCS = $(SRC_DIR)/bacnet/proplist.c \
+	$(SRC_DIR)/bacnet/property.c \
+	$(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
 	ctest.c
 
 TARGET = proplist

test/ptransfer.mak

@@ -1,22 +1,22 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DPRINT_ENABLE=1 -DTEST -DTEST_PRIVATE_TRANSFER
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/ptransfer.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/ptransfer.c \
 	ctest.c
 
 TARGET = ptransfer

test/rd.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_REINITIALIZE_DEVICE
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/rd.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/rd.c \
 	ctest.c
 
 TARGET = rd

test/reject.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_REJECT
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/reject.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/reject.c \
 	ctest.c
 
 TARGET = reject

test/ringbuf.mak

@@ -1,12 +1,12 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_RING_BUFFER
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/ringbuf.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/ringbuf.c \
 	ctest.c
 
 TARGET = ringbuf

test/rp.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_READ_PROPERTY
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/rp.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/rp.c \
 	ctest.c
 
 TARGET = rp

test/rpm.mak

@@ -1,24 +1,24 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_READ_PROPERTY_MULTIPLE
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacerror.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/memcopy.c \
-	$(SRC_DIR)/rpm.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacerror.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/memcopy.c \
+	$(SRC_DIR)/bacnet/rpm.c \
 	ctest.c
 
 TARGET = rpm

test/sbuf.mak

@@ -1,12 +1,12 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_STATIC_BUFFER
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/sbuf.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/sbuf.c \
 	ctest.c
 
 TARGET = sbuf

test/timer.mak

@@ -1,12 +1,12 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../ports/bdk-atxx4-mstp
-INCLUDES = -I../include -I${SRC_DIR} -I.
+INCLUDES = -I$(SRC_DIR) -I${SRC_DIR} -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_TIMER
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/timer.c \
+SRCS = $(SRC_DIR)/bacnet/timer.c \
 	ctest.c
 
 TARGET = timer

test/timesync.mak

@@ -10,7 +10,7 @@
 # Assumes rm and cp are available
 
 SRC_DIR := ../src
-INCLUDES := -I../include -I.
+INCLUDES := -I$(SRC_DIR) -I.
 DEFINES := -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_TIMESYNC
 
 CFLAGS  := $(INCLUDES) $(DEFINES) -g
@@ -18,18 +18,18 @@ CFLAGS += -Wall
 
 TARGET := timesync
 
-SRCS := $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/bacerror.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/timesync.c \
+SRCS := $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/bacerror.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/timesync.c \
 	ctest.c
 
 OBJS := ${SRCS:.c=.o}

test/vmac.mak

@@ -1,13 +1,13 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_VMAC
 
 CFLAGS  = -Wall -Wmissing-prototypes $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/keylist.c \
-	$(SRC_DIR)/vmac.c \
+SRCS = $(SRC_DIR)/bacnet/basic/sys/keylist.c \
+	$(SRC_DIR)/bacnet/basic/bbmd6/vmac.c \
 	ctest.c
 
 TARGET = vmac

test/whohas.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_WHOHAS
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/whohas.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/whohas.c \
 	ctest.c
 
 TARGET = whohas

test/whois.mak

@@ -1,16 +1,16 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DTEST_WHOIS
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/whois.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/whois.c \
 	ctest.c
 
 TARGET = whois

test/wp.mak

@@ -1,22 +1,22 @@
 #Makefile to build test case
 CC      = gcc
 SRC_DIR = ../src
-INCLUDES = -I../include -I.
+INCLUDES = -I$(SRC_DIR) -I.
 DEFINES = -DBIG_ENDIAN=0 -DTEST -DBACAPP_ALL -DTEST_WRITE_PROPERTY
 
 CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
 
-SRCS = $(SRC_DIR)/bacdcode.c \
-	$(SRC_DIR)/bacint.c \
-	$(SRC_DIR)/bacstr.c \
-	$(SRC_DIR)/bacreal.c \
-	$(SRC_DIR)/datetime.c \
-	$(SRC_DIR)/lighting.c \
-	$(SRC_DIR)/bacapp.c \
-	$(SRC_DIR)/bacdevobjpropref.c \
-	$(SRC_DIR)/bactext.c \
-	$(SRC_DIR)/indtext.c \
-	$(SRC_DIR)/wp.c \
+SRCS = $(SRC_DIR)/bacnet/bacdcode.c \
+	$(SRC_DIR)/bacnet/bacint.c \
+	$(SRC_DIR)/bacnet/bacstr.c \
+	$(SRC_DIR)/bacnet/bacreal.c \
+	$(SRC_DIR)/bacnet/datetime.c \
+	$(SRC_DIR)/bacnet/lighting.c \
+	$(SRC_DIR)/bacnet/bacapp.c \
+	$(SRC_DIR)/bacnet/bacdevobjpropref.c \
+	$(SRC_DIR)/bacnet/bactext.c \
+	$(SRC_DIR)/bacnet/indtext.c \
+	$(SRC_DIR)/bacnet/wp.c \
 	ctest.c
 
 TARGET = wp