From 2f12e57408ab7bbcd55b3b302da1f36b501f7d51 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 10 Mar 2019 11:35:03 +0100 Subject: [PATCH] Makefiles: remove spurious spaces/tabs --- Makefile | 50 ++++++++++++++++++++-------------------- armsrc/Makefile | 34 +++++++++++++-------------- bootrom/Makefile | 8 +++---- client/Makefile | 26 ++++++++++----------- client/jansson/Makefile | 10 ++++---- client/tinycbor/Makefile | 10 ++++---- common/mbedtls/Makefile | 10 ++++---- fpga/Makefile | 4 ++-- fpga/tests/Makefile | 2 +- recovery/Makefile | 2 +- tools/Makefile | 8 +++---- tools/mfkey/Makefile | 4 ++-- tools/nonce2key/Makefile | 2 +- 13 files changed, 85 insertions(+), 85 deletions(-) diff --git a/Makefile b/Makefile index ba73cff56..fb7cd8a2d 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,26 @@ GZIP=gzip # Windows' echo echos its input verbatim, on Posix there is some -# amount of shell command line parsing going on. echo "" on +# amount of shell command line parsing going on. echo "" on # Windows yields literal "", on Linux yields an empty line ifeq ($(shell echo ""),) -# This is probably a proper system, so we can use uname -DELETE=rm -rf -FLASH_TOOL=client/flasher -platform=$(shell uname) -ifneq (,$(findstring MINGW,$(platform))) -FLASH_PORT=com3 -PATHSEP=\\# + # This is probably a proper system, so we can use uname + DELETE=rm -rf + FLASH_TOOL=client/flasher + platform=$(shell uname) + ifneq (,$(findstring MINGW,$(platform))) + FLASH_PORT=com3 + PATHSEP=\\# + else + FLASH_PORT=/dev/ttyACM0 + PATHSEP=/ + endif else -FLASH_PORT=/dev/ttyACM0 -PATHSEP=/ -endif -else -# Assume that we are running on native Windows -DELETE=del /q -FLASH_TOOL=client/flasher.exe -platform=Windows -FLASH_PORT=com3 -PATHSEP=\\# + # Assume that we are running on native Windows + DELETE=del /q + FLASH_TOOL=client/flasher.exe + platform=Windows + FLASH_PORT=com3 + PATHSEP=\\# endif all clean: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/% @@ -44,15 +44,15 @@ FORCE: # Dummy target to force remake in the subdirectories, even if files exist help: @echo Multi-OS Makefile, you are running on $(DETECTED_OS) @echo Possible targets: - @echo + all - Make bootrom, armsrc and the OS-specific host directory + @echo + all - Make bootrom, armsrc and the OS-specific host directory @echo + client - Make only the OS-specific host directory @echo + flash-bootrom - Make bootrom and flash it @echo + flash-os - Make armsrc and flash os \(includes fpga\) @echo + flash-all - Make bootrom and armsrc and flash bootrom and os image @echo + mfkey - Make tools/mfkey @echo + nounce2key - Make tools/nounce2key - @echo + clean - Clean in bootrom, armsrc and the OS-specific host directory - + @echo + clean - Clean in bootrom, armsrc and the OS-specific host directory + client: client/all flash-bootrom: bootrom/obj/bootrom.elf $(FLASH_TOOL) @@ -71,7 +71,7 @@ newtarbin: tarbin: newtarbin client/tarbin armsrc/tarbin bootrom/tarbin $(GZIP) proxmark3-$(platform)-bin.tar -# configure system +# configure system # - to ignore PM3 device as a modem (blacklist) # - add user to the dialout group # you may need to logout, relogin to get this access right correct. @@ -84,12 +84,12 @@ ifneq ($(wildcard /etc/arch-release),) #If user is running ArchLinux else sudo adduser $(USER) dialout endif - + # easy printing of MAKE VARIABLES -print-%: ; @echo $* = $($*) +print-%: ; @echo $* = $($*) style: - find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \; + find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "Makefile" \) -exec perl -pi -e 's/[ \t\r]+$$//' {} \; find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \ --indent=spaces=4 --indent-switches --indent-preprocessor \ --keep-one-line-blocks --max-instatement-indent=60 \ diff --git a/armsrc/Makefile b/armsrc/Makefile index efc443227..53a8b150e 100644 --- a/armsrc/Makefile +++ b/armsrc/Makefile @@ -10,7 +10,7 @@ APP_INCLUDES = apps.h #remove one of the following defines and comment out the relevant line #in the next section to remove that particular feature from compilation. -# NO space,TABs after the "\" sign. +# NO space,TABs after the "\" sign. APP_CFLAGS = -DWITH_CRC \ -DON_DEVICE \ -DWITH_LF \ @@ -48,11 +48,11 @@ SRC_LCD = fonts.c LCD.c SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c SRC_ISO15693 = iso15693.c iso15693tools.c #SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c -SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c +SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c SRC_ISO14443b = iso14443b.c SRC_FELICA = felica.c SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c -SRC_CRC = crc.c crc16.c crc32.c +SRC_CRC = crc.c crc16.c crc32.c SRC_ICLASS = iclass.c optimized_cipher.c SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c SRC_BEE = bee.c @@ -61,19 +61,19 @@ SRC_BEE = bee.c ifneq (,$(findstring WITH_FLASH,$(APP_CFLAGS))) SRC_FLASH = flashmem.c else - SRC_FLASH = + SRC_FLASH = endif ifneq (,$(findstring WITH_SMARTCARD,$(APP_CFLAGS))) SRC_SMARTCARD = i2c.c else - SRC_SMARTCARD = + SRC_SMARTCARD = endif ifneq (,$(findstring WITH_FPC,$(APP_CFLAGS))) SRC_FPC = usart.c else - SRC_FPC = + SRC_FPC = endif # Generic standalone Mode injection of source code @@ -92,7 +92,7 @@ ifneq (,$(findstring WITH_LF_PROXBRUTE,$(APP_CFLAGS))) endif # WITH_LF_HIDBRUTE ifneq (,$(findstring WITH_LF_HIDBRUTE,$(APP_CFLAGS))) - SRC_STANDALONE = lf_hidbrute.c + SRC_STANDALONE = lf_hidbrute.c endif # WITH_HF_YOUNG ifneq (,$(findstring WITH_HF_YOUNG,$(APP_CFLAGS))) @@ -160,16 +160,16 @@ ARMSRC = fpgaloader.c \ parity.c \ usb_cdc.c \ cmd.c - + VERSIONSRC = version.c \ fpga_version_info.c - + # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC include ../common/Makefile.common -COMMON_FLAGS = -Os +COMMON_FLAGS = -Os -OBJS = $(OBJDIR)/fullimage.s19 +OBJS = $(OBJDIR)/fullimage.s19 FPGA_COMPRESSOR = ../client/fpga_compress all: $(OBJS) @@ -179,7 +179,7 @@ all: $(OBJS) # version.c should be remade on every compilation .PHONY: version.c version.c: default_version.c - perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ + perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR) $(FPGA_COMPRESSOR) -v $(filter %.bit,$^) $@ @@ -188,17 +188,17 @@ $(OBJDIR)/fpga_all.o: $(OBJDIR)/fpga_all.bit.z $(OBJCOPY) -O elf32-littlearm -I binary -B arm --prefix-sections=fpga_all_bit $^ $@ $(OBJDIR)/fpga_all.bit.z: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR) - $(FPGA_COMPRESSOR) $(filter %.bit,$^) $@ + $(FPGA_COMPRESSOR) $(filter %.bit,$^) $@ $(FPGA_COMPRESSOR): $(MAKE) -C ../client $(notdir $(FPGA_COMPRESSOR)) - + $(OBJDIR)/fullimage.stage1.elf: $(VERSIONOBJ) $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ) $(CC) $(LDFLAGS) -Wl,-T,ldscript,-Map,$(patsubst %.elf,%.map,$@) -o $@ $^ $(LIBS) $(OBJDIR)/fullimage.nodata.bin: $(OBJDIR)/fullimage.stage1.elf $(OBJCOPY) -O binary -I elf32-littlearm --remove-section .data $^ $@ - + $(OBJDIR)/fullimage.nodata.o: $(OBJDIR)/fullimage.nodata.bin $(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=stage1_image $^ $@ @@ -206,8 +206,8 @@ $(OBJDIR)/fullimage.data.bin: $(OBJDIR)/fullimage.stage1.elf $(OBJCOPY) -O binary -I elf32-littlearm --only-section .data $^ $@ $(OBJDIR)/fullimage.data.bin.z: $(OBJDIR)/fullimage.data.bin $(FPGA_COMPRESSOR) - $(FPGA_COMPRESSOR) $(filter %.bin,$^) $@ - + $(FPGA_COMPRESSOR) $(filter %.bin,$^) $@ + $(OBJDIR)/fullimage.data.o: $(OBJDIR)/fullimage.data.bin.z $(OBJCOPY) -O elf32-littlearm -I binary -B arm --rename-section .data=compressed_data $^ $@ diff --git a/bootrom/Makefile b/bootrom/Makefile index c7e879bda..967acc6f5 100644 --- a/bootrom/Makefile +++ b/bootrom/Makefile @@ -7,7 +7,7 @@ #----------------------------------------------------------------------------- # DO NOT use thumb mode in the phase 1 bootloader since that generates a section with glue code -ARMSRC = +ARMSRC = THUMBSRC = cmd.c \ usb_cdc.c \ bootrom.c @@ -20,7 +20,7 @@ VERSIONSRC = version.c ## zeroes. As a temporary workaround, do not use thumb for the phase 2 bootloader ## -- Henryk Plötz 2009-09-01 # ARMSRC := $(ARMSRC) $(THUMBSRC) -# THUMBSRC := +# THUMBSRC := # stdint.h provided locally until GCC 4.5 becomes C99 compliant APP_CFLAGS = -I. -fno-strict-aliasing -ffunction-sections -fdata-sections @@ -36,7 +36,7 @@ OBJS = $(OBJDIR)/bootrom.s19 # version.c should be remade on every compilation version.c: default_version.c - perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ + perl ../tools/mkversion.pl .. > $@ || $(COPY) $^ $@ all: $(OBJS) @@ -54,7 +54,7 @@ clean: $(DELETE) $(OBJDIR)$(PATHSEP)*.d $(DELETE) version.c -.PHONY: all clean help +.PHONY: all clean help help: @echo Multi-OS Makefile, you are running on $(DETECTED_OS) @echo Possible targets: diff --git a/client/Makefile b/client/Makefile index d83fbff5f..76810f893 100644 --- a/client/Makefile +++ b/client/Makefile @@ -39,13 +39,13 @@ CXXFLAGS = -I../include -Wall -O3 LUAPLATFORM = generic platform = $(shell uname) -ifneq (,$(findstring MINGW,$(platform))) +ifneq (,$(findstring MINGW,$(platform))) LUAPLATFORM = mingw else ifeq ($(platform),Darwin) LUAPLATFORM = macosx OBJCSRCS = util_darwin.m - LDFLAGS += -framework Foundation -framework AppKit + LDFLAGS += -framework Foundation -framework AppKit else LUALIB += -ldl LDLIBS += -ltermcap -lncurses @@ -59,7 +59,7 @@ QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null) MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic ifeq ($(QTINCLUDES), ) -# if Qt5 not found check for correctly configured Qt4 +# if Qt5 not found check for correctly configured Qt4 QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) MOC = $(shell pkg-config --variable=moc_location QtCore) @@ -91,7 +91,7 @@ else endif # RDV40 flag enables flashmemory commands in client. comment out if you don't have rdv40 -CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD +CFLAGS += -DWITH_FLASH -DWITH_SMARTCARD # Flags to generate temporary dependency files DEPFLAGS = -MT $@ -MMD -MP -MF $(OBJDIR)/$*.Td @@ -232,7 +232,7 @@ endif ifeq ($(MULTIARCHSRCS), ) CMDSRCS += hardnested/hardnested_bf_core.c hardnested/hardnested_bitarray_core.c endif - + ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c ZLIBFLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED #-DDEBUG -Dverbose=1 @@ -271,7 +271,7 @@ WINBINS = $(patsubst %, %.exe, $(BINS)) CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h lualibs/usb_cmd.lua lualibs/mf_default_keys.lua # need to assign dependancies to build these first... -all: lua_build jansson_build mbedtls_build cbor_build $(BINS) +all: lua_build jansson_build mbedtls_build cbor_build $(BINS) all-static: LDLIBS:=-static $(LDLIBS) all-static: proxmark3 flasher fpga_compress @@ -279,7 +279,7 @@ all-static: proxmark3 flasher fpga_compress proxmark3: LDLIBS+=$(LUALIB) $(JANSSONLIB) $(MBEDTLSLIB) $(CBORLIB) $(QTLDLIBS) proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) lualibs/usb_cmd.lua lualibs/mf_default_keys.lua $(LD) $(LDFLAGS) $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(OBJCOBJS) $(QTGUIOBJS) $(MULTIARCHOBJS) $(ZLIBOBJS) $(LDLIBS) -o $@ - + flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS) $(OBJCOBJS) $(LD) $(LDFLAGS) $^ $(LDLIBS) -o $@ @@ -299,7 +299,7 @@ lualibs/usb_cmd.lua: ../include/usb_cmd.h lualibs/mf_default_keys.lua : default_keys.dic awk -f default_keys_dic2lua.awk $^ > $@ - + clean: $(RM) $(CLEAN) cd ../liblua && $(MAKE) clean @@ -313,7 +313,7 @@ tarbin: $(BINS) lua_build: @echo Compiling liblua, using platform $(LUAPLATFORM) cd ../liblua && $(MAKE) $(LUAPLATFORM) - + jansson_build: @echo Compiling jansson cd $(JANSSONLIBPATH) && $(MAKE) all @@ -321,15 +321,15 @@ jansson_build: mbedtls_build: @echo Compiling mbedtls cd $(MBEDTLSLIBPATH) && $(MAKE) all - + cbor_build: @echo Compiling tinycbor cd $(CBORLIBPATH) && $(MAKE) all - + .PHONY: all clean # easy printing of MAKE VARIABLES -print-%: ; @echo $* = $($*) +print-%: ; @echo $* = $($*) $(OBJDIR)/%_NOSIMD.o : %.c $(OBJDIR)/%.d $(CC) $(DEPFLAGS) $(CFLAGS) $(HARD_SWITCH_NOSIMD) -c -o $@ $< @@ -363,7 +363,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d $(OBJDIR)/%.o : %.m $(OBJDIR)/%.d $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< $(POSTCOMPILE) - + #$(CMDOBJS) $(COREOBJS): $(notdir $(%.c)) %.d # $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< # $(POSTCOMPILE) diff --git a/client/jansson/Makefile b/client/jansson/Makefile index 596c1778c..226e87cc3 100644 --- a/client/jansson/Makefile +++ b/client/jansson/Makefile @@ -26,11 +26,11 @@ libjansson_la_LDFLAGS = \ -export-symbols-regex '^json_' \ -version-info 15:0:11 - + CFILES = $(filter %.c, $(libjansson_la_SOURCES)) CMDOBJS = $(CFILES:%.c=%.o) CLEAN = $(CMDOBJS) - + CC= gcc CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function -Wno-format-truncation LDFLAGS= $(SYSLDFLAGS) $(libjansson_la_LDFLAGS) @@ -52,13 +52,13 @@ MYOBJS= all: $(CMDOBJS) $(AR) $(LIB_A) $(CMDOBJS) $(RANLIB) $(LIB_A) - + clean: $(RM) $(CLEAN) $(RM) $(LIB_A) - + %.o: %.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS) - + .PHONY: all clean diff --git a/client/tinycbor/Makefile b/client/tinycbor/Makefile index 78ef64dc0..511f57f7a 100644 --- a/client/tinycbor/Makefile +++ b/client/tinycbor/Makefile @@ -9,11 +9,11 @@ tinycbor_SOURCES = \ cborpretty.c \ cbortojson.c \ cborvalidation.c \ - + CFILES = $(filter %.c, $(tinycbor_SOURCES)) CMDOBJS = $(CFILES:%.c=%.o) CLEAN = $(CMDOBJS) - + CC= gcc CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function LIBS= $(SYSLIBS) $(MYLIBS) @@ -34,13 +34,13 @@ MYOBJS= all: $(CMDOBJS) $(AR) $(LIB_A) $(CMDOBJS) $(RANLIB) $(LIB_A) - + clean: $(RM) $(CLEAN) $(RM) $(LIB_A) - + %.o: %.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS) - + .PHONY: all clean diff --git a/common/mbedtls/Makefile b/common/mbedtls/Makefile index 2a6bca6f4..d57809c56 100644 --- a/common/mbedtls/Makefile +++ b/common/mbedtls/Makefile @@ -49,11 +49,11 @@ mbedtls_LDFLAGS = \ -export-symbols-regex '^mbedtls_' \ -version-info 15:0:11 - + CFILES = $(filter %.c, $(mbedtls_SOURCES)) CMDOBJS = $(CFILES:%.c=%.o) CLEAN = $(CMDOBJS) - + CC= gcc CFLAGS= -O2 -Wall -Wno-unused-variable -Wno-unused-function LDFLAGS= $(SYSLDFLAGS) $(mbedtls_LDFLAGS) @@ -75,13 +75,13 @@ MYOBJS= all: $(CMDOBJS) $(AR) $(LIB_A) $(CMDOBJS) $(RANLIB) $(LIB_A) - + clean: $(RM) $(CLEAN) $(RM) $(LIB_A) - + %.o: %.c $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(CFLAGS) -c -o $@ $< $(LIBS) - + .PHONY: all clean diff --git a/fpga/Makefile b/fpga/Makefile index 578518f7f..324b48c7b 100644 --- a/fpga/Makefile +++ b/fpga/Makefile @@ -34,6 +34,6 @@ fpga_lf.ngc: fpga_lf.v fpga.ucf xst_lf.scr util.v clk_divider.v lo_edge_detect.v help: @echo Multi-OS Makefile, you are running on $(DETECTED_OS) @echo Possible targets: - @echo + all - Make fpga.bit, the FPGA bitstream + @echo + all - Make fpga.bit, the FPGA bitstream @echo + clean - Clean intermediate files, does not clean fpga.bit - + diff --git a/fpga/tests/Makefile b/fpga/tests/Makefile index 755604633..79ed20816 100644 --- a/fpga/tests/Makefile +++ b/fpga/tests/Makefile @@ -64,7 +64,7 @@ tb_lf_edge_detect: tb_lf_edge_detect.vvp | test_dir test_dir: @if [ ! -d $(TEST_OUTDIR) ] ; then mkdir $(TEST_OUTDIR) ; fi -.PHONY: all clean +.PHONY: all clean # $(1) = basename # $(2) = extension to check diff --git a/recovery/Makefile b/recovery/Makefile index bb8e3a763..7806d14b4 100644 --- a/recovery/Makefile +++ b/recovery/Makefile @@ -13,6 +13,6 @@ fullimage.bin: ../armsrc/obj/fullimage.elf proxmark3_recovery.bin: bootrom.bin fullimage.bin cat bootrom.bin fullimage.bin > $@ -clean: +clean: rm -f $(BINS) diff --git a/tools/Makefile b/tools/Makefile index b72503158..51a76677b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -8,12 +8,12 @@ get_crapto1: get_nonce_bf: # git clone https://github.com/J-Run/mf_key_brute.git mf_key_brute - git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute - + git clone https://github.com/iceman1001/mf_nonce_brute mf_nonce_brute + get_xorsearch: - mkdir xorsearch + mkdir xorsearch wget -N https://didierstevens.com/files/software/XORSearch_V1_11_2.zip -# Mingw +# Mingw # unzzip-big XORSearch_V1_11_2.zip # linux # gunzip XORSearch_V1_11_2.zip \ No newline at end of file diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile index 98f52d696..61e55ef2d 100755 --- a/tools/mfkey/Makefile +++ b/tools/mfkey/Makefile @@ -7,7 +7,7 @@ OBJS = crapto1.o crypto1.o HEADERS = crapto1.h EXES = mfkey64 mfkey32 mfkey32v2 WINEXE = $(patsubst %, %.exe, $(EXES)) - + all: $(OBJS) $(EXES) %.o : %.c @@ -16,6 +16,6 @@ all: $(OBJS) $(EXES) % : %.c $(LD) $(CFLAGS) -o $@ $(OBJS) $< -clean: +clean: rm -f $(OBJS) $(EXES) $(WINEXE) diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile index 1119ab766..99f9a3598 100644 --- a/tools/nonce2key/Makefile +++ b/tools/nonce2key/Makefile @@ -16,5 +16,5 @@ all: $(OBJS) $(EXES) % : %.c $(LD) $(LDFLAGS) -o $@ $(OBJS) $< -clean: +clean: rm -f $(OBJS) $(EXES) $(WINEXES)