From 34f090598def4fd529afe36ad3ce2feba6c68586 Mon Sep 17 00:00:00 2001 From: skarg Date: Fri, 24 Aug 2007 00:31:38 +0000 Subject: [PATCH] Modified the Borland compiler build to use a library for all the demos. --- bacnet-stack/demo/dcc/makefile.b32 | 127 +++++++++------------- bacnet-stack/demo/epics/makefile.b32 | 127 +++++++++------------- bacnet-stack/demo/readfile/makefile.b32 | 124 +++++++++------------ bacnet-stack/demo/readprop/makefile.b32 | 126 +++++++++------------- bacnet-stack/demo/reinit/makefile.b32 | 126 +++++++++------------- bacnet-stack/demo/server/makefile.b32 | 132 ++++++++--------------- bacnet-stack/demo/timesync/makefile.b32 | 124 ++++++++------------- bacnet-stack/demo/ucov/makefile.b32 | 122 +++++++++------------ bacnet-stack/demo/whohas/makefile.b32 | 126 +++++++++------------- bacnet-stack/demo/whois/makefile.b32 | 122 ++++++++------------- bacnet-stack/demo/writefile/makefile.b32 | 119 ++++++++------------ bacnet-stack/demo/writeprop/makefile.b32 | 124 +++++++++------------ bacnet-stack/lib/Makefile | 2 +- bacnet-stack/makefile.b32 | 27 +++-- 14 files changed, 599 insertions(+), 929 deletions(-) diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index d5742699..c01d6ff9 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -11,89 +11,67 @@ BORLAND_DIR_Not_Defined: @echo You must define environment variable BORLAND_DIR to compile. !endif +# target PRODUCT = bacdcc PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;USE_INADDR=1;BIP_DEBUG;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_iam.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\h_dcc.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\demo\handler\s_dcc.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\datetime.c \ - ..\..\indtext.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -102,30 +80,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -136,13 +111,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32 index 612f015c..f5b45a93 100644 --- a/bacnet-stack/demo/epics/makefile.b32 +++ b/bacnet-stack/demo/epics/makefile.b32 @@ -14,87 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacepics PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1;BIP_DEBUG=0 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\key.c \ - ..\..\keylist.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_iam.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\s_rp.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\bacint.c \ - ..\..\bacdcode.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\datetime.c \ - ..\..\bactext.c \ - ..\..\indtext.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -103,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -137,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32 index 731f0a11..e197604c 100644 --- a/bacnet-stack/demo/readfile/makefile.b32 +++ b/bacnet-stack/demo/readfile/makefile.b32 @@ -14,84 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacarf PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\demo\handler\s_arfs.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\indtext.c \ - ..\..\datetime.c \ - ..\..\filename.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -100,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -134,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32 index e7640961..30bbf195 100644 --- a/bacnet-stack/demo/readprop/makefile.b32 +++ b/bacnet-stack/demo/readprop/makefile.b32 @@ -14,86 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacrp PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_iam.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\h_rp_a.c \ - ..\..\demo\handler\s_rp.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\datetime.c \ - ..\..\bactext.c \ - ..\..\indtext.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -102,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -136,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32 index 4aab68c4..c7e3198e 100644 --- a/bacnet-stack/demo/reinit/makefile.b32 +++ b/bacnet-stack/demo/reinit/makefile.b32 @@ -14,86 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacrd PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;USE_INADDR=1;BIP_DEBUG;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\rd.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_iam.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\demo\handler\s_rd.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\datetime.c \ - ..\..\indtext.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -102,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -136,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32 index a2b88e52..9ff15e3f 100644 --- a/bacnet-stack/demo/server/makefile.b32 +++ b/bacnet-stack/demo/server/makefile.b32 @@ -11,104 +11,67 @@ BORLAND_DIR_Not_Defined: @echo You must define environment variable BORLAND_DIR to compile. !endif +# target PRODUCT = bacserv PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -#DATALINK = -DBACDL_MSTP -DATALINK = -DBACDL_BIP;BIP_DEBUG=1;USE_INADDR=1 -DEFINES = $(DATALINK);PRINT_ENABLED=1;MAX_TSM_TRANSACTIONS=0 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\ports\win32\dlmstp.c \ - ..\..\ports\win32\rs485.c \ - ..\..\bip.c \ - ..\..\crc.c \ - ..\..\mstp.c \ - ..\..\mstptext.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\h_rpm.c \ - ..\..\demo\handler\h_wp.c \ - ..\..\demo\handler\h_arf.c \ - ..\..\demo\handler\h_awf.c \ - ..\..\demo\handler\h_rd.c \ - ..\..\demo\handler\h_dcc.c \ - ..\..\demo\handler\h_ts.c \ - ..\..\demo\handler\h_whohas.c \ - ..\..\demo\handler\s_ihave.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\datetime.c \ - ..\..\indtext.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\whohas.c \ - ..\..\ihave.c \ - ..\..\rp.c \ - ..\..\rpm.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\rd.c \ - ..\..\dcc.c \ - ..\..\timesync.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # 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 # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : $(BCC_CFG) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -117,29 +80,26 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map + del $(PRODUCT).map del $(BCC_CFG) # @@ -151,7 +111,7 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file $(BCC_CFG) : diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32 index 2f0e3377..3bb1973f 100644 --- a/bacnet-stack/demo/timesync/makefile.b32 +++ b/bacnet-stack/demo/timesync/makefile.b32 @@ -14,92 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacts PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=0;PRINT_ENABLED=1 -# Directories +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 + +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories BACNET_PORT = ..\..\ports\win32 BACNET_OBJECT = ..\object BACNET_HANDLER = ..\handler BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include -SRCS = main.c \ - $(BACNET_PORT)\bip-init.c \ - $(BACNET_ROOT)\bip.c \ - $(BACNET_HANDLER)\txbuf.c \ - $(BACNET_HANDLER)\noserv.c \ - $(BACNET_HANDLER)\h_whois.c \ - $(BACNET_HANDLER)\h_iam.c \ - $(BACNET_HANDLER)\h_rp.c \ - $(BACNET_HANDLER)\h_ts.c \ - $(BACNET_HANDLER)\s_ts.c \ - $(BACNET_OBJECT)\bacfile.c \ - $(BACNET_OBJECT)\device.c \ - $(BACNET_OBJECT)\ai.c \ - $(BACNET_OBJECT)\ao.c \ - $(BACNET_OBJECT)\av.c \ - $(BACNET_OBJECT)\bi.c \ - $(BACNET_OBJECT)\bo.c \ - $(BACNET_OBJECT)\bv.c \ - $(BACNET_OBJECT)\lc.c \ - $(BACNET_OBJECT)\lsp.c \ - $(BACNET_OBJECT)\mso.c \ - $(BACNET_ROOT)\address.c \ - $(BACNET_ROOT)\filename.c \ - $(BACNET_ROOT)\bacdcode.c \ - $(BACNET_ROOT)\bacint.c \ - $(BACNET_ROOT)\bacapp.c \ - $(BACNET_ROOT)\bacstr.c \ - $(BACNET_ROOT)\bactext.c \ - $(BACNET_ROOT)\indtext.c \ - $(BACNET_ROOT)\datetime.c \ - $(BACNET_ROOT)\whois.c \ - $(BACNET_ROOT)\iam.c \ - $(BACNET_ROOT)\whohas.c \ - $(BACNET_ROOT)\ihave.c \ - $(BACNET_ROOT)\rd.c \ - $(BACNET_ROOT)\rp.c \ - $(BACNET_ROOT)\wp.c \ - $(BACNET_ROOT)\arf.c \ - $(BACNET_ROOT)\awf.c \ - $(BACNET_ROOT)\dcc.c \ - $(BACNET_ROOT)\timesync.c \ - $(BACNET_ROOT)\abort.c \ - $(BACNET_ROOT)\reject.c \ - $(BACNET_ROOT)\bacerror.c \ - $(BACNET_ROOT)\apdu.c \ - $(BACNET_ROOT)\npdu.c \ - $(BACNET_ROOT)\version.c +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;$(BACNET_ROOT)\;$(BACNET_OBJECT)\;$(BACNET_HANDLER)\;$(BACNET_PORT)\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -108,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del $(BACNET_ROOT)\*.obj - del $(BACNET_HANDLER)\*.obj - del $(BACNET_OBJECT)\*.obj - del $(BACNET_PORT)\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -142,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32 index e8ac1c6a..ad373896 100644 --- a/bacnet-stack/demo/ucov/makefile.b32 +++ b/bacnet-stack/demo/ucov/makefile.b32 @@ -14,82 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacucov PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_iam.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\indtext.c \ - ..\..\datetime.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\cov.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -98,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -132,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32 index d86607ac..f34fd2ff 100644 --- a/bacnet-stack/demo/whohas/makefile.b32 +++ b/bacnet-stack/demo/whohas/makefile.b32 @@ -14,86 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacwh PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=1;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\rd.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_ihave.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\s_ihave.c \ - ..\..\demo\handler\s_whohas.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\datetime.c \ - ..\..\indtext.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\whohas.c \ - ..\..\ihave.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -102,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -136,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32 index 018a6285..ade581c8 100644 --- a/bacnet-stack/demo/whois/makefile.b32 +++ b/bacnet-stack/demo/whois/makefile.b32 @@ -14,90 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacwi PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=1;PRINT_ENABLED=1;BIP_DEBUG=1 -# Directories +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 + +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories BACNET_PORT = ..\..\ports\win32 BACNET_OBJECT = ..\object BACNET_HANDLER = ..\handler BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include -SRCS = main.c \ - $(BACNET_PORT)\bip-init.c \ - $(BACNET_ROOT)\bip.c \ - $(BACNET_HANDLER)\txbuf.c \ - $(BACNET_HANDLER)\noserv.c \ - $(BACNET_HANDLER)\h_whois.c \ - $(BACNET_HANDLER)\h_iam.c \ - $(BACNET_HANDLER)\h_rp.c \ - $(BACNET_HANDLER)\s_whois.c \ - $(BACNET_OBJECT)\bacfile.c \ - $(BACNET_OBJECT)\device.c \ - $(BACNET_OBJECT)\ai.c \ - $(BACNET_OBJECT)\ao.c \ - $(BACNET_OBJECT)\av.c \ - $(BACNET_OBJECT)\bi.c \ - $(BACNET_OBJECT)\bo.c \ - $(BACNET_OBJECT)\bv.c \ - $(BACNET_OBJECT)\lc.c \ - $(BACNET_OBJECT)\lsp.c \ - $(BACNET_OBJECT)\mso.c \ - $(BACNET_ROOT)\address.c \ - $(BACNET_ROOT)\filename.c \ - $(BACNET_ROOT)\bacdcode.c \ - $(BACNET_ROOT)\bacint.c \ - $(BACNET_ROOT)\bacapp.c \ - $(BACNET_ROOT)\bacstr.c \ - $(BACNET_ROOT)\bactext.c \ - $(BACNET_ROOT)\indtext.c \ - $(BACNET_ROOT)\datetime.c \ - $(BACNET_ROOT)\whois.c \ - $(BACNET_ROOT)\iam.c \ - $(BACNET_ROOT)\whohas.c \ - $(BACNET_ROOT)\ihave.c \ - $(BACNET_ROOT)\rd.c \ - $(BACNET_ROOT)\rp.c \ - $(BACNET_ROOT)\wp.c \ - $(BACNET_ROOT)\arf.c \ - $(BACNET_ROOT)\awf.c \ - $(BACNET_ROOT)\dcc.c \ - $(BACNET_ROOT)\abort.c \ - $(BACNET_ROOT)\reject.c \ - $(BACNET_ROOT)\bacerror.c \ - $(BACNET_ROOT)\apdu.c \ - $(BACNET_ROOT)\npdu.c \ - $(BACNET_ROOT)\version.c +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;$(BACNET_ROOT)\;$(BACNET_OBJECT)\;$(BACNET_HANDLER)\;$(BACNET_PORT)\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -106,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del $(BACNET_ROOT)\*.obj - del $(BACNET_HANDLER)\*.obj - del $(BACNET_OBJECT)\*.obj - del $(BACNET_PORT)\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -140,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32 index b2dc7dc3..45e8a111 100644 --- a/bacnet-stack/demo/writefile/makefile.b32 +++ b/bacnet-stack/demo/writefile/makefile.b32 @@ -14,85 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacawf PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\demo\handler\s_awfs.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\datetime.c \ - ..\..\indtext.c \ - ..\..\filename.c \ - ..\..\bigend.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # 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 # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : $(BCC_CFG) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -101,29 +79,26 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map + del $(PRODUCT).map del $(BCC_CFG) # @@ -135,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file $(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32 index 9d29053a..5acce2fe 100644 --- a/bacnet-stack/demo/writeprop/makefile.b32 +++ b/bacnet-stack/demo/writeprop/makefile.b32 @@ -14,84 +14,63 @@ BORLAND_DIR_Not_Defined: PRODUCT = bacwp PRODUCT_EXE = $(PRODUCT).exe -# Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1 +# tools +CC = $(BORLAND_DIR)\bin\bcc32 +MAKE=$(BORLAND_DIR)\bin\make.exe +#LINK = $(BORLAND_DIR)\bin\tlink32 +LINK = $(BORLAND_DIR)\bin\ilink32 -SRCS = main.c \ - ..\..\ports\win32\bip-init.c \ - ..\..\filename.c \ - ..\..\bip.c \ - ..\..\demo\handler\txbuf.c \ - ..\..\demo\handler\noserv.c \ - ..\..\demo\handler\h_whois.c \ - ..\..\demo\handler\h_iam.c \ - ..\..\demo\handler\h_rp.c \ - ..\..\demo\handler\s_wp.c \ - ..\..\demo\handler\s_whois.c \ - ..\..\bacdcode.c \ - ..\..\bacint.c \ - ..\..\bacapp.c \ - ..\..\bacstr.c \ - ..\..\bactext.c \ - ..\..\datetime.c \ - ..\..\indtext.c \ - ..\..\whois.c \ - ..\..\iam.c \ - ..\..\rp.c \ - ..\..\wp.c \ - ..\..\arf.c \ - ..\..\awf.c \ - ..\..\dcc.c \ - ..\..\demo\object\bacfile.c \ - ..\..\demo\object\device.c \ - ..\..\demo\object\ai.c \ - ..\..\demo\object\ao.c \ - ..\..\demo\object\av.c \ - ..\..\demo\object\bi.c \ - ..\..\demo\object\bo.c \ - ..\..\demo\object\bv.c \ - ..\..\demo\object\lc.c \ - ..\..\demo\object\lsp.c \ - ..\..\demo\object\mso.c \ - ..\..\tsm.c \ - ..\..\address.c \ - ..\..\abort.c \ - ..\..\reject.c \ - ..\..\bacerror.c \ - ..\..\apdu.c \ - ..\..\npdu.c \ - ..\..\version.c +BACNET_LIB_DIR = ..\..\lib +BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib + +# directories +BACNET_PORT = ..\..\ports\win32 +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +BACNET_ROOT = ..\.. +INCLUDES = \ + -I$(BACNET_ROOT) \ + -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ + -I$(BORLAND_DIR)\include + +# +BACNET_DEFINES = -DPRINT_ENABLED=1 +#BACDL_DEFINE=-DBACDL_MSTP=1 +BACDL_DEFINE=-DBACDL_BIP=1 +DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) + +SRCS = main.c OBJS = $(SRCS:.c=.obj) +# # Compiler definitions # -CC = $(BORLAND_DIR)\bin\bcc32 +bcc32.cfg -#LINK = $(BORLAND_DIR)\bin\tlink32 -LINK = $(BORLAND_DIR)\bin\ilink32 -TLIB = $(BORLAND_DIR)\bin\tlib +BCC_CFG = bcc32.cfg # # Include directories # -CC_DIR = $(BORLAND_DIR)\BIN -INCL_DIRS = -I$(BORLAND_DIR)\include;..\..\;..\..\demo\object\;..\..\demo\handler\;..\..\ports\win32\;. - -CFLAGS = $(INCL_DIRS) $(CS_FLAGS) $(DEFINES) +CFLAGS = $(INCLUDES) $(DEFINES) +# # Libraries # C_LIB_DIR = $(BORLAND_DIR)\lib -LIBS = $(C_LIB_DIR)\IMPORT32.lib \ -$(C_LIB_DIR)\CW32MT.lib +LIBS = $(BACNET_LIB) \ + $(C_LIB_DIR)\IMPORT32.lib \ + $(C_LIB_DIR)\CW32MT.lib \ # # Main target # # This should be the first one in the makefile -all : bcc32.cfg $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) + del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\utils\$(PRODUCT_EXE) @@ -100,30 +79,27 @@ install: $(PRODUCT_EXE) # with a different linker - please change accordingly. # -# need a temp response file (@&&) because command line is too long +# need a temp response file (@&&| ... |) because command line is too long +# $** lists each dependency +# $< target name +# $* target name without extension $(PRODUCT_EXE) : $(OBJS) @echo Running Linker for $(PRODUCT_EXE) - $(LINK) -L$(C_LIB_DIR) -m -c -s -v @&&| # temp response file, starts with | - $(BORLAND_DIR)\lib\c0x32.obj $** # $** lists each dependency + $(LINK) -L$(C_LIB_DIR) -L$(BACNET_LIB_DIR) -m -c -s -v @&&| + $(BORLAND_DIR)\lib\c0x32.obj $** $< $*.map $(LIBS) -| # end of temp response file +| # # Utilities clean : - @echo Deleting obj files, $(PRODUCT_EXE) and map files. -# del $(OBJS) # command too long, bummer! - del *.obj - del ..\..\*.obj - del ..\..\demo\handler\*.obj - del ..\..\demo\object\*.obj - del ..\..\ports\win32\*.obj + del $(OBJS) del $(PRODUCT_EXE) - del *.map - del bcc32.cfg + del $(PRODUCT).map + del $(BCC_CFG) # # Generic rules @@ -134,13 +110,13 @@ clean : # cc generic rule # .c.obj: - $(CC) -o$@ $< + $(CC) +$(BCC_CFG) -o$@ $< # Compiler configuration file -bcc32.cfg : +$(BCC_CFG) : Copy &&| -$(CFLAGS) --c +$(CFLAGS) +-c -y #include line numbers in OBJ's -v #include debug info -w+ #turn on all warnings diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile index 5ae448fe..1f2d40e6 100644 --- a/bacnet-stack/lib/Makefile +++ b/bacnet-stack/lib/Makefile @@ -108,7 +108,7 @@ PORT_SRC = \ $(BACNET_ROOT)/crc.c \ $(BACNET_ROOT)/bip.c -SRCS = ${CORE_SRC} ${DEMO_SRC} ${PORT_SRC} ${HANDLER_SRC} ${OBJECT_SRC} +SRCS = ${CORE_SRC} ${PORT_SRC} ${HANDLER_SRC} ${OBJECT_SRC} OBJS = ${SRCS:.c=.o} diff --git a/bacnet-stack/makefile.b32 b/bacnet-stack/makefile.b32 index 2762099b..7b75aabc 100644 --- a/bacnet-stack/makefile.b32 +++ b/bacnet-stack/makefile.b32 @@ -8,13 +8,14 @@ BORLAND_DIR_Not_Defined: @echo Type: set BORLAND_DIR=c:\Borland\bcc55 !endif -MAKE=$(BORLAND_DIR)/bin/make.exe +MAKE=$(BORLAND_DIR)\bin\make.exe -all: readprop writeprop readfile writefile server dcc reinit \ +all: library \ + readprop writeprop readfile writefile server dcc reinit \ whois whohas timesync ucov epics @echo "demo utilities are in utils directory" -clean: \ +clean: lib\makefile.b32 \ demo/readprop/makefile.b32 \ demo/writeprop/makefile.b32 \ demo/readfile/makefile.b32 \ @@ -27,6 +28,9 @@ clean: \ demo/ucov/makefile.b32 \ demo/epics/makefile.b32 \ demo/timesync/makefile.b32 + cd lib + $(MAKE) -i -f makefile.b32 clean + cd .. cd demo/readprop $(MAKE) -i -f makefile.b32 clean cd .. @@ -76,9 +80,13 @@ clean: \ cd .. cd .. +library: lib\makefile.b32 + cd lib + $(MAKE) -f makefile.b32 all + cd .. + readprop: demo/readprop/makefile.b32 cd demo/readprop - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -86,7 +94,6 @@ readprop: demo/readprop/makefile.b32 writeprop: demo/writeprop/makefile.b32 cd demo/writeprop - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -94,7 +101,6 @@ writeprop: demo/writeprop/makefile.b32 readfile: demo/readfile/makefile.b32 cd demo/readfile - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -102,7 +108,6 @@ readfile: demo/readfile/makefile.b32 writefile: demo/writefile/makefile.b32 cd demo/writefile - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -110,7 +115,6 @@ writefile: demo/writefile/makefile.b32 server: demo/server/makefile.b32 cd demo/server - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -118,7 +122,6 @@ server: demo/server/makefile.b32 dcc: demo/dcc/makefile.b32 cd demo/dcc - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -126,7 +129,6 @@ dcc: demo/dcc/makefile.b32 reinit: demo/reinit/makefile.b32 cd demo/reinit - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -134,7 +136,6 @@ reinit: demo/reinit/makefile.b32 whois: demo/whois/makefile.b32 cd demo/whois - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -142,7 +143,6 @@ whois: demo/whois/makefile.b32 whohas: demo/whohas/makefile.b32 cd demo/whohas - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -150,7 +150,6 @@ whohas: demo/whohas/makefile.b32 ucov: demo/ucov/makefile.b32 cd demo/ucov - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -158,7 +157,6 @@ ucov: demo/ucov/makefile.b32 epics: demo/epics/makefile.b32 cd demo/epics - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd .. @@ -166,7 +164,6 @@ epics: demo/epics/makefile.b32 timesync: demo/timesync/makefile.b32 cd demo/timesync - $(MAKE) -i -f makefile.b32 clean $(MAKE) -f makefile.b32 all $(MAKE) -f makefile.b32 install cd ..