dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed apps/Makefile to use apps/lib/libbacnet.a module instead of omodule in system /usr/lib folder.

Browse Source
This commit is contained in:
Steve Karg
2024-02-19 10:32:02 -06:00
parent 8401f01b75
commit fd2c49bf65
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/Makefile
+2 -5
View File
@@ -14,7 +14,7 @@ BACNET_DEFINES ?=
BACNET_LIB_DIR = $(realpath ./lib) BACNET_LIB_DIR = $(realpath ./lib)
BACNET_LIB_NAME = bacnet BACNET_LIB_NAME = bacnet
BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a BACNET_LIB_TARGET = $(BACNET_LIB_DIR)/lib$(BACNET_LIB_NAME).a
BACNET_LIB ?= -L$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) BACNET_LIB ?= -L$(BACNET_LIB_DIR) -l$(BACNET_LIB_NAME)
# choose a datalink to build the example applications # choose a datalink to build the example applications
# Use BACDL=mstp or BACDL=bip and BBMD=server when invoking make # Use BACDL=mstp or BACDL=bip and BBMD=server when invoking make
@@ -172,7 +172,7 @@ INCLUDES = -I$(BACNET_SRC_DIR) -I$(BACNET_PORT_DIR)
CFLAGS += $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(BACNET_DEFINES) $(INCLUDES) CFLAGS += $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(BACNET_DEFINES) $(INCLUDES)
CFLAGS += $(CSTANDARD) CFLAGS += $(CSTANDARD)
ifneq (${BACNET_LIB},) ifneq (${BACNET_LIB},)
LFLAGS += -Wl,$(BACNET_LIB) LFLAGS += $(BACNET_LIB)
endif endif
# BACnet library depends on system flags. # BACnet library depends on system flags.
# System flags must go after BACnet library flags. # System flags must go after BACnet library flags.
@@ -212,7 +212,6 @@ ifeq (${BACNET_PORT},win32)
SUBDIRS += mstpcap mstpcrc SUBDIRS += mstpcap mstpcrc
endif endif
##### #####
# Define target-specific fuzzing flags # Define target-specific fuzzing flags
##### #####
@@ -230,12 +229,10 @@ fuzz-libfuzzer: FUZZ_FLAGS=-DFUZZING=1 -fsanitize=fuzzer,address -g3 -Og -fno-op
fuzz-libfuzzer: LFLAGS += $(FUZZ_FLAGS) fuzz-libfuzzer: LFLAGS += $(FUZZ_FLAGS)
fuzz-libfuzzer: CFLAGS += $(FUZZ_FLAGS) fuzz-libfuzzer: CFLAGS += $(FUZZ_FLAGS)
##### #####
# Fuzz setup end # Fuzz setup end
##### #####
.PHONY: all clean .PHONY: all clean
TARGETS = all clean TARGETS = all clean