Makefile: remove ROOT_DIR

This commit is contained in:
Philippe Teuwen 2021-04-18 18:52:48 +02:00
commit 79bf006419
3 changed files with 2 additions and 9 deletions

View file

@ -4,9 +4,6 @@
# the license.
#-----------------------------------------------------------------------------
# Must be called before any Makefile include
ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
include ../Makefile.defs
INSTALLBIN = proxmark3
@ -91,6 +88,7 @@ WHEREAMILIBLD =
MBEDTLSLIBPATH = ../common/mbedtls
MBEDTLSLIBINC = -I$(MBEDTLSLIBPATH)
MBEDTLSLIB = $(OBJDIR)/libmbedtls.a
MBEDTLSLIBCLIENTRELPATH = ../../client
########################################################
# optional system libraries to replace local libraries #
@ -737,7 +735,7 @@ endif
$(MBEDTLSLIB): .FORCE
$(info [*] MAKE $@)
$(Q)$(MAKE) --no-print-directory -C $(MBEDTLSLIBPATH) OBJDIR=$(ROOT_DIR)$(OBJDIR) BINDIR=$(ROOT_DIR)$(OBJDIR) all
$(Q)$(MAKE) --no-print-directory -C $(MBEDTLSLIBPATH) OBJDIR=$(MBEDTLSLIBCLIENTRELPATH)/$(OBJDIR) BINDIR=$(MBEDTLSLIBCLIENTRELPATH)/$(OBJDIR) all
$(REVENGLIB): .FORCE
$(info [*] MAKE $@)

View file

@ -12,8 +12,6 @@ MYCFLAGS += -DLZ4_MEMORY_USAGE=20 -Wno-redundant-decls -Wno-old-style-definitio
BINS = fpga_compress
ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
include ../../Makefile.host
fpga_compress: $(OBJDIR)/fpga_compress.o $(MYOBJS)

View file

@ -1,6 +1,3 @@
# Must be called before any Makefile include
ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
include ../../Makefile.defs
all clean install uninstall check: %: crack2/% crack3/% crack4/% crack5/%