diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile index 5679ea16..73835025 100644 --- a/bacnet-stack/demo/dcc/Makefile +++ b/bacnet-stack/demo/dcc/Makefile @@ -13,16 +13,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index c01d6ff9..e554f827 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -26,14 +26,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/epics/Makefile b/bacnet-stack/demo/epics/Makefile index a410914a..07790b81 100644 --- a/bacnet-stack/demo/epics/Makefile +++ b/bacnet-stack/demo/epics/Makefile @@ -13,15 +13,13 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/epics/makefile.b32 b/bacnet-stack/demo/epics/makefile.b32 index f5b45a93..8c8ed939 100644 --- a/bacnet-stack/demo/epics/makefile.b32 +++ b/bacnet-stack/demo/epics/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile index 56605c75..f1fe2366 100644 --- a/bacnet-stack/demo/readfile/Makefile +++ b/bacnet-stack/demo/readfile/Makefile @@ -13,15 +13,13 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32 index e197604c..e9c4cff1 100644 --- a/bacnet-stack/demo/readfile/makefile.b32 +++ b/bacnet-stack/demo/readfile/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile index b3585870..32378c62 100644 --- a/bacnet-stack/demo/readprop/Makefile +++ b/bacnet-stack/demo/readprop/Makefile @@ -14,15 +14,13 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32 index 30bbf195..eeee0ab8 100644 --- a/bacnet-stack/demo/readprop/makefile.b32 +++ b/bacnet-stack/demo/readprop/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile index c6549336..6c3cd121 100644 --- a/bacnet-stack/demo/reinit/Makefile +++ b/bacnet-stack/demo/reinit/Makefile @@ -15,15 +15,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include + # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32 index c7e3198e..d8c9a0c1 100644 --- a/bacnet-stack/demo/reinit/makefile.b32 +++ b/bacnet-stack/demo/reinit/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile index 800db2aa..89b103ea 100644 --- a/bacnet-stack/demo/server/Makefile +++ b/bacnet-stack/demo/server/Makefile @@ -15,15 +15,13 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. -# BACnet Library +BACNET_INCLUDE = ../../include + 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32 index 8c94fc5d..9b6c82b8 100644 --- a/bacnet-stack/demo/server/makefile.b32 +++ b/bacnet-stack/demo/server/makefile.b32 @@ -28,14 +28,10 @@ BACNET_DEMO_DIR = ..\demo\server # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile index 957aa225..aa3b9974 100644 --- a/bacnet-stack/demo/timesync/Makefile +++ b/bacnet-stack/demo/timesync/Makefile @@ -15,15 +15,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include + # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32 index 3bb1973f..42ff0c0a 100644 --- a/bacnet-stack/demo/timesync/makefile.b32 +++ b/bacnet-stack/demo/timesync/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile index a88dfda9..598905b4 100644 --- a/bacnet-stack/demo/ucov/Makefile +++ b/bacnet-stack/demo/ucov/Makefile @@ -15,15 +15,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include + # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32 index ad373896..ba46d171 100644 --- a/bacnet-stack/demo/ucov/makefile.b32 +++ b/bacnet-stack/demo/ucov/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile index 4b462879..085bd352 100644 --- a/bacnet-stack/demo/whohas/Makefile +++ b/bacnet-stack/demo/whohas/Makefile @@ -15,15 +15,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include + # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32 index f34fd2ff..fbdda672 100644 --- a/bacnet-stack/demo/whohas/makefile.b32 +++ b/bacnet-stack/demo/whohas/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/whois/Makefile b/bacnet-stack/demo/whois/Makefile index 9716abc1..83e20de0 100644 --- a/bacnet-stack/demo/whois/Makefile +++ b/bacnet-stack/demo/whois/Makefile @@ -13,16 +13,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32 index ade581c8..ecbd836d 100644 --- a/bacnet-stack/demo/whois/makefile.b32 +++ b/bacnet-stack/demo/whois/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile index df5c595d..9f501a91 100644 --- a/bacnet-stack/demo/writefile/Makefile +++ b/bacnet-stack/demo/writefile/Makefile @@ -15,15 +15,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include + # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32 index 45e8a111..48955f34 100644 --- a/bacnet-stack/demo/writefile/makefile.b32 +++ b/bacnet-stack/demo/writefile/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include # diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile index 93ef38e7..5ff99373 100644 --- a/bacnet-stack/demo/writeprop/Makefile +++ b/bacnet-stack/demo/writeprop/Makefile @@ -15,15 +15,14 @@ DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) # Directories BACNET_PORT = ../../ports/linux -BACNET_OBJECT = ../object -BACNET_HANDLER = ../handler -BACNET_ROOT = ../.. +BACNET_INCLUDE = ../../include + # 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_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) +INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT) LIBRARIES=-lc,-lgcc,-lm,-L=$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) CFLAGS = -Wall -g $(INCLUDES) $(DEFINES) LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32 index 5acce2fe..a66b0281 100644 --- a/bacnet-stack/demo/writeprop/makefile.b32 +++ b/bacnet-stack/demo/writeprop/makefile.b32 @@ -25,14 +25,10 @@ BACNET_LIB = $(BACNET_LIB_DIR)\bacnet.lib # directories BACNET_PORT = ..\..\ports\win32 -BACNET_OBJECT = ..\object -BACNET_HANDLER = ..\handler -BACNET_ROOT = ..\.. +BACNET_INCLUDE = ..\..\include INCLUDES = \ - -I$(BACNET_ROOT) \ + -I$(BACNET_INCLUDE) \ -I$(BACNET_PORT) \ - -I$(BACNET_OBJECT) \ - -I$(BACNET_HANDLER) \ -I$(BORLAND_DIR)\include #