Cleaned up Borland build files (whitespace) and subtle bug in lib makefile.

bacnet-stack/Makefile

@@ -21,27 +21,27 @@ clean: lib/Makefile\
 	demo/iamrouter/Makefile \
 	demo/initrouter/Makefile \
 	demo/mstpcap/Makefile
-	( cd lib ; make clean )
+	make -C lib clean
-	( cd demo/readprop ; make clean )
+	make -C demo/readprop clean
-	( cd demo/readpropm ; make clean )
+	make -C demo/readpropm clean
-	( cd demo/writeprop ; make clean )
+	make -C demo/writeprop clean
-	( cd demo/readfile ; make clean )
+	make -C demo/readfile clean
-	( cd demo/writefile ; make clean )
+	make -C demo/writefile clean
-	( cd demo/reinit ; make clean )
+	make -C demo/reinit clean
-	( cd demo/server ; make clean )
+	make -C demo/server clean
-	( cd demo/dcc ; make clean )
+	make -C demo/dcc clean
-	( cd demo/whohas ; make clean )
+	make -C demo/whohas clean
-	( cd demo/whois ; make clean )
+	make -C demo/whois clean
-	( cd demo/ucov ; make clean )
+	make -C demo/ucov clean
-	( cd demo/timesync ; make clean )
+	make -C demo/timesync clean
-	( cd demo/epics ; make clean )
+	make -C demo/epics clean
-	( cd demo/whoisrouter ; make clean )
+	make -C demo/whoisrouter clean
-	( cd demo/iamrouter ; make clean )
+	make -C demo/iamrouter clean
-	( cd demo/initrouter ; make clean )
+	make -C demo/initrouter clean
-	( cd demo/mstpcap ; make clean )
+	make -C demo/mstpcap clean
 
 library: lib/Makefile
-	( cd lib ; make )
+	make -C lib all
 
 readprop: demo/readprop/Makefile
 	( cd demo/readprop ; make ; cp bacrp ../../bin )

bacnet-stack/lib/makefile.b32

@@ -34,7 +34,14 @@ INCLUDES = \
 	-I$(BACNET_OBJECT) \
 	-I$(BACNET_HANDLER)
 
-CORE1_SRC = $(BACNET_CORE)\apdu.c \
+CORE1_SRC = $(BACNET_CORE)\indtext.c \
+	$(BACNET_CORE)\debug.c \
+	$(BACNET_CORE)\bigend.c \
+	$(BACNET_CORE)\filename.c \
+	$(BACNET_CORE)\memcopy.c \
+	$(BACNET_CORE)\version.c
+
+CORE2_SRC = $(BACNET_CORE)\apdu.c \
 	$(BACNET_CORE)\npdu.c \
 	$(BACNET_CORE)\bacdcode.c \
 	$(BACNET_CORE)\bacint.c \
@@ -44,20 +51,14 @@ CORE1_SRC = $(BACNET_CORE)\apdu.c \
 	$(BACNET_CORE)\bacprop.c \
 	$(BACNET_CORE)\bactext.c \
 	$(BACNET_CORE)\datetime.c \
-	$(BACNET_CORE)\indtext.c \
-	$(BACNET_CORE)\debug.c \
-	$(BACNET_CORE)\bigend.c \
 	$(BACNET_CORE)\abort.c \
 	$(BACNET_CORE)\reject.c \
 	$(BACNET_CORE)\bacerror.c \
-	$(BACNET_CORE)\filename.c \
-	$(BACNET_CORE)\memcopy.c \
 	$(BACNET_CORE)\tsm.c \
 	$(BACNET_CORE)\bacaddr.c \
-	$(BACNET_CORE)\address.c \
+	$(BACNET_CORE)\address.c
-	$(BACNET_CORE)\version.c
 
-CORE2_SRC = $(BACNET_CORE)\arf.c \
+CORE3_SRC = $(BACNET_CORE)\arf.c \
 	$(BACNET_CORE)\awf.c \
 	$(BACNET_CORE)\cov.c \
 	$(BACNET_CORE)\dcc.c \
@@ -129,12 +130,14 @@ PORT_SRC = $(BACNET_PORT)\bip-init.c \
 
 CORE1_OBJ = ${CORE1_SRC:.c=.obj}
 CORE2_OBJ = ${CORE2_SRC:.c=.obj}
+CORE3_OBJ = ${CORE3_SRC:.c=.obj}
 PORT_OBJ = ${PORT_SRC:.c=.obj}
 HANDLER_OBJ = ${HANDLER_SRC:.c=.obj}
 OBJECT_OBJ = ${OBJECT_SRC:.c=.obj}
 
 OBJS = ${CORE1_OBJ} \
 	${CORE2_OBJ} \
+	${CORE3_OBJ} \
 	${PORT_OBJ} \
 	${HANDLER_OBJ} \
 	${OBJECT_OBJ}
@@ -152,20 +155,16 @@ LFLAGS = /E /P4096
 
 # 'all' should be the first one in the makefile
 
-all: $(BCC_CFG) $(OBJS) makefile.b32
+all: $(BCC_CFG) $(OBJS) makefile.b32 $(LIBRARY)
-	del $(TARGET).BAK
+	@echo Finished!
 
 clean:
-	del &&| ${CORE1_OBJ} 
+	del ${CORE1_OBJ} 
-|
+	del ${CORE2_OBJ}
-	del &&| ${CORE2_OBJ}
+	del ${CORE3_OBJ}
-|
+	del ${PORT_OBJ}
-	del &&| ${PORT_OBJ}
+	del ${HANDLER_OBJ}
-|
+	del ${OBJECT_OBJ}
-	del &&| ${HANDLER_OBJ}
-|
-	del &&| ${OBJECT_OBJ}
-|
 	del ${LIBRARY}
 	del $(BCC_CFG)