Bläddra i källkod

Rework compiler output

Bryan Drewery 11 år sedan
förälder
incheckning
ea72a16675
2 ändrade filer med 9 tillägg och 12 borttagningar
  1. 4 4
      build/build.mk
  2. 5 8
      src/Makefile.in

+ 4 - 4
build/build.mk

@@ -9,7 +9,7 @@ $(STRINGFIX): $(STRINGFIX).cc
 # Cannot use .SUFFIXES as it won't allow a dependency on $(STRINGFIX)
 # Cannot use .SUFFIXES as it won't allow a dependency on $(STRINGFIX)
 
 
 %.So: %.cc $(STRINGFIX)
 %.So: %.cc $(STRINGFIX)
-	@echo -e "{CC}	\033[1m$*\033[0m"
+	@echo -e "{CC}	\033[1m$<\033[0m"
 	file="$*"; \
 	file="$*"; \
 	dirname="$${file%/*}"; \
 	dirname="$${file%/*}"; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
@@ -33,7 +33,7 @@ $(STRINGFIX): $(STRINGFIX).cc
 	rm -f $*.ii
 	rm -f $*.ii
 
 
 %.So: %.c $(STRINGFIX)
 %.So: %.c $(STRINGFIX)
-	@echo -e "{C }	\033[1m$*\033[0m"
+	@echo -e "{C }	\033[1m$<\033[0m"
 	file="$*"; \
 	file="$*"; \
 	dirname="$${file%/*}"; \
 	dirname="$${file%/*}"; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
@@ -57,7 +57,7 @@ $(STRINGFIX): $(STRINGFIX).cc
 	rm -f $*.i
 	rm -f $*.i
 
 
 %.o: %.cc
 %.o: %.cc
-	@echo -e "[CC]	\033[1m$*\033[0m"
+	@echo -e "[CC]	\033[1m$<\033[0m"
 	file="$*"; \
 	file="$*"; \
 	dirname="$${file%/*}"; \
 	dirname="$${file%/*}"; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
@@ -77,7 +77,7 @@ $(STRINGFIX): $(STRINGFIX).cc
 	fi
 	fi
 
 
 %.o: %.c
 %.o: %.c
-	@echo -e "[C]	\033[1m$*\033[0m"
+	@echo -e "[C]	\033[1m$<\033[0m"
 	file="$*"; \
 	file="$*"; \
 	dirname="$${file%/*}"; \
 	dirname="$${file%/*}"; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \
 	if [ "$${dirname}" = "$${file}" ]; then dirname=.; fi; \

+ 5 - 8
src/Makefile.in

@@ -95,31 +95,28 @@ blah:
 set.cc: set_default.h
 set.cc: set_default.h
 
 
 set_default.h: $(SETTINGSFILE) $(top_srcdir)/build/makeset.sh
 set_default.h: $(SETTINGSFILE) $(top_srcdir)/build/makeset.sh
-	@echo -e "[H]	\033[1m$@\033[0m"
+	@echo -e "[GEN]	\033[1m$<\033[0m -> \033[1m$@\033[0m"
 	$(top_srcdir)/build/makeset.sh < $(SETTINGSFILE) > $@
 	$(top_srcdir)/build/makeset.sh < $(SETTINGSFILE) > $@
 
 
 response.cc: responses.cc
 response.cc: responses.cc
 
 
 responses.cc: $(RESPONSESFILE) $(top_srcdir)/build/makeres.sh
 responses.cc: $(RESPONSESFILE) $(top_srcdir)/build/makeres.sh
-	@echo -e "[CC]	\033[1m$@\033[0m"
+	@echo -e "[GEN]	\033[1m$<\033[0m -> \033[1m$@\033[0m"
 	$(top_srcdir)/build/makeres.sh < $(RESPONSESFILE) > $@
 	$(top_srcdir)/build/makeres.sh < $(RESPONSESFILE) > $@
 
 
 cmds.cc: help.h
 cmds.cc: help.h
 
 
 help.h: $(HELPFILE) $(top_srcdir)/build/makehelp.sh $(STRINGFIX)
 help.h: $(HELPFILE) $(top_srcdir)/build/makehelp.sh $(STRINGFIX)
-	@echo -e "{H}	\033[1m$@\033[0m"
+	@echo -e "{GEN}	\033[1m$<\033[0m -> \033[1m$@\033[0m"
 	$(top_srcdir)/build/makehelp.sh < $(HELPFILE) | $(STRINGFIX) > $@
 	$(top_srcdir)/build/makehelp.sh < $(HELPFILE) | $(STRINGFIX) > $@
 
 
 sorthelp: sorthelp.cc ../lib/bdlib/src/libbdlib.a
 sorthelp: sorthelp.cc ../lib/bdlib/src/libbdlib.a
-	@echo -e "Compiling: \033[1msorthelp\033[0m"
+	@echo -e "[CC]	\033[1m$<\033[0m"
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< ../lib/bdlib/src/libbdlib.a $(LDFLAGS) -o $@
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< ../lib/bdlib/src/libbdlib.a $(LDFLAGS) -o $@
 	@$(STRIP) $@@EXEEXT@
 	@$(STRIP) $@@EXEEXT@
 
 
 ../$(EGGEXEC): build_msg $(OBJS) ../lib/bdlib/src/libbdlib.a @LIBELF_BUNDLED@
 ../$(EGGEXEC): build_msg $(OBJS) ../lib/bdlib/src/libbdlib.a @LIBELF_BUNDLED@
-	@echo "[*] Linking"
-	@echo ""
-	@echo "Linking wraith... $(EGGBUILD)"
-	@echo ""
+	@echo -e "[LD]	\033[1m$@\033[0m"
 	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) ../lib/bdlib/src/libbdlib.a $(LIBS) @LIBELF_LIB@
 	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) ../lib/bdlib/src/libbdlib.a $(LIBS) @LIBELF_LIB@
 	@$(STRIP) ../$(EGGEXEC)
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)