From 2d951567f2596ae823177fe1f0a84754c6ecbf61 Mon Sep 17 00:00:00 2001
From: Mika Lindqvist <postmaster@raasu.org>
Date: Thu, 30 Apr 2015 17:43:25 +0300
Subject: [PATCH] Make parallel building work inside arch directory.

---
 .gitignore  |  6 ++++++
 Makefile.in | 23 +++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d5ee718..7845b2c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,9 @@ CMakeCache.txt
 CMakeFiles
 Testing
 *.cmake
+
+configure.log
+
+/arch/arm/Makefile
+/arch/generic/Makefile
+/arch/x86/Makefile
diff --git a/Makefile.in b/Makefile.in
index 927bc8db..4a8dcc83 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -65,24 +65,27 @@ OBJS = $(OBJC)
 
 PIC_OBJS = $(PIC_OBJC)
 
-all: $(ARCHDIR) static shared
+all: static shared
 
-static: subdirs example$(EXE) minigzip$(EXE)
+static: example$(EXE) minigzip$(EXE)
 
-shared: subdirs examplesh$(EXE) minigzipsh$(EXE)
+shared: examplesh$(EXE) minigzipsh$(EXE)
 
-all64: subdirs example64$(EXE) minigzip64$(EXE)
+all64: example64$(EXE) minigzip64$(EXE)
 
 check: test
 
-.PHONY: subdirs $(ARCHDIR)
+$(ARCHDIR)/%.o: $(ARCHDIR)/%.c
+	$(MAKE) -C $(ARCHDIR) $(notdir $@)
 
-subdirs: $(ARCHDIR)
+$(ARCHDIR)/%.lo: $(ARCHDIR)/%.c
+	$(MAKE) -C $(ARCHDIR) $(notdir $@)
 
-$(ARCHDIR):
-	$(MAKE) -C $@
-	-mv $@/*.o .
-	-mv $@/*.lo .
+%.o : $(ARCHDIR)/%.o
+	-cp $< $@
+
+%.lo : $(ARCHDIR)/%.lo
+	-cp $< $@
 
 test: all teststatic testshared
 
-- 
2.47.2