Make parallel building work inside arch directory.

diff --git a/.gitignore b/.gitignore
index 7d5ee718a8c8170f646eacf5924dd9cb1aa68ae3..7845b2c5b5de74ce91bb02bc2dc418ae32a348a6 100644 (file)
--- 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 927bc8db1c108d3a46dfb20e2ecd1a93a31f7270..4a8dcc83e2ed3f7a85f8ed859c573f04e140106c 100644 (file)
--- 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