From 94d55e0294b959fc768e3279fddcb9b0f6fdc50f Mon Sep 17 00:00:00 2001 From: skarg Date: Sun, 19 Apr 2009 14:39:20 +0000 Subject: [PATCH] Cleaned up Borland build files (whitespace) and subtle bug in lib makefile. --- bacnet-stack/Makefile | 38 +++++++++--------- bacnet-stack/demo/dcc/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/epics/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/iamrouter/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/initrouter/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/mstpcap/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/readfile/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/readpropm/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/reinit/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/server/makefile.b32 | 34 ++++++++-------- bacnet-stack/demo/timesync/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/ucov/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/whohas/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/whois/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/whoisrouter/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/writefile/makefile.b32 | 32 +++++++-------- bacnet-stack/demo/writeprop/makefile.b32 | 32 +++++++-------- bacnet-stack/lib/makefile.b32 | 45 +++++++++++----------- bacnet-stack/ports/win32/MAKEFILE.MAK | 32 +++++++-------- 19 files changed, 314 insertions(+), 315 deletions(-) diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile index 40e01b1b..7f446cf2 100644 --- a/bacnet-stack/Makefile +++ b/bacnet-stack/Makefile @@ -21,27 +21,27 @@ clean: lib/Makefile\ demo/iamrouter/Makefile \ demo/initrouter/Makefile \ demo/mstpcap/Makefile - ( cd lib ; make clean ) - ( cd demo/readprop ; make clean ) - ( cd demo/readpropm ; make clean ) - ( cd demo/writeprop ; make clean ) - ( cd demo/readfile ; make clean ) - ( cd demo/writefile ; make clean ) - ( cd demo/reinit ; make clean ) - ( cd demo/server ; make clean ) - ( cd demo/dcc ; make clean ) - ( cd demo/whohas ; make clean ) - ( cd demo/whois ; make clean ) - ( cd demo/ucov ; make clean ) - ( cd demo/timesync ; make clean ) - ( cd demo/epics ; make clean ) - ( cd demo/whoisrouter ; make clean ) - ( cd demo/iamrouter ; make clean ) - ( cd demo/initrouter ; make clean ) - ( cd demo/mstpcap ; make clean ) + make -C lib clean + make -C demo/readprop clean + make -C demo/readpropm clean + make -C demo/writeprop clean + make -C demo/readfile clean + make -C demo/writefile clean + make -C demo/reinit clean + make -C demo/server clean + make -C demo/dcc clean + make -C demo/whohas clean + make -C demo/whois clean + make -C demo/ucov clean + make -C demo/timesync clean + make -C demo/epics clean + make -C demo/whoisrouter clean + make -C demo/iamrouter clean + make -C demo/initrouter 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 ) diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index 27415875..b67cf0dc 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif # target @@ -116,20 +116,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32 index 2deb7dfa..f197052c 100644 --- a/bacnet-stack/demo/epics/makefile.b32 +++ b/bacnet-stack/demo/epics/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacepics @@ -118,20 +118,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/iamrouter/makefile.b32 b/bacnet-stack/demo/iamrouter/makefile.b32 index a76aa20a..8fdb0aba 100644 --- a/bacnet-stack/demo/iamrouter/makefile.b32 +++ b/bacnet-stack/demo/iamrouter/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif # target @@ -116,20 +116,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/initrouter/makefile.b32 b/bacnet-stack/demo/initrouter/makefile.b32 index 85867cbd..36650ced 100644 --- a/bacnet-stack/demo/initrouter/makefile.b32 +++ b/bacnet-stack/demo/initrouter/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif # target @@ -116,20 +116,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/mstpcap/makefile.b32 b/bacnet-stack/demo/mstpcap/makefile.b32 index 1c4f327c..fc62aec6 100644 --- a/bacnet-stack/demo/mstpcap/makefile.b32 +++ b/bacnet-stack/demo/mstpcap/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif # target @@ -116,20 +116,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32 index 1b95c5e3..9fbc9761 100644 --- a/bacnet-stack/demo/readfile/makefile.b32 +++ b/bacnet-stack/demo/readfile/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacarf @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/readpropm/makefile.b32 b/bacnet-stack/demo/readpropm/makefile.b32 index 888309e2..4ba4f95b 100644 --- a/bacnet-stack/demo/readpropm/makefile.b32 +++ b/bacnet-stack/demo/readpropm/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacrpm @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32 index 6ad75f28..1c46cdae 100644 --- a/bacnet-stack/demo/reinit/makefile.b32 +++ b/bacnet-stack/demo/reinit/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacrd @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32 index 8babf4e5..8f8f3a72 100644 --- a/bacnet-stack/demo/server/makefile.b32 +++ b/bacnet-stack/demo/server/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif # target @@ -124,21 +124,21 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings -#-Od #disable all optimizations --O2 #disable all optimizations --WM #multithread -#-WM- #not multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + #-Od #disable all optimizations + -O2 #disable all optimizations + -WM #multithread + #-WM- #not multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options | $@ # EOF: makefile diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32 index a607f5cf..d91d02e6 100644 --- a/bacnet-stack/demo/timesync/makefile.b32 +++ b/bacnet-stack/demo/timesync/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacts @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32 index 0b2b17ae..8c6ae60b 100644 --- a/bacnet-stack/demo/ucov/makefile.b32 +++ b/bacnet-stack/demo/ucov/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacucov @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32 index c1e4021c..d0ad3c8b 100644 --- a/bacnet-stack/demo/whohas/makefile.b32 +++ b/bacnet-stack/demo/whohas/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacwh @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32 index 3d271f13..b31a575d 100644 --- a/bacnet-stack/demo/whois/makefile.b32 +++ b/bacnet-stack/demo/whois/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacwi @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/whoisrouter/makefile.b32 b/bacnet-stack/demo/whoisrouter/makefile.b32 index cf06c282..416145ae 100644 --- a/bacnet-stack/demo/whoisrouter/makefile.b32 +++ b/bacnet-stack/demo/whoisrouter/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif # target @@ -116,20 +116,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32 index 3bf83a50..15d0b4f2 100644 --- a/bacnet-stack/demo/writefile/makefile.b32 +++ b/bacnet-stack/demo/writefile/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacawf @@ -115,20 +115,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32 index ceed60be..2be1ded8 100644 --- a/bacnet-stack/demo/writeprop/makefile.b32 +++ b/bacnet-stack/demo/writeprop/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacwp @@ -119,20 +119,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile diff --git a/bacnet-stack/lib/makefile.b32 b/bacnet-stack/lib/makefile.b32 index 48a5e123..5704fc67 100644 --- a/bacnet-stack/lib/makefile.b32 +++ b/bacnet-stack/lib/makefile.b32 @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif TARGET = bacnet @@ -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)\version.c + $(BACNET_CORE)\address.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 - del $(TARGET).BAK +all: $(BCC_CFG) $(OBJS) makefile.b32 $(LIBRARY) + @echo Finished! clean: - del &&| ${CORE1_OBJ} -| - del &&| ${CORE2_OBJ} -| - del &&| ${PORT_OBJ} -| - del &&| ${HANDLER_OBJ} -| - del &&| ${OBJECT_OBJ} -| + del ${CORE1_OBJ} + del ${CORE2_OBJ} + del ${CORE3_OBJ} + del ${PORT_OBJ} + del ${HANDLER_OBJ} + del ${OBJECT_OBJ} del ${LIBRARY} del $(BCC_CFG) diff --git a/bacnet-stack/ports/win32/MAKEFILE.MAK b/bacnet-stack/ports/win32/MAKEFILE.MAK index e6807d82..b06065ed 100644 --- a/bacnet-stack/ports/win32/MAKEFILE.MAK +++ b/bacnet-stack/ports/win32/MAKEFILE.MAK @@ -7,8 +7,8 @@ !ifndef BORLAND_DIR BORLAND_DIR_Not_Defined: - @echo . - @echo You must define environment variable BORLAND_DIR to compile. + @echo . + @echo You must define environment variable BORLAND_DIR to compile. !endif PRODUCT = bacnet @@ -116,20 +116,20 @@ clean : # Compiler configuration file $(BCC_CFG) : - Copy &&| -$(CFLAGS) --c --y #include line numbers in OBJ's --v #include debug info --w+ #turn on all warnings --Od #disable all optimizations -#-a4 #32 bit data alignment -#-M # generate link map -#-ls # linker options -#-WM- #not multithread --WM #multithread --w-aus # ignore warning assigned a value that is never used --w-sig # ignore warning conversion may lose sig digits + Copy &&| + $(CFLAGS) + -c + -y #include line numbers in OBJ's + -v #include debug info + -w+ #turn on all warnings + -Od #disable all optimizations + #-a4 #32 bit data alignment + #-M # generate link map + #-ls # linker options + #-WM- #not multithread + -WM #multithread + -w-aus # ignore warning assigned a value that is never used + -w-sig # ignore warning conversion may lose sig digits | $@ # EOF: makefile