Manual Makefiles: Bug fixes

gdslang · Jul 24, 2014 · 0bb1d06 · 0bb1d06
1 parent d64afcf
commit 0bb1d06
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 23 deletions.
diff --git a/avr.mk b/avr.mk
@@ -1 +1 @@
-export GDSL_AVR=1
+export GDSL_ARCH=avr
diff --git a/libs/Makefile b/libs/Makefile
@@ -1,14 +1,18 @@
 LIBS=gdutil gdsl-multiplex gdwrap readhex rreil jgdsl cppgdsl
 
-#ifndef MANAGED
-#GDSL_AVR:=1
-#GDSL_X86:=1
-#endif
+#eq = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
+#$(if $(call eq,$GDSL_ARCH,x86), \
+#LIBS+=x86 x86-tester x86-generator \
+#)
 
-ifdef GDSL_X86
-LIBS+=x86 x86-tester x86-generator 
+ifeq ($(GDSL_ARCH),x86)
+LIBS+=x86 x86-tester x86-generator
 endif
 
+#$(info $(call eq,x86,99))
+
+$(info $(LIBS))
+
 .PHONY all: $(LIBS)
 
 $(LIBS):

diff --git a/libs/gdwrap/Makefile b/libs/gdwrap/Makefile
@@ -5,8 +5,9 @@ INCDS=-Iinclude -I$(MLTK)/include
 
 
 DEFINES=-DRELAXEDFATAL
-ifdef GDSL_X86
-DEFINES+=-DGDSL_X86
+ifdef GDSL_ARCH
+UPPER_ARCH = $(shell echo $(GDSL_ARCH) | tr a-z A-Z)
+DEFINES+=-DGDSL_$(UPPER_ARCH)
 endif
 CFLAGS=-c -g3 -std=c11 -pedantic -Wall -Wfatal-errors $(DEFINES) $(INCDS)
 

diff --git a/libs/jgdsl/Makefile b/libs/jgdsl/Makefile
@@ -7,9 +7,6 @@ LIBFLAGS=$(LIBDS) $(LIBS)
 INCDS=-Iinclude -I$(MLTK)/include
 
 DEFINES=-DRELAXEDFATAL
-ifdef GDSL_X86
-DEFINES+=-DGDSL_X86
-endif
 
 CFLAGS=-std=c11 -g3 -fPIC -shared -pedantic -Wall -Wfatal-errors $(DEFINES) $(INCDS)
 

diff --git a/libs/rreil-sim/Makefile b/libs/rreil-sim/Makefile
@@ -4,9 +4,10 @@ CC=gcc
 INCDS=-Iinclude -I$(MLTK)/include
 
 DEFINES=-DRELAXEDFATAL
-#ifdef GDSL_X86
-DEFINES+=-DGDSL_X86
-#endif
+ifdef GDSL_ARCH
+UPPER_ARCH = $(shell echo $(GDSL_ARCH) | tr a-z A-Z)
+DEFINES+=-DGDSL_$(UPPER_ARCH)
+endif
 
 CFLAGS=-c -g3 -std=c11 -pedantic -Wall -Wfatal-errors $(DEFINES) $(INCDS)
 

diff --git a/libs/rreil/Makefile b/libs/rreil/Makefile
@@ -4,8 +4,9 @@ CC=gcc
 INCDS=-Iinclude -I$(MLTK)/include
 
 DEFINES=-DRELAXEDFATAL
-ifdef GDSL_X86
-DEFINES+=-DGDSL_X86
+ifdef GDSL_ARCH
+UPPER_ARCH = $(shell echo $(GDSL_ARCH) | tr a-z A-Z)
+DEFINES+=-DGDSL_$(UPPER_ARCH)
 endif
 
 CFLAGS=-c -g3 -std=c11 -pedantic -Wall -Wfatal-errors $(DEFINES) $(INCDS)

diff --git a/tools/Makefile b/tools/Makefile
@@ -14,12 +14,11 @@ LIBDS=-L../lib
 #$(info $(MANAGED))
 
 DEFINES=-DRELAXEDFATAL
-ifdef GDSL_X86
-DEFINES+=-DGDSL_X86
+ifdef GDSL_ARCH
+UPPER_ARCH = $(shell echo $(GDSL_ARCH) | tr a-z A-Z)
+DEFINES+=-DGDSL_$(UPPER_ARCH)
 endif
 
-ifdef GDSL_X86
-endif
 LIBS +=-lgdsl -lrt -lreadhex -lgdsl-multiplex -ldl -lgdutil -lelf
 LIBS_MULT +=-lrt -lreadhex -lgdsl-multiplex -ldl -lgdutil -lelf
 
@@ -94,7 +93,7 @@ liveness-sweep: liveness-sweep.o
 liveness-sweep.o: liveness-sweep.c
 	$(CC) $(CFLAGS) liveness-sweep.c -o $@
 
-ifdef GDSL_X86
+ifeq ($(GDSL_ARCH),x86)
 ### x86-test-runner
 x86-test-runner:
 	$(MAKE) -C $@

diff --git a/x86.mk b/x86.mk
@@ -1 +1 @@
-export GDSL_X86=1
+export GDSL_ARCH=x86