aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcomex2015-01-11 19:40:07 -0500
committercomex2015-01-11 19:40:07 -0500
commit39df4ae689cc8e1608c2e78afe91b9917574c3a3 (patch)
tree6ba5d1aa84f73c2e464b33a4d6155b8afb3b21c3
parentRevert "C++ is just a giant pain in the ass" (diff)
downloadsubstitute-39df4ae689cc8e1608c2e78afe91b9917574c3a3.tar.gz
un-revert the makefile changes
-rw-r--r--Makefile30
1 files changed, 14 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index e4ea709..ec4d0ec 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CC := clang
CXX := clang++
CFLAGS := -O3 -Wall -Wextra -Werror -arch x86_64
override CC := $(CC) $(CFLAGS)
-override CXX := $(CXX) $(CFLAGS)
+override CXX := $(CXX) $(CFLAGS) -fno-exceptions -fno-asynchronous-unwind-tables
IMAON2 := /Users/comex/c/imaon2
GEN_JS := node $(IMAON2)/tables/gen.js
@@ -16,27 +16,25 @@ all: \
out/test-dis \
out/test-tdarm-simple
-out:
- mkdir out
+$(shell mkdir -p out)
-out/%.o: lib/%.c Makefile out
+HEADERS := lib/*.h generated/transform-dis-arm.inc.h
+out/%.o: lib/%.c Makefile $(HEADERS)
$(CC) -fvisibility=hidden -std=c11 -c -o $@ $<
LIB_OBJS := out/find-syms.o out/substrate-compat.o
-HEADERS := lib/*.h generated/*.h
-out/libsubstitute.dylib: $(LIB_OBJS) lib/*.h out
+out/libsubstitute.dylib: $(LIB_OBJS)
$(CC) -dynamiclib -fvisibility=hidden -o $@ $(LIB_OBJS)
-out/test-tdarm-simple: test/test-tdarm-simple.c $(HEADERS) Makefile
- $(CC) -std=c11 -o $@ $< -Ilib
-out/test-dis: test/test-dis.c $(HEADERS) Makefile
- $(CC) -std=c11 -o $@ $< -Ilib
-out/test-%: test/test-%.c Makefile $(HEADERS) out/libsubstitute.dylib
- $(CC) -std=c89 -o $@ $< -Ilib -Lout -lsubstitute
-out/test-%-cpp: test/test-%.c Makefile $(HEADERS) out/libsubstitute.dylib
- $(CXX) -x c++ -std=c++98 -o $@ $< -Ilib -Lout -lsubstitute
-out/test-%: test/test-%.cpp Makefile $(HEADERS) out/libsubstitute.dylib
- $(CXX) -std=c++11 -o $@ $< -Ilib -Isubstrate -Lout -lsubstitute
+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