Removed the BACnet objects from the library Makefile, and added them to the demo/server/Makefile to enable compiling with GCC 2.95.3 under QNX.

This commit is contained in:
skarg
2013-07-20 22:30:47 +00:00
parent 219a8b4e5b
commit cbe6439fd2
2 changed files with 22 additions and 20 deletions
+21 -1
View File
@@ -9,7 +9,27 @@ TARGET = bacserv
TARGET_BIN = ${TARGET}$(TARGET_EXT)
SRCS = main.c
SRC = main.c
OBJECT_SRC = \
$(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)/csv.c \
$(BACNET_OBJECT)/lc.c \
$(BACNET_OBJECT)/lsp.c \
$(BACNET_OBJECT)/ms-input.c \
$(BACNET_OBJECT)/mso.c \
$(BACNET_OBJECT)/msv.c \
$(BACNET_OBJECT)/nc.c \
$(BACNET_OBJECT)/trendlog.c \
$(BACNET_OBJECT)/bacfile.c
SRCS = ${SRC} ${OBJECT_SRC}
OBJS = ${SRCS:.c=.o}
+1 -19
View File
@@ -125,24 +125,6 @@ HANDLER_SRC = \
$(BACNET_HANDLER)/s_upt.c \
$(BACNET_HANDLER)/s_wp.c
OBJECT_SRC = \
$(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)/csv.c \
$(BACNET_OBJECT)/lc.c \
$(BACNET_OBJECT)/lsp.c \
$(BACNET_OBJECT)/ms-input.c \
$(BACNET_OBJECT)/mso.c \
$(BACNET_OBJECT)/msv.c \
$(BACNET_OBJECT)/nc.c \
$(BACNET_OBJECT)/trendlog.c \
$(BACNET_OBJECT)/bacfile.c
PORT_ARCNET_SRC = \
$(BACNET_PORT_DIR)/arcnet.c
@@ -197,7 +179,7 @@ ifneq (,$(findstring -DBAC_UCI,$(BACNET_DEFINES)))
UCI_SRC = $(BACNET_CORE)/ucix.c
endif
SRCS = ${CORE_SRC} ${PORT_SRC} ${HANDLER_SRC} ${OBJECT_SRC}
SRCS = ${CORE_SRC} ${PORT_SRC} ${HANDLER_SRC}
OBJS = ${SRCS:.c=.o}