From 066a1fa86407c80c3b7ef2c3e8c86f1ffbd2929d Mon Sep 17 00:00:00 2001
From: comex
Date: Mon, 19 Jan 2015 19:08:48 -0500
Subject: some reorganization

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 37ec88a..4004dfd 100644
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,10 @@ $(eval $(call do_prefix,arm,-n _arm,ARM))
 $(eval $(call do_prefix,arm64,,AArch64))
 
 out/%.o: lib/%.c Makefile $(HEADERS)
+	@mkdir -p $(dir $@)
 	$(CC) -fvisibility=hidden -std=c11 -c -o $@ $<
 out/%.o: lib/%.S Makefile $(HEADERS)
+	@mkdir -p $(dir $@)
 	$(CC) -fvisibility=hidden -c -o $@ $<
 out/jump-dis.o: $(GENERATED)
 out/transform-dis.o: $(GENERATED)
@@ -41,6 +43,7 @@ LIB_OBJS := \
 	out/substrate-compat.o \
 	out/jump-dis.o \
 	out/transform-dis.o
+
 out/libsubstitute.dylib: $(LIB_OBJS)
 	$(CC) -o $@ $(LIB_OBJS) $(LIB_LDFLAGS)
 
@@ -49,10 +52,10 @@ out/test-$(1): test/test-$(2).[cm]* $(HEADERS) $(GENERATED) Makefile out/libsubs
 	$(3) -g -o $$@ $$< -Ilib -Isubstrate -Lout -lsubstitute
 all: out/test-$(1)
 endef
-$(eval $(call define_test,tdarm-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-arm.inc.h"' -Dxdis=dis_arm -DFORCE_TARGET_arm))
-$(eval $(call define_test,tdthumb-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-thumb.inc.h"' -Dxdis=dis_thumb -DFORCE_TARGET_arm))
-$(eval $(call define_test,tdthumb2-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-thumb2.inc.h"' -Dxdis=dis_thumb2 -DFORCE_TARGET_arm))
-$(eval $(call define_test,tdarm64-simple,td-simple,$(CC) -std=c11 -DHDR='"dis-arm64.inc.h"' -Dxdis=dis -DFORCE_TARGET_arm64))
+$(eval $(call define_test,tdarm-simple,td-simple,$(CC) -std=c11 -DHDR='"arm/dis-arm.inc.h"' -Dxdis=dis_arm -DFORCE_TARGET_arm))
+$(eval $(call define_test,tdthumb-simple,td-simple,$(CC) -std=c11 -DHDR='"arm/dis-thumb.inc.h"' -Dxdis=dis_thumb -DFORCE_TARGET_arm))
+$(eval $(call define_test,tdthumb2-simple,td-simple,$(CC) -std=c11 -DHDR='"arm/dis-thumb2.inc.h"' -Dxdis=dis_thumb2 -DFORCE_TARGET_arm))
+$(eval $(call define_test,tdarm64-simple,td-simple,$(CC) -std=c11 -DHDR='"arm64/dis-arm64.inc.h"' -Dxdis=dis -DFORCE_TARGET_arm64))
 $(eval $(call define_test,dis-arm,dis,$(CC) -std=c11 -DFORCE_TARGET_arm))
 $(eval $(call define_test,dis-arm64,dis,$(CC) -std=c11 -DFORCE_TARGET_arm64))
 $(eval $(call define_test,jump-dis-arm,jump-dis,$(CC) -std=c11 -DFORCE_TARGET_arm -O0))
-- 
cgit v1.2.3