Merge branch 'maint'

* maint:
  libelf: Fix trying to 'clean' on BSD where it is not used.
  BSDMakefile: Fix -j support with 'make'

BSDmakefile

@@ -1,18 +1,21 @@
-.PHONY: default check_gmake debug static dynamic clean distclean test
+#.PHONY: default check_gmake debug static dynamic clean distclean test
 
-default: check_gmake
-	@gmake
-check_gmake:
+MAKE=env -u MAKELEVEL gmake ${MFLAGS}
+
+TARGETS=	\
+		all \
+		debug \
+		static \
+		dynamic \
+		clean \
+		distclean \
+		test \
+		check
+
+.for target in ${TARGETS}
+${target}: check_gmake .PHONY .SILENT
+	@${MAKE} ${.TARGET}
+.endfor
+
+check_gmake: .PHONY .SILENT
 	@which gmake > /dev/null 2>&1 || (echo "Please install gmake" && exit 0)
-debug: check_gmake
-	@gmake debug
-static: check_gmake
-	@gmake static
-dynamic: check_gmake
-	@gmake dynamic
-clean: check_gmake
-	@gmake clean
-distclean: check_gmake
-	@gmake distclean
-test: check_gmake
-	@gmake test

lib/Makefile.in

@@ -4,6 +4,7 @@ top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 srcdir = @srcdir@
 VPATH = @srcdir@
+LIBELF_BUNDLED = @LIBELF_BUNDLED@
 
 @SET_MAKE@
 
@@ -15,12 +16,14 @@ default: normal
 
 clean:
 	-+@cd bdlib && $(MAKE) clean
-	-+@test -f libelf/Makefile && cd libelf && $(MAKE) clean
+	-+@[ -n "${LIBELF_BUNDLED}" ] && [ -f libelf/Makefile && \
+	    cd libelf && $(MAKE) clean
 	@rm -f *.a
 
 distclean: clean
 	-+@cd bdlib && $(MAKE) distclean
-	-+@test -f libelf/Makefile && cd libelf && $(MAKE) distclean
+	-+@[ -n "${LIBELF_BUNDLED}" ] && [ -f libelf/Makefile ] && \
+	    cd libelf && $(MAKE) distclean
 
 notice:
 	@echo "[*] Making libraries"
@@ -40,15 +43,15 @@ libelf_notice:
 $(top_builddir)/lib/libelf/lib/libelf.a: libelf_notice
 	+@cd libelf/lib && $(MAKE) CFLAGS="-g -O2 -w" libelf.a
 
-libelf: @LIBELF_BUNDLED@
+libelf: $(LIBELF_BUNDLED)
 
 $(top_builddir)/lib/bdlib/libbdlib.a:
 	+@cd bdlib && $(MAKE)
 
 bdlib: $(top_builddir)/lib/bdlib/libbdlib.a
 
-build: $(top_builddir)/lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
-build.debug: $(top_builddir)/lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
+build: $(top_builddir)/lib/bdlib/libbdlib.a $(LIBELF_BUNDLED)
+build.debug: $(top_builddir)/lib/bdlib/libbdlib.a $(LIBELF_BUNDLED)
 
 buildcheck: build