From c98dcbf7b62e6ad568e232c67e5db8388e82f7d1 Mon Sep 17 00:00:00 2001 From: "fisher.yu" Date: Wed, 27 Sep 2023 06:51:22 +0000 Subject: [PATCH] Refine Makefiles in examples/ test/ and perf/ Use header and lib files in lib/ to build examples/ test/ and perf/, do not search header and lib files from /usr/include and /usr/lib . Change-Id: I728119f3654f742d5b2a2b5447d3d011296495ac --- examples/burst-app/Makefile | 5 ----- perf/Makefile | 5 ----- test/common/common.mk | 6 ------ 3 files changed, 16 deletions(-) diff --git a/examples/burst-app/Makefile b/examples/burst-app/Makefile index d441cb65..0375cb36 100644 --- a/examples/burst-app/Makefile +++ b/examples/burst-app/Makefile @@ -48,14 +48,9 @@ LDLIBS = -lIPSec_MB SOURCES := main.c OBJECTS := $(SOURCES:%.c=%.o) -ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes") -# library installed -CFLAGS += -else # library not installed CFLAGS += -I$(LIB_DIR) LDFLAGS += -L$(LIB_DIR) -endif # targets come here all: $(APP) diff --git a/perf/Makefile b/perf/Makefile index abc13858..9aea0b71 100644 --- a/perf/Makefile +++ b/perf/Makefile @@ -86,14 +86,9 @@ endif endif # aarch64 LDLIBS = -lIPSec_MB -ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes") -# library installed -CFLAGS += -else # library not installed CFLAGS += -I../lib LDFLAGS += -L$(LIB_DIR) -endif DEBUG_OPT ?= -O0 ifeq ($(DEBUG),y) diff --git a/test/common/common.mk b/test/common/common.mk index 311b7cc1..a6a32add 100644 --- a/test/common/common.mk +++ b/test/common/common.mk @@ -102,15 +102,9 @@ endif # x86_64 LDLIBS = -lIPSec_MB -ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") -# library installed -$(info INFO: Using system installed library version.) -CFLAGS += -I../include/ -else # library not installed CFLAGS += -I../../lib -I../include/ LDFLAGS += -L$(LIB_DIR) -endif DEBUG_OPT ?= -O0 ifeq ($(DEBUG),y) -- GitLab