Merge branch 'maint'

* maint:
  Fix always relinking wraith when dependencies not change.
  Add newline.

Conflicts:
	src/Makefile.in

Makefile.in

@@ -55,6 +55,7 @@ MAKE_DYNAMIC = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'CC=$(CC)' 'LD=$(LD_DYNAMIC)'
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
 'STRIP=$(STRIP)' 'CXXFLAGS=$(CXXFLAGS)' 'CFLGS=$(CFLGS) -DBIN_TYPE_DYNAMIC' \
 'LIBS=$(LIBS)' 'EGGEXEC=$(BINEXEC)' 'EGGBUILD=(wraith)'
+
 MAKE_DEBUG = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'CC=$(CC)' 'LD=$(LD_DEBUG) -g' 'INCLUDES=$(INCLUDES)' \
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \
 'STRIP=touch' 'CXXFLAGS=$(CXXFLAGS) $(DEBCXXFLAGS)' 'CFLGS=$(CFLGS) $(DEBCXXFLAGS) -DBIN_TYPE_DYNAMIC' \
@@ -167,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
 
@@ -188,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
 

src/Makefile.in

@@ -115,20 +115,15 @@ sorthelp: sorthelp.cc ../lib/bdlib/src/libbdlib.a
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< ../lib/bdlib/libbdlib.a $(LDFLAGS) -o $@
 	@$(STRIP) $@@EXEEXT@
 
-../$(EGGEXEC): build_msg $(OBJS) ../lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
+../$(EGGEXEC): $(OBJS) ../lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
 	@echo -e "[LD ]	\033[1m$@\033[0m"
 	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) ../lib/bdlib/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