gnuc -> gcc, more abstraction in makefiles and extTools

Former-commit-id: 01664df2ee

src/test/x11/0/makefile

@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -m test.Mod
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c

src/test/x11/mines/makefile

@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Linie.Mod Minesweeper.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c

src/test/x11/pacman/makefile

@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Grafik.Mod PacMan.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c

src/test/x11/tetris/makefile

@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Linie.Mod Ziffer.Mod Tetris.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c

src/test/x11/tron/makefile

@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) Tron.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c

src/test/x11/vier/makefile

@@ -8,7 +8,7 @@ VOC = $(SETPATH) /opt/voc/bin/voc
 all:
 	$(VOC) -s Ausgabe.Mod Vier.Mod -m
 	#$(VOC) -Cm test.Mod
-	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gnuc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
+	#gcc -o test  test.o -fPIC -g -I /opt/voc-1.0/src/lib/system/gcc/x86_64 -I /opt/voc-1.0/lib/voc/obj -lVishapOberon -L. -L/opt/voc-1.0/lib -lX11
 
 clean:
 	rm *.c

src/voc/darwin/clang/extTools.Mod

@@ -6,6 +6,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
 CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lVishapOberon -static -g
 CC = cc $(CCOPT) -c
 *)
+CONST compiler="clang";
 
 VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR;
 
@@ -33,7 +34,6 @@ cc : ARRAY 1023 OF CHAR;
 ccopt : ARRAY 1023 OF CHAR;
 cmd : ARRAY 1023 OF CHAR;
 ext : ARRAY 5 OF CHAR;
-
 cmd2 : ARRAY 1023 OF CHAR;
 BEGIN
 (*
@@ -80,7 +80,8 @@ END LinkMain;
 
 BEGIN
 
-incPath0 := "src/lib/system/darwin/clang";
+incPath0 := "src/lib/system/darwin/";
+Strings.Append (compiler, incPath0);
 incPath1 := "lib/voc/obj ";
 ccOpt := " -fPIC -g ";
 
@@ -98,7 +99,7 @@ Strings.Append(tmp1, ccOpt);
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
-ccString := "cc ";
-(*Strings.Append (ccOpt, ccString);*)
+ccString := compiler;
+Strings.Append (" ", ccString);
 
 END extTools.

src/voc/linux/clang/extTools.Mod

@@ -6,6 +6,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
 CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g
 CC = cc $(CCOPT) -c
 *)
+CONST compiler="clang";
 
 VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR;
 
@@ -62,7 +63,8 @@ END LinkMain;
 
 BEGIN
 
-incPath0 := "src/lib/system/linux/clang";
+incPath0 := "src/lib/system/linux/";
+Strings.Append (compiler, incPath0);
 incPath1 := "lib/voc/obj ";
 ccOpt := " -fPIC -g ";
 
@@ -80,7 +82,7 @@ Strings.Append(tmp1, ccOpt);
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
-ccString := "clang ";
-(*Strings.Append (ccOpt, ccString);*)
+ccString := compiler;
+Strings.Append (" ", ccString);
 
 END extTools.

src/voc/linux/gcc/extTools.Mod

@@ -6,6 +6,7 @@ CCOPT = -fPIC $(INCLUDEPATH) -g
 CLOBERONOPTS = -fPIC $(INCLUDEPATH) -L. -L/usr/lib -lOberon -static -g
 CC = cc $(CCOPT) -c
 *)
+CONST compiler="gcc";
 
 VAR incPath0, incPath1, ccOpt, ccString, CFLAGS, tmp0, tmp1 : ARRAY 1023 OF CHAR;
 
@@ -62,7 +63,8 @@ END LinkMain;
 
 BEGIN
 
-incPath0 := "src/lib/system/linux/gnuc";
+incPath0 := "src/lib/system/linux/";
+Strings.Append (compiler, incPath0);
 incPath1 := "lib/voc/obj ";
 ccOpt := " -fPIC -g ";
 
@@ -77,15 +79,10 @@ Strings.Append(version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath1, tmp1);
 Strings.Append(tmp1, ccOpt);
-(*
-Strings.Append ("-lVishapOberon -L. -L", ccOpt);
-Strings.Append (version.prefix, ccOpt);
-Strings.Append ("/lib ", ccOpt);
-*)
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
-ccString := "cc ";
-(*Strings.Append (ccOpt, ccString);*)
+ccString := compiler;
+Strings.Append (" ", ccString);
 
 END extTools.

src/voc07R/makefile

@@ -1,5 +1,5 @@
 
-SETPATH = MODULES=".:gnuc:gnuc/x86_64"
+SETPATH = MODULES=".:gcc:gcc/x86_64"
 
 VOC0 = $(SETPATH) /opt/voc/bin/voc