Improve output for make -s and fix magic install with symlinks issue (#18781)

This commit is contained in:
pancake 2021-05-30 23:46:58 +02:00 committed by GitHub
parent dac25ce8de
commit bcb8333e6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 9 deletions

View File

@ -47,6 +47,7 @@ endif
endif
all: plugins.cfg libr/include/r_version.h
libr/count.sh reset
${MAKE} -C shlr sdbs
${MAKE} -C shlr/zip
${MAKE} -C libr/util

View File

@ -39,9 +39,11 @@ endif
.c.o:
ifneq ($(SILENT),)
@echo "CC $(shell basename $<)"
endif
@echo "[$(shell $(LIBR)/count.sh)] CC $<"
@$(CC) -c $(CFLAGS) -o $@ $<
else
$(CC) -c $(CFLAGS) -o $@ $<
endif
-include $(TOP)/config-user.mk
-include $(TOP)/mk/platform.mk

10
libr/count.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
if [ -n "$1" ]; then
echo 0 > /tmp/.cc.txt
N=0
else
N=`cat /tmp/.cc.txt 2> /dev/null`
fi
N=$(($N+1))
basename `pwd`
echo $N | tee /tmp/.cc.txt

View File

@ -3,19 +3,21 @@ include $(LTOP)/config.mk
NAME=r_magic
R2DEPS=r_util
PCLIBS=@LIBMAGIC@
CFLAGS+=-I.
OBJS=apprentice.o ascmagic.o fsmagic.o funcs.o is_tar.o magic.o softmagic.o
PCLIBS=@LIBMAGIC@
alle: all
include deps.mk
include $(LTOP)/rules.mk
include ../rules.mk
libfile.a:
${CC} -c ${CFLAGS} ${SRC}
${AR} q libfile.a *.o
${RANLIB} libfile.a
BIN=file${EXT_EXE}
${BIN}:
${CC} -I../include ${CFLAGS} ${SRC} file.c -o ${BIN}

View File

@ -2,10 +2,11 @@ include ../../config.mk
MAGICDIR=${DESTDIR}${DATADIR}/radare2/${VERSION}/magic
all: $(F_SDB)
install: ${F_SDB}
-rm -rf "$(MAGICDIR)"
mkdir -p "$(MAGICDIR)"
cp -f default/* "${MAGICDIR}"
for a in default/* ; do readlink "$(MAGICDIR)"; if [ $$? != 0 ]; then cp -f $$a "${MAGICDIR}" ; fi ; done
CWD=$(shell pwd)
symstall install-symlink: ${F_SDB}

View File

@ -1,4 +1,3 @@
ifeq (${USE_LIB_MAGIC},1)
ifeq ($(USE_LIB_MAGIC),1)
LDFLAGS+=-lmagic
endif