From: "Steven Rostedt (VMware)" <rostedt@xxxxxxxxxxx> Remove the variable LIBTRACEFS_DIR as it is simply bdir, and makes the Makefile confusing. Simply use $(bdir) where $(LIBTRACEFS_DIR) is currently used. Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx> --- Makefile | 11 +++++------ utest/Makefile | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e84b41408b54..5aa2ba4b5145 100644 --- a/Makefile +++ b/Makefile @@ -123,16 +123,15 @@ src := $(srctree) obj := $(objtree) bdir := $(obj)/lib/tracefs -export prefix bindir src obj +export prefix bindir src obj bdir -LIBTRACEFS_DIR = $(obj)/lib/tracefs -LIBTRACEFS_STATIC = $(LIBTRACEFS_DIR)/libtracefs.a -LIBTRACEFS_SHARED = $(LIBTRACEFS_DIR)/libtracefs.so.$(TRACEFS_VERSION) +LIBTRACEFS_STATIC = $(bdir)/libtracefs.a +LIBTRACEFS_SHARED = $(bdir)/libtracefs.so.$(TRACEFS_VERSION) -TRACE_LIBS = -L$(LIBTRACEFS_DIR) -ltracefs +TRACE_LIBS = -L$(bdir) -ltracefs export LIBS TRACE_LIBS -export LIBTRACEFS_STATIC LIBTRACEFS_SHARED LIBTRACEFS_DIR +export LIBTRACEFS_STATIC LIBTRACEFS_SHARED export Q SILENT VERBOSE EXT diff --git a/utest/Makefile b/utest/Makefile index a26d7a9a24af..9f96c4e397c1 100644 --- a/utest/Makefile +++ b/utest/Makefile @@ -11,7 +11,7 @@ OBJS += tracefs-utest.o LIBS += -lcunit \ -ldl \ - -L$(LIBTRACEFS_DIR) -ltracefs + -L$(bdir) -ltracefs OBJS := $(OBJS:%.o=$(bdir)/%.o) DEPS := $(OBJS:$(bdir)/%.o=$(bdir)/.%.d) -- 2.28.0
|