Merge branch 'build-cleanups' into next

* build-cleanups:
  Allow parallelizing bdlib/libelf builds
  Remove bogus -I
  Let src/ cleanup stringfix

Conflicts:
	lib/Makefile.in
	src/Makefile.in

Makefile.in

@@ -74,12 +74,10 @@ MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
 
 all: dynamic
 
-include $(top_srcdir)/build/build.mk
-
 test:
 
 cleanutils:
-	@rm -f $(STRINGFIX) src/sorthelp@EXEEXT@
+	@rm -f src/sorthelp@EXEEXT@
 
 clean:  cleanutils
 	+@cd src && $(MAKE) clean

build/build.mk

@@ -1,10 +1,10 @@
 depcomp = /bin/sh $(top_srcdir)/build/autotools/depcomp
 
-STRINGFIX= $(top_srcdir)/src/stringfix
+STRINGFIX= $(srcdir)/stringfix
 
 $(STRINGFIX): $(STRINGFIX).cc
 	@echo -e "[CC]	\033[1m$@\033[0m"
-	$(CXX) $(CPPFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CXXFLAGS) $< $(LDFLAGS) -o $(STRINGFIX)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< $(LDFLAGS) -o $(STRINGFIX)
 
 # Cannot use .SUFFIXES as it won't allow a dependency on $(STRINGFIX)
 

lib/Makefile.in

@@ -8,7 +8,7 @@ VPATH = @srcdir@
 
 #include $(top_srcdir)/build/build.mk
 
-.PHONY: default clean distclean normal debug general buildcheck notice notice_debug build units libelf libelf_notice
+.PHONY: default clean distclean normal debug general buildcheck notice notice_debug build units libelf libelf_notice bdlib
 
 default: normal
 
@@ -41,14 +41,13 @@ $(top_srcdir)/lib/libelf/lib/libelf.a: libelf_notice
 
 libelf: @LIBELF_BUNDLED@
 
-bdlib/libbdlib.a:
+$(top_srcdir)/lib/bdlib/libbdlib.a:
 	+@cd bdlib && $(MAKE)
 
-build: bdlib/libbdlib.a
-	+@$(MAKE) libelf
+bdlib: $(top_srcdir)/lib/bdlib/libbdlib.a
 
-build.debug: bdlib/libbdlib.a
-	+@$(MAKE) libelf
+build: $(top_srcdir)/lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
+build.debug: $(top_srcdir)/lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
 
 buildcheck: build
 

src/Makefile.in

@@ -112,7 +112,7 @@ help.h: $(HELPFILE) $(top_srcdir)/build/makehelp.sh $(STRINGFIX)
 
 sorthelp: sorthelp.cc ../lib/bdlib/libbdlib.a
 	@echo -e "Compiling: \033[1msorthelp\033[0m"
-	@$(CXX) $(CPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/pack $(CXXFLAGS) $< ../lib/bdlib/libbdlib.a $(LDFLAGS) -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< ../lib/bdlib/libbdlib.a $(LDFLAGS) -o $@
 	@$(STRIP) $@@EXEEXT@
 
 ../$(EGGEXEC): build_msg $(OBJS) ../lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
@@ -129,7 +129,8 @@ sorthelp: sorthelp.cc ../lib/bdlib/libbdlib.a
 $(EGGEXEC): ../$(EGGEXEC)
 
 clean:
-	@rm -f .depend *.o $(OBJS) *~ _*.c _*.cc *.ii *.i set_default.h responses.cc help.h
+	@rm -f .depend *.o $(OBJS) *~ _*.c _*.cc *.ii *.i set_default.h \
+	    responses.cc help.h $(STRINGFIX)
 
 build_msg:
 	@echo "[*] Compiling core components"