From 4b6f3a45a24482a7074975800d7d36d7ed66182c Mon Sep 17 00:00:00 2001
From: skarg <skarg@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Tue, 17 Jan 2006 15:59:30 +0000
Subject: [PATCH] updated win32 borland port demo file for new directory
 layout.

---
 bacnet-stack/demo/writefile/makefile.mak |  9 +++++----
 bacnet-stack/ports/win32/MAKEFILE.MAK    | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/bacnet-stack/demo/writefile/makefile.mak b/bacnet-stack/demo/writefile/makefile.mak
index 7fb6415e..53338c51 100644
--- a/bacnet-stack/demo/writefile/makefile.mak
+++ b/bacnet-stack/demo/writefile/makefile.mak
@@ -53,7 +53,8 @@ OBJS = $(SRCS:.c=.obj)
 
 # Compiler definitions
 #
-CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg
+BCC_CFG = bcc32.cfg
+CC = $(BORLAND_DIR)\bin\bcc32 +$(BCC_CFG)
 #LINK = $(BORLAND_DIR)\bin\tlink32
 LINK = $(BORLAND_DIR)\bin\ilink32
 TLIB = $(BORLAND_DIR)\bin\tlib
@@ -78,7 +79,7 @@ $(C_LIB_DIR)\CW32MT.lib
 #
 # This should be the first one in the makefile
 
-all : bcc32.cfg $(PRODUCT_EXE)
+all : $(BCC_CFG) $(PRODUCT_EXE)
 
 # Linker specific: the link below is for BCC linker/compiler. If you link
 # with a different linker - please change accordingly.
@@ -107,7 +108,7 @@ clean :
 	del ..\..\ports\win32\*.obj
 	del $(PRODUCT_EXE)
 	del *.map
-	del bcc32.cfg
+	del $(BCC_CFG)
 
 #
 # Generic rules
@@ -121,7 +122,7 @@ clean :
 	$(CC) -o$@ $<
 
 # Compiler configuration file
-bcc32.cfg :
+$(BCC_CFG) :
    Copy &&|
 $(CFLAGS) 
 -c 
diff --git a/bacnet-stack/ports/win32/MAKEFILE.MAK b/bacnet-stack/ports/win32/MAKEFILE.MAK
index 6c946103..5dc8303d 100644
--- a/bacnet-stack/ports/win32/MAKEFILE.MAK
+++ b/bacnet-stack/ports/win32/MAKEFILE.MAK
@@ -19,7 +19,15 @@ DEFINES = -DBACDL_BIP=1
 
 SRCS = main.c bip-init.c \
        ..\..\bip.c  \
-       ..\..\handlers.c  \
+       ..\..\demo\handler\h_iam.c  \
+       ..\..\demo\handler\h_whois.c  \
+       ..\..\demo\handler\h_wp.c  \
+       ..\..\demo\handler\h_rp.c  \
+       ..\..\demo\handler\h_rp_a.c  \
+       ..\..\demo\handler\noserv.c  \
+       ..\..\demo\handler\txbuf.c  \
+       ..\..\demo\handler\s_rp.c  \
+       ..\..\demo\handler\s_whois.c  \
        ..\..\bacdcode.c \
        ..\..\bacapp.c \
        ..\..\bacstr.c \
@@ -49,7 +57,8 @@ OBJS = $(SRCS:.c=.obj)
 
 # Compiler definitions
 #
-CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg
+BCC_CFG = bcc32.cfg
+CC = $(BORLAND_DIR)\bin\bcc32 +$(BCC_CFG)
 #LINK = $(BORLAND_DIR)\bin\tlink32
 LINK = $(BORLAND_DIR)\bin\ilink32
 TLIB = $(BORLAND_DIR)\bin\tlib
@@ -58,7 +67,7 @@ TLIB = $(BORLAND_DIR)\bin\tlib
 # Include directories
 #
 CC_DIR     = $(BORLAND_DIR)\BIN
-INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;.
+INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\handler\;..\..\demo\object\;.
 
 CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES)
 
@@ -74,7 +83,7 @@ $(C_LIB_DIR)\CW32MT.lib
 #
 # This should be the first one in the makefile
 
-all : bcc32.cfg $(PRODUCT_EXE)
+all : $(BCC_CFG) $(PRODUCT_EXE)
 
 # Linker specific: the link below is for BCC linker/compiler. If you link
 # with a different linker - please change accordingly.
@@ -97,9 +106,11 @@ clean :
 	@echo Deleting obj files, $(PRODUCT_EXE) and map files.
 	del *.obj
 	del ..\..\*.obj
+	del ..\..\demo\handler\*.obj
+	del ..\..\demo\object\*.obj
 	del $(PRODUCT_EXE)
 	del *.map
-	del bcc32.cfg
+	del $(BCC_CFG)
 
 #
 # Generic rules
@@ -113,7 +124,7 @@ clean :
 	$(CC) -o$@ $<
 
 # Compiler configuration file
-bcc32.cfg :
+$(BCC_CFG) :
    Copy &&|
 $(CFLAGS) 
 -c