Makefile: remove ROOT_DIR
This commit is contained in:
@@ -4,9 +4,6 @@
|
|||||||
# the license.
|
# the license.
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
# Must be called before any Makefile include
|
|
||||||
ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
|
||||||
|
|
||||||
include ../Makefile.defs
|
include ../Makefile.defs
|
||||||
|
|
||||||
INSTALLBIN = proxmark3
|
INSTALLBIN = proxmark3
|
||||||
@@ -91,6 +88,7 @@ WHEREAMILIBLD =
|
|||||||
MBEDTLSLIBPATH = ../common/mbedtls
|
MBEDTLSLIBPATH = ../common/mbedtls
|
||||||
MBEDTLSLIBINC = -I$(MBEDTLSLIBPATH)
|
MBEDTLSLIBINC = -I$(MBEDTLSLIBPATH)
|
||||||
MBEDTLSLIB = $(OBJDIR)/libmbedtls.a
|
MBEDTLSLIB = $(OBJDIR)/libmbedtls.a
|
||||||
|
MBEDTLSLIBCLIENTRELPATH = ../../client
|
||||||
|
|
||||||
########################################################
|
########################################################
|
||||||
# optional system libraries to replace local libraries #
|
# optional system libraries to replace local libraries #
|
||||||
@@ -737,7 +735,7 @@ endif
|
|||||||
|
|
||||||
$(MBEDTLSLIB): .FORCE
|
$(MBEDTLSLIB): .FORCE
|
||||||
$(info [*] MAKE $@)
|
$(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
|
$(REVENGLIB): .FORCE
|
||||||
$(info [*] MAKE $@)
|
$(info [*] MAKE $@)
|
||||||
|
|||||||
@@ -12,8 +12,6 @@ MYCFLAGS += -DLZ4_MEMORY_USAGE=20 -Wno-redundant-decls -Wno-old-style-definitio
|
|||||||
|
|
||||||
BINS = fpga_compress
|
BINS = fpga_compress
|
||||||
|
|
||||||
ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
|
||||||
|
|
||||||
include ../../Makefile.host
|
include ../../Makefile.host
|
||||||
|
|
||||||
fpga_compress: $(OBJDIR)/fpga_compress.o $(MYOBJS)
|
fpga_compress: $(OBJDIR)/fpga_compress.o $(MYOBJS)
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
# Must be called before any Makefile include
|
|
||||||
ROOT_DIR:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
|
|
||||||
|
|
||||||
include ../../Makefile.defs
|
include ../../Makefile.defs
|
||||||
|
|
||||||
all clean install uninstall check: %: crack2/% crack3/% crack4/% crack5/%
|
all clean install uninstall check: %: crack2/% crack3/% crack4/% crack5/%
|
||||||
|
|||||||
Reference in New Issue
Block a user