Merge branch 'maint'

* maint:
  Use more proper top_builddir for objects

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

build/autotools/includes/libelf.m4

@@ -1,9 +1,9 @@
 AC_DEFUN([CHECK_LIBELF],
 [
-  LIBELF_DIR="\$(top_srcdir)/lib/libelf/lib"
-  LIBELF_LIB="${LIBELF_DIR}/libelf.a"
+  LIBELF_DIR="lib/libelf/lib"
+  LIBELF_LIB="\$(top_builddir)/${LIBELF_DIR}/libelf.a"
   LIBELF_BUNDLED="${LIBELF_LIB}"
-  LIBELF_INCLUDE="-I${LIBELF_DIR}"
+  LIBELF_INCLUDE="-I\$(top_srcdir)/${LIBELF_DIR}"
 
   AC_CHECK_HEADERS([gelf.h libelf.h], [
     AC_CHECK_TYPES([Elf_Note], [

configure

@@ -5303,10 +5303,10 @@ done
 
 
 
-  LIBELF_DIR="\$(top_srcdir)/lib/libelf/lib"
-  LIBELF_LIB="${LIBELF_DIR}/libelf.a"
+  LIBELF_DIR="lib/libelf/lib"
+  LIBELF_LIB="\$(top_builddir)/${LIBELF_DIR}/libelf.a"
   LIBELF_BUNDLED="${LIBELF_LIB}"
-  LIBELF_INCLUDE="-I${LIBELF_DIR}"
+  LIBELF_INCLUDE="-I\$(top_srcdir)/${LIBELF_DIR}"
 
   for ac_header in gelf.h libelf.h
 do :

lib/Makefile.in

@@ -1,6 +1,7 @@
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -36,18 +37,18 @@ general:
 libelf_notice:
 	@echo "[*] Building libelf"
 
-$(top_srcdir)/lib/libelf/lib/libelf.a: libelf_notice
+$(top_builddir)/lib/libelf/lib/libelf.a: libelf_notice
 	+@cd libelf/lib && $(MAKE) CFLAGS="-g -O2 -w" libelf.a
 
 libelf: @LIBELF_BUNDLED@
 
-$(top_srcdir)/lib/bdlib/libbdlib.a:
+$(top_builddir)/lib/bdlib/libbdlib.a:
 	+@cd bdlib && $(MAKE)
 
-bdlib: $(top_srcdir)/lib/bdlib/libbdlib.a
+bdlib: $(top_builddir)/lib/bdlib/libbdlib.a
 
-build: $(top_srcdir)/lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
-build.debug: $(top_srcdir)/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
 

src/Makefile.in

@@ -2,6 +2,7 @@
 
 SHELL = @SHELL@
 top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
@@ -110,14 +111,14 @@ help.h: $(HELPFILE) $(top_srcdir)/build/makehelp.sh $(STRINGFIX)
 	@echo -e "{GEN}	\033[1m$<\033[0m -> \033[1m$@\033[0m"
 	$(top_srcdir)/build/makehelp.sh < $(HELPFILE) | $(STRINGFIX) help > $@
 
-sorthelp: sorthelp.cc ../lib/bdlib/src/libbdlib.a
+sorthelp: sorthelp.cc $(top_builddir)/lib/bdlib/src/libbdlib.a
 	@echo -e "[CXX]	\033[1m$<\033[0m"
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< ../lib/bdlib/libbdlib.a $(LDFLAGS) -o $@
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $< $(top_builddir)/lib/bdlib/libbdlib.a $(LDFLAGS) -o $@
 	@$(STRIP) $@@EXEEXT@
 
-../$(EGGEXEC): $(OBJS) ../lib/bdlib/libbdlib.a @LIBELF_BUNDLED@
+../$(EGGEXEC): $(OBJS) $(top_builddir)/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@
+	$(LD) $(LDFLAGS) -o ../$(EGGEXEC) $(OBJS) $(top_builddir)/lib/bdlib/libbdlib.a $(LIBS) @LIBELF_LIB@
 	@$(STRIP) ../$(EGGEXEC)
 	@$(OBJCOPY) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"