Manual Makefiles: Bug fixes, configuration

gdslang · Jul 24, 2014 · 0166767 · 0166767
1 parent b4387af
commit 0166767
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 5 deletions.
diff --git a/Makefile_avr b/Makefile_avr
@@ -5,7 +5,7 @@ MLTONFLAGS=
 CFLAGS=-g3 -fPIC -Wall -Iinclude
 LFLAGS=-shared
 
-export GDSL_AVR := 1
+include avr.mk
 
 #GDSL=gdsl
 GDSL_MEX=_manual

diff --git a/Makefile_manual b/Makefile_manual
@@ -1,5 +1,4 @@
-export GDSL:=gdsl
-export MANAGED:=1
+include config.mk
 
 archs:=x86 avr mips
 

diff --git a/Makefile_x86 b/Makefile_x86
@@ -5,7 +5,7 @@ MLTONFLAGS=
 CFLAGS=-g3 -fPIC -Wall -Iinclude
 LFLAGS=-shared
 
-export GDSL_X86 := 1
+include x86.mk
 
 #GDSL=gdsl
 GDSL_MEX=_manual

diff --git a/avr.mk b/avr.mk
@@ -0,0 +1 @@
+export GDSL_AVR=1
diff --git a/config.mk b/config.mk
@@ -0,0 +1 @@
+export GDSL=gdsl
diff --git a/libs/jgdsl/Makefile b/libs/jgdsl/Makefile
@@ -4,7 +4,7 @@ CC=gcc
 LIBDS=-L$(MLTK)/lib
 LIBS=-lgdsl-multiplex
 LIBFLAGS=$(LIBDS) $(LIBS)
-INCDS=-Iinclude -I$(MLTK)/include -I/usr/lib/jvm/java-7-openjdk-amd64/include
+INCDS=-Iinclude -I$(MLTK)/include
 
 DEFINES=-DRELAXEDFATAL
 ifdef GDSL_X86

diff --git a/tools/Makefile b/tools/Makefile
@@ -11,6 +11,8 @@ LIBDS=-L../lib
 #GDSL_X86:=1
 #endif
 
+#$(info $(MANAGED))
+
 DEFINES=-DRELAXEDFATAL
 ifdef GDSL_X86
 DEFINES+=-DGDSL_X86

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