From a0803a456450789996dad087c408e3e538e3bf5a Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Tue, 4 Nov 2014 01:17:28 +0100
Subject: [PATCH] Added partial support for building with OBJDIR

---
 Makefile     | 18 +++++++++++++++---
 src/Makefile | 31 ++++++++++++++++---------------
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 5cafbab..309c4dc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ VERSION	= 0.0.0
 SUBDIRS	= src
 RM	= rm -f
 LN	= ln -f
-TAR	= tar -czvf
+TAR	= tar
+MKDIR	= mkdir -m 0755 -p
 
 
 all: subdirs
@@ -20,7 +21,7 @@ distclean:
 dist:
 	$(RM) -r -- $(PACKAGE)-$(VERSION)
 	$(LN) -s -- . $(PACKAGE)-$(VERSION)
-	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
+	@$(TAR) -czvf $(PACKAGE)-$(VERSION).tar.gz -- \
 		$(PACKAGE)-$(VERSION)/src/platform/freebsd.c \
 		$(PACKAGE)-$(VERSION)/src/platform/linux.c \
 		$(PACKAGE)-$(VERSION)/src/platform/netbsd.c \
@@ -39,10 +40,21 @@ dist:
 		$(PACKAGE)-$(VERSION)/project.conf
 	$(RM) -- $(PACKAGE)-$(VERSION)
 
+distcheck: dist
+	$(TAR) -xzvf $(PACKAGE)-$(VERSION).tar.gz
+	$(MKDIR) -- $(PACKAGE)-$(VERSION)/objdir
+	$(MKDIR) -- $(PACKAGE)-$(VERSION)/destdir
+	(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/")
+	(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" install)
+	(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" DESTDIR="$$PWD/destdir" uninstall)
+	(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) OBJDIR="$$PWD/objdir/" distclean)
+	(cd "$(PACKAGE)-$(VERSION)" && $(MAKE) dist)
+	$(RM) -r -- $(PACKAGE)-$(VERSION)
+
 install:
 	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
 
 uninstall:
 	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
 
-.PHONY: all subdirs clean distclean dist install uninstall
+.PHONY: all subdirs clean distclean dist distcheck install uninstall
diff --git a/src/Makefile b/src/Makefile
index 9294851..3d0b74c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,5 @@
-TARGETS	= strace
+TARGETS	= $(OBJDIR)strace
+OBJDIR	=
 PREFIX	= /usr/local
 DESTDIR	=
 BINDIR	= $(PREFIX)/bin
@@ -16,27 +17,27 @@ INSTALL	= install
 
 all: $(TARGETS)
 
-strace_OBJS = platform/freebsd.o platform/linux.o platform/netbsd.o strace.o main.o
+strace_OBJS = $(OBJDIR)platform/freebsd.o $(OBJDIR)platform/linux.o $(OBJDIR)platform/netbsd.o $(OBJDIR)strace.o $(OBJDIR)main.o
 strace_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
 strace_LDFLAGS = $(LDFLAGSF) $(LDFLAGS)
 
-strace: $(strace_OBJS)
-	$(CC) -o strace $(strace_OBJS) $(strace_LDFLAGS)
+$(OBJDIR)strace: $(strace_OBJS)
+	$(CC) -o $(OBJDIR)strace $(strace_OBJS) $(strace_LDFLAGS)
 
-platform/freebsd.o: platform/freebsd.c platform/freebsd.h platform.h
-	$(CC) $(strace_CFLAGS) -o platform/freebsd.o -c platform/freebsd.c
+$(OBJDIR)platform/freebsd.o: platform/freebsd.c platform/freebsd.h platform.h
+	$(CC) $(strace_CFLAGS) -o $(OBJDIR)platform/freebsd.o -c platform/freebsd.c
 
-platform/linux.o: platform/linux.c platform/linux.h platform.h
-	$(CC) $(strace_CFLAGS) -o platform/linux.o -c platform/linux.c
+$(OBJDIR)platform/linux.o: platform/linux.c platform/linux.h platform.h
+	$(CC) $(strace_CFLAGS) -o $(OBJDIR)platform/linux.o -c platform/linux.c
 
-platform/netbsd.o: platform/netbsd.c platform/netbsd.h platform.h
-	$(CC) $(strace_CFLAGS) -o platform/netbsd.o -c platform/netbsd.c
+$(OBJDIR)platform/netbsd.o: platform/netbsd.c platform/netbsd.h platform.h
+	$(CC) $(strace_CFLAGS) -o $(OBJDIR)platform/netbsd.o -c platform/netbsd.c
 
-strace.o: strace.c platform.h strace.h ../config.h
-	$(CC) $(strace_CFLAGS) -c strace.c
+$(OBJDIR)strace.o: strace.c platform.h strace.h ../config.h
+	$(CC) $(strace_CFLAGS) -o $(OBJDIR)strace.o -c strace.c
 
-main.o: main.c strace.h ../config.h
-	$(CC) $(strace_CFLAGS) -c main.c
+$(OBJDIR)main.o: main.c strace.h ../config.h
+	$(CC) $(strace_CFLAGS) -o $(OBJDIR)main.o -c main.c
 
 clean:
 	$(RM) -- $(strace_OBJS)
@@ -46,7 +47,7 @@ distclean: clean
 
 install: $(TARGETS)
 	$(MKDIR) $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 0755 strace $(DESTDIR)$(BINDIR)/strace
+	$(INSTALL) -m 0755 $(OBJDIR)strace $(DESTDIR)$(BINDIR)/strace
 
 uninstall:
 	$(RM) -- $(DESTDIR)$(BINDIR)/strace