Преглед изворни кода

Fix always relinking wraith when dependencies not change.

This was due to 'build_msg' not being .PHONY, but it was all pointless anyway.
Bryan Drewery пре 11 година
родитељ
комит
e98a5801f6
2 измењених фајлова са 4 додато и 15 уклоњено
  1. 3 9
      Makefile.in
  2. 1 6
      src/Makefile.in

+ 3 - 9
Makefile.in

@@ -168,17 +168,13 @@ dynamic: checkclean.dynamic lib general
 	@echo ""
 	@echo "Making dynamic binary"
 	@echo ""
-	@echo ""
-	+@cd src && $(MAKE_DYNAMIC) $(BINEXEC)
-	@echo ""
+	+@cd src && $(MAKE_DYNAMIC) ../$(BINEXEC)
 
 static: checkclean.static lib general
 	@echo ""
 	@echo "Making static binary"
 	@echo ""
-	@echo ""
-	+@cd src && $(MAKE_STATIC) $(BINEXEC)
-	@echo ""
+	+@cd src && $(MAKE_STATIC) ../$(BINEXEC)
 
 dwraith: debug
 
@@ -189,9 +185,7 @@ debug: checkclean.debug lib.debug general
 	@echo ""
 	@echo "Making debug binary"
 	@echo ""
-	@echo ""
-	+@cd src && $(MAKE_DEBUG) $(BINEXEC)
-	@echo ""
+	+@cd src && $(MAKE_DEBUG) ../$(BINEXEC)
 
 #safety hash
 

+ 1 - 6
src/Makefile.in

@@ -115,20 +115,15 @@ sorthelp: sorthelp.cc ../lib/bdlib/src/libbdlib.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< ../lib/bdlib/src/libbdlib.a $(LDFLAGS) -o $@
 	@$(STRIP) $@@EXEEXT@
 
-../$(EGGEXEC): build_msg $(OBJS) ../lib/bdlib/src/libbdlib.a @LIBELF_BUNDLED@
+../$(EGGEXEC): $(OBJS) ../lib/bdlib/src/libbdlib.a @LIBELF_BUNDLED@
 	@echo -e "[LD ]	\033[1m$@\033[0m"
 	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) ../lib/bdlib/src/libbdlib.a $(LIBS) @LIBELF_LIB@
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
 
-$(EGGEXEC): ../$(EGGEXEC)
-
 clean:
 	@rm -f .depend *.o $(OBJS) *~ _*.c _*.cc *.ii *.i set_default.h \
 	    responses.cc help.h $(STRINGFIX)
 
-build_msg:
-	@echo "[*] Compiling core components"
-
 include ./.deps/includes