generate all the transform-dis-*; should be more precise; can't just use makedep because of parallel builds

2 files changed, 20 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index ec4d0ec..97af141 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,25 @@ all: \
 
 $(shell mkdir -p out)
 
-HEADERS := lib/*.h generated/transform-dis-arm.inc.h
+HEADERS := lib/*.h \
+	generated/transform-dis-arm.inc.h
+
+define do_prefix
+generated/transform-dis-$(1).inc.h: generated Makefile
+	$(GEN_JS) --gen-hook-disassembler $(2) --dis-pattern='P(XXX)' $(IMAON2)/out/out-$(3).json > $$@ || rm -f $$@
+all: generated/transform-dis-$(1).inc.h
+#generated/jump-dis-$(1).inc.h: generated Makefile
+#	$(GEN_JS) --gen-hook-jump-disassembler $(2) -p jump_dis_$(1)_ $(IMAON2)/out/out-$(3).json > $$@ || rm -f $$@
+#all: generated/jump-dis-$(1).inc.h
+HEADERS := $$(HEADERS) generated/transform-dis-$(1).inc.h
+endef
+
+$(eval $(call define_test,tdarm-simple,tdarm-simple,$(CC) -std=c11))
+$(eval $(call define_test,dis,dis,$(CC) -std=c11))
+$(eval $(call define_test,find-syms,find-syms,$(CC) -std=c89))
+$(eval $(call define_test,find-syms-cpp,find-syms,$(CXX) -x c++ -std=c++98))
+$(eval $(call define_test,substrate,substrate,$(CXX) -std=c++98))
+
 out/%.o: lib/%.c Makefile $(HEADERS)
 	$(CC) -fvisibility=hidden -std=c11 -c -o $@ $<
 
@@ -30,24 +48,11 @@ define define_test
 out/test-$(1): test/test-$(2).c* $(HEADERS) Makefile out/libsubstitute.dylib
 	$(3) -o $$@ $$< -Ilib -Isubstrate -Lout -lsubstitute
 endef
-$(eval $(call define_test,tdarm-simple,tdarm-simple,$(CC) -std=c11))
-$(eval $(call define_test,dis,dis,$(CC) -std=c11))
-$(eval $(call define_test,find-syms,find-syms,$(CC) -std=c89))
-$(eval $(call define_test,find-syms-cpp,find-syms,$(CXX) -x c++ -std=c++98))
-$(eval $(call define_test,substrate,substrate,$(CXX) -std=c++98))
 
 generated: Makefile
 	rm -rf generated
 	mkdir generated
 
-define do_prefix
-generated/transform-dis-$(1).inc.h: generated Makefile
-	$(GEN_JS) --gen-hook-disassembler $(2) --dis-pattern='P(XXX)' $(IMAON2)/out/out-$(3).json > $$@ || rm -f $$@
-all: generated/transform-dis-$(1).inc.h
-#generated/jump-dis-$(1).inc.h: generated Makefile
-#	$(GEN_JS) --gen-hook-jump-disassembler $(2) -p jump_dis_$(1)_ $(IMAON2)/out/out-$(3).json > $$@ || rm -f $$@
-#all: generated/jump-dis-$(1).inc.h
-endef
 $(eval $(call do_prefix,thumb2,-n _thumb2,ARM))
 $(eval $(call do_prefix,thumb,-n _thumb,ARM))
 $(eval $(call do_prefix,arm,-n _arm,ARM))
diff --git a/lib/dis.h b/lib/dis.h
index 037ffd2..386470a 100644
--- a/lib/dis.h
+++ b/lib/dis.h
@@ -1,4 +1,4 @@
-#pragma once
+
 #include <stdbool.h>
 
 #define UNUSED __attribute__((unused))