From e095715cec525b309c6c7e63cffc04878dc4dd69 Mon Sep 17 00:00:00 2001 From: skarg Date: Tue, 22 Mar 2011 20:53:13 +0000 Subject: [PATCH] Moved include files for demo objects into demo/object, and updated makefiles to accommodate the move. This allows developers to create and maintain their own objects and the interfaces to them. --- bacnet-stack/Makefile | 4 +++- bacnet-stack/demo/Makefile | 6 +++++- bacnet-stack/demo/dcc/makefile.b32 | 8 ++++++-- bacnet-stack/demo/epics/makefile.b32 | 8 ++++++-- bacnet-stack/demo/gateway/makefile.b32 | 10 +++++++--- bacnet-stack/demo/iamrouter/makefile.b32 | 8 ++++++-- bacnet-stack/demo/initrouter/makefile.b32 | 8 ++++++-- bacnet-stack/demo/mstpcap/makefile.b32 | 10 +++++++--- bacnet-stack/{include => demo/object}/ai.h | 0 bacnet-stack/{include => demo/object}/ao.h | 0 bacnet-stack/{include => demo/object}/av.h | 0 bacnet-stack/{include => demo/object}/bi.h | 0 bacnet-stack/{include => demo/object}/bo.h | 0 bacnet-stack/{include => demo/object}/bv.h | 0 bacnet-stack/{include => demo/object}/device.h | 0 bacnet-stack/demo/object/lc.c | 2 ++ bacnet-stack/{include => demo/object}/lc.h | 0 bacnet-stack/{include => demo/object}/lo.h | 0 bacnet-stack/{include => demo/object}/lso.h | 0 bacnet-stack/{include => demo/object}/lsp.h | 0 bacnet-stack/{include => demo/object}/ms-input.h | 0 bacnet-stack/{include => demo/object}/mso.h | 0 bacnet-stack/{include => demo/object}/trendlog.h | 0 bacnet-stack/demo/ptransfer/makefile.b32 | 8 ++++++-- bacnet-stack/demo/readfile/makefile.b32 | 8 ++++++-- bacnet-stack/demo/readprop/makefile.b32 | 8 ++++++-- bacnet-stack/demo/readpropm/makefile.b32 | 4 ++++ bacnet-stack/demo/reinit/makefile.b32 | 8 ++++++-- bacnet-stack/demo/server/makefile.b32 | 10 +++++++--- bacnet-stack/demo/timesync/makefile.b32 | 8 ++++++-- bacnet-stack/demo/ucov/makefile.b32 | 8 ++++++-- bacnet-stack/demo/whohas/makefile.b32 | 8 ++++++-- bacnet-stack/demo/whois/makefile.b32 | 8 ++++++-- bacnet-stack/demo/whoisrouter/makefile.b32 | 8 ++++++-- bacnet-stack/demo/writefile/makefile.b32 | 8 ++++++-- bacnet-stack/demo/writeprop/makefile.b32 | 8 ++++++-- bacnet-stack/ports/win32/MAKEFILE.MAK | 8 ++++++-- 37 files changed, 131 insertions(+), 43 deletions(-) rename bacnet-stack/{include => demo/object}/ai.h (100%) rename bacnet-stack/{include => demo/object}/ao.h (100%) rename bacnet-stack/{include => demo/object}/av.h (100%) rename bacnet-stack/{include => demo/object}/bi.h (100%) rename bacnet-stack/{include => demo/object}/bo.h (100%) rename bacnet-stack/{include => demo/object}/bv.h (100%) rename bacnet-stack/{include => demo/object}/device.h (100%) rename bacnet-stack/{include => demo/object}/lc.h (100%) rename bacnet-stack/{include => demo/object}/lo.h (100%) rename bacnet-stack/{include => demo/object}/lso.h (100%) rename bacnet-stack/{include => demo/object}/lsp.h (100%) rename bacnet-stack/{include => demo/object}/ms-input.h (100%) rename bacnet-stack/{include => demo/object}/mso.h (100%) rename bacnet-stack/{include => demo/object}/trendlog.h (100%) diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile index 634896e5..d697d43b 100644 --- a/bacnet-stack/Makefile +++ b/bacnet-stack/Makefile @@ -33,7 +33,9 @@ BACNET_CORE = ../src BACNET_INCLUDE = ../include # compiler configuration #STANDARDS = -std=c99 -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDE1 = -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDE2 = -I$(BACNET_INCLUDE) +INCLUDES = $(INCLUDE1) $(INCLUDE2) OPTIMIZATION = -Os DEBUGGING = WARNINGS = -Wall -Wmissing-prototypes diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile index 010a76f4..39d803f4 100644 --- a/bacnet-stack/demo/Makefile +++ b/bacnet-stack/demo/Makefile @@ -11,12 +11,16 @@ BACNET_PORT = linux BACNET_PORT_DIR = ../../ports/${BACNET_PORT} BACNET_INCLUDE = ../../include +BACNET_OBJECT = ../../demo/object +BACNET_HANDLER = ../../demo/handler # BACnet Library BACNET_LIB_DIR = ../../lib BACNET_LIB_NAME = bacnet BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a # Compiler Setup -INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) +INCLUDE1 = -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDE2 = -I$(BACNET_INCLUDE) +INCLUDES = $(INCLUDE1) $(INCLUDE2) ifeq (${BACNET_PORT},linux) PFLAGS = -pthread TARGET_EXT = diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index b67cf0dc..b5a28e87 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32 index 5cfe0ca5..a990688f 100644 --- a/bacnet-stack/demo/epics/makefile.b32 +++ b/bacnet-stack/demo/epics/makefile.b32 @@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib BACNET_SOURCE = ..\..\src BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/gateway/makefile.b32 b/bacnet-stack/demo/gateway/makefile.b32 index c45da4e8..47644066 100644 --- a/bacnet-stack/demo/gateway/makefile.b32 +++ b/bacnet-stack/demo/gateway/makefile.b32 @@ -29,9 +29,13 @@ BACNET_DEMO_DIR = ..\demo\gateway # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -68,12 +72,12 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\bin\$(PRODUCT_EXE) - + $(BACNET_LIB): cd $(BACNET_LIB_DIR) $(MAKE) -i -f makefile.b32 clean diff --git a/bacnet-stack/demo/iamrouter/makefile.b32 b/bacnet-stack/demo/iamrouter/makefile.b32 index 8fdb0aba..2f09819f 100644 --- a/bacnet-stack/demo/iamrouter/makefile.b32 +++ b/bacnet-stack/demo/iamrouter/makefile.b32 @@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/initrouter/makefile.b32 b/bacnet-stack/demo/initrouter/makefile.b32 index 36650ced..52839306 100644 --- a/bacnet-stack/demo/initrouter/makefile.b32 +++ b/bacnet-stack/demo/initrouter/makefile.b32 @@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/mstpcap/makefile.b32 b/bacnet-stack/demo/mstpcap/makefile.b32 index 28141471..a027da25 100644 --- a/bacnet-stack/demo/mstpcap/makefile.b32 +++ b/bacnet-stack/demo/mstpcap/makefile.b32 @@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -38,7 +42,7 @@ BACNET_DEFINES = -DPRINT_ENABLED=1 -DBACAPP_ALL BACDL_DEFINE=-DBACDL_BIP=1 -DUSE_INADDR=1 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) -SRCS = main.c \ +SRCS = main.c \ OBJS = $(SRCS:.c=.obj) @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/include/ai.h b/bacnet-stack/demo/object/ai.h similarity index 100% rename from bacnet-stack/include/ai.h rename to bacnet-stack/demo/object/ai.h diff --git a/bacnet-stack/include/ao.h b/bacnet-stack/demo/object/ao.h similarity index 100% rename from bacnet-stack/include/ao.h rename to bacnet-stack/demo/object/ao.h diff --git a/bacnet-stack/include/av.h b/bacnet-stack/demo/object/av.h similarity index 100% rename from bacnet-stack/include/av.h rename to bacnet-stack/demo/object/av.h diff --git a/bacnet-stack/include/bi.h b/bacnet-stack/demo/object/bi.h similarity index 100% rename from bacnet-stack/include/bi.h rename to bacnet-stack/demo/object/bi.h diff --git a/bacnet-stack/include/bo.h b/bacnet-stack/demo/object/bo.h similarity index 100% rename from bacnet-stack/include/bo.h rename to bacnet-stack/demo/object/bo.h diff --git a/bacnet-stack/include/bv.h b/bacnet-stack/demo/object/bv.h similarity index 100% rename from bacnet-stack/include/bv.h rename to bacnet-stack/demo/object/bv.h diff --git a/bacnet-stack/include/device.h b/bacnet-stack/demo/object/device.h similarity index 100% rename from bacnet-stack/include/device.h rename to bacnet-stack/demo/object/device.h diff --git a/bacnet-stack/demo/object/lc.c b/bacnet-stack/demo/object/lc.c index e0629486..eacb2c5c 100644 --- a/bacnet-stack/demo/object/lc.c +++ b/bacnet-stack/demo/object/lc.c @@ -1095,6 +1095,8 @@ static void Load_Control_WriteProperty_Request_Shed_Percent( wp_data.array_index = BACNET_ARRAY_ALL; wp_data.priority = BACNET_NO_PRIORITY; wp_data.object_property = PROP_REQUESTED_SHED_LEVEL; + wp_data.error_class = ERROR_CLASS_PROPERTY; + wp_data.error_code = ERROR_CODE_VALUE_OUT_OF_RANGE; value.context_specific = true; value.context_tag = 0; value.tag = BACNET_APPLICATION_TAG_UNSIGNED_INT; diff --git a/bacnet-stack/include/lc.h b/bacnet-stack/demo/object/lc.h similarity index 100% rename from bacnet-stack/include/lc.h rename to bacnet-stack/demo/object/lc.h diff --git a/bacnet-stack/include/lo.h b/bacnet-stack/demo/object/lo.h similarity index 100% rename from bacnet-stack/include/lo.h rename to bacnet-stack/demo/object/lo.h diff --git a/bacnet-stack/include/lso.h b/bacnet-stack/demo/object/lso.h similarity index 100% rename from bacnet-stack/include/lso.h rename to bacnet-stack/demo/object/lso.h diff --git a/bacnet-stack/include/lsp.h b/bacnet-stack/demo/object/lsp.h similarity index 100% rename from bacnet-stack/include/lsp.h rename to bacnet-stack/demo/object/lsp.h diff --git a/bacnet-stack/include/ms-input.h b/bacnet-stack/demo/object/ms-input.h similarity index 100% rename from bacnet-stack/include/ms-input.h rename to bacnet-stack/demo/object/ms-input.h diff --git a/bacnet-stack/include/mso.h b/bacnet-stack/demo/object/mso.h similarity index 100% rename from bacnet-stack/include/mso.h rename to bacnet-stack/demo/object/mso.h diff --git a/bacnet-stack/include/trendlog.h b/bacnet-stack/demo/object/trendlog.h similarity index 100% rename from bacnet-stack/include/trendlog.h rename to bacnet-stack/demo/object/trendlog.h diff --git a/bacnet-stack/demo/ptransfer/makefile.b32 b/bacnet-stack/demo/ptransfer/makefile.b32 index eaa8c08d..5bfcb9f5 100644 --- a/bacnet-stack/demo/ptransfer/makefile.b32 +++ b/bacnet-stack/demo/ptransfer/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32 index 9fbc9761..759c1d2d 100644 --- a/bacnet-stack/demo/readfile/makefile.b32 +++ b/bacnet-stack/demo/readfile/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32 index 94d3bcaa..d1c7d2a9 100644 --- a/bacnet-stack/demo/readprop/makefile.b32 +++ b/bacnet-stack/demo/readprop/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/readpropm/makefile.b32 b/bacnet-stack/demo/readpropm/makefile.b32 index 4ba4f95b..d60bdbd2 100644 --- a/bacnet-stack/demo/readpropm/makefile.b32 +++ b/bacnet-stack/demo/readpropm/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32 index 1c46cdae..71ef2b53 100644 --- a/bacnet-stack/demo/reinit/makefile.b32 +++ b/bacnet-stack/demo/reinit/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32 index 8f8f3a72..9a645b36 100644 --- a/bacnet-stack/demo/server/makefile.b32 +++ b/bacnet-stack/demo/server/makefile.b32 @@ -29,9 +29,13 @@ BACNET_DEMO_DIR = ..\demo\server # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -68,12 +72,12 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) copy $(PRODUCT_EXE) ..\..\bin\$(PRODUCT_EXE) - + $(BACNET_LIB): cd $(BACNET_LIB_DIR) $(MAKE) -i -f makefile.b32 clean diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32 index d91d02e6..b53157d3 100644 --- a/bacnet-stack/demo/timesync/makefile.b32 +++ b/bacnet-stack/demo/timesync/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32 index 8c6ae60b..6f416712 100644 --- a/bacnet-stack/demo/ucov/makefile.b32 +++ b/bacnet-stack/demo/ucov/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32 index d0ad3c8b..a800fa12 100644 --- a/bacnet-stack/demo/whohas/makefile.b32 +++ b/bacnet-stack/demo/whohas/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32 index b31a575d..d4737449 100644 --- a/bacnet-stack/demo/whois/makefile.b32 +++ b/bacnet-stack/demo/whois/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/whoisrouter/makefile.b32 b/bacnet-stack/demo/whoisrouter/makefile.b32 index 416145ae..9a45d15a 100644 --- a/bacnet-stack/demo/whoisrouter/makefile.b32 +++ b/bacnet-stack/demo/whoisrouter/makefile.b32 @@ -27,9 +27,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32 index 15d0b4f2..3a623ed9 100644 --- a/bacnet-stack/demo/writefile/makefile.b32 +++ b/bacnet-stack/demo/writefile/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -65,7 +69,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32 index 2be1ded8..567b7401 100644 --- a/bacnet-stack/demo/writeprop/makefile.b32 +++ b/bacnet-stack/demo/writeprop/makefile.b32 @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 BACNET_INCLUDE = ..\..\include -INCLUDES = \ +BACNET_OBJECT = ..\object +BACNET_HANDLER = ..\handler +INCLUDES = \ -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # @@ -69,7 +73,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE) diff --git a/bacnet-stack/ports/win32/MAKEFILE.MAK b/bacnet-stack/ports/win32/MAKEFILE.MAK index b06065ed..4ea64760 100644 --- a/bacnet-stack/ports/win32/MAKEFILE.MAK +++ b/bacnet-stack/ports/win32/MAKEFILE.MAK @@ -26,9 +26,13 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = . BACNET_INCLUDE = ..\..\include +BACNET_OBJECT = ..\..\demo\object +BACNET_HANDLER = ..\..\demo\handler BACNET_CORE = ..\..\src -INCLUDES = \ +INCLUDES = \ -I$(BACNET_INCLUDE) \ + -I$(BACNET_OBJECT) \ + -I$(BACNET_HANDLER) \ -I$(BACNET_PORT) \ -I$(BORLAND_DIR)\include @@ -66,7 +70,7 @@ LIBS = $(BACNET_LIB) \ # # This should be the first one in the makefile -all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) +all : $(BACNET_LIB) $(BCC_CFG) $(OBJS) $(PRODUCT_EXE) del $(BCC_CFG) install: $(PRODUCT_EXE)