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.

This commit is contained in:
skarg
2011-03-22 20:53:13 +00:00
parent 6407f098ba
commit e095715cec
37 changed files with 131 additions and 43 deletions
+7 -3
View File
@@ -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