Moving things around

1 files changed, 8 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 5c1c8959..3d9aeba3 100644
--- a/Makefile
+++ b/Makefile
@@ -140,21 +140,22 @@ $(BUILD_DIR)/bin/$(EXE_FILE): $(STDLIB_OBJS) $(COMPILER_OBJS) | $(BUILD_DIR)/bin
 	@$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 $(BUILD_DIR)/lib/$(AR_FILE): $(STDLIB_OBJS) build/gc/lib/libgc.a build/unistring/lib/libunistring.a build/gmp/lib/libgmp.a | $(BUILD_DIR)/lib
-	mkdir -p tmp; \
-	cd tmp; \
+	mkdir -p build/archive-files; \
+	cd build/archive-files; \
+	rm -rf *; \
 	for f in $(STDLIB_OBJS); do \
-		cp ../$$f tomo_$$(basename $$f); \
+		cp ../../$$f tomo_$$(basename $$f); \
 	done; \
 	mkdir -p gc; \
-	(cd gc && ar -x ../../build/gc/lib/libgc.a); \
+	(cd gc && ar -x ../../gc/lib/libgc.a); \
 	for f in gc/*.o; do mv "$$f" gc_"$$(basename $$f)"; done; \
 	rmdir gc; \
 	mkdir -p gmp; \
-	(cd gmp && ar -x ../../build/gmp/lib/libgmp.a); \
+	(cd gmp && ar -x ../../gmp/lib/libgmp.a); \
 	for f in gmp/*.o; do mv "$$f" gmp_"$$(basename $$f)"; done; \
 	rmdir gmp; \
-	ar -x ../build/unistring/lib/libunistring.a; \
-	ar -rcs ../$@ *.o
+	ar -x ../unistring/lib/libunistring.a; \
+	ar -rcs ../../$@ *.o
 
 $(BUILD_DIR)/lib/tomo@$(TOMO_VERSION)/modules.ini: modules/core.ini modules/examples.ini | $(BUILD_DIR)/lib/tomo@$(TOMO_VERSION)
 	@cat $^ > $@