[Openmcl-cvs-notifications] r13600 - in /trunk/source/lisp-kernel: darwinx8632/Makefile darwinx8664/Makefile

[gb at clozure.com]

Author: gb
Date: Sun Apr 11 04:26:27 2010
New Revision: 13600

Log:
Define PLATFORM_H, force its inclusion via -include.  (This needs to be
done on other platforms as well; so far, only darwinx86 has been tested
at all.)

Modified:
    trunk/source/lisp-kernel/darwinx8632/Makefile
    trunk/source/lisp-kernel/darwinx8664/Makefile

Modified: trunk/source/lisp-kernel/darwinx8632/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/darwinx8632/Makefile (original)
+++ trunk/source/lisp-kernel/darwinx8632/Makefile Sun Apr 11 04:26:27 2010
@@ -31,11 +31,12 @@
 # however.
 WFORMAT =3D -Wno-format
 CC=3Dgcc-4.0
+PLATFORM_H =3D platform-darwinx8632.h
 =

 .s.o:
 	$(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
 .c.o:
-	$(CC) -I./ -c -arch i386 $< $(CDEFINES) $(CDEBUG) $(COPT) $(MDYNAMIC_NO_P=
IC) $(WFORMAT) -mmacosx-version-min=3D10.5 -isysroot /Developer/SDKs/MacOSX=
10.5.sdk -o $@
+	$(CC) -include ../$(PLATFORM_H) -c -arch i386 $< $(CDEFINES) $(CDEBUG) $(=
COPT) $(MDYNAMIC_NO_PIC) $(WFORMAT) -mmacosx-version-min=3D10.5 -isysroot /=
Developer/SDKs/MacOSX10.5.sdk -o $@
 =

 SPOBJ =3D x86-spjump32.o x86-spentry32.o x86-subprims32.o
 ASMOBJ =3D x86-asmutils32.o imports.o
@@ -51,7 +52,7 @@
 =

 CHEADERS =3D area.h bits.h x86-constants.h lisp-errors.h gc.h lisp.h \
 	lisp-exceptions.h lisp_globals.h macros.h memprotect.h image.h \
-	Threads.h lisptypes.h x86-constants32.h x86-exceptions.h
+	Threads.h lisptypes.h x86-constants32.h x86-exceptions.h $(PLATFORM_H)
 =

 # Subprims linked into the kernel ?
 # Yes:

Modified: trunk/source/lisp-kernel/darwinx8664/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lisp-kernel/darwinx8664/Makefile (original)
+++ trunk/source/lisp-kernel/darwinx8664/Makefile Sun Apr 11 04:26:27 2010
@@ -54,11 +54,12 @@
 # Once in a while, -Wformat says something useful.  The odds are against t=
hat,
 # however.
 WFORMAT =3D -Wno-format
+PLATFORM_H =3D platform-darwinx8664.h
 =

 .s.o:
 	$(M4) $(M4FLAGS) -I../ $< | $(AS) $(ASFLAGS) -o $@
 .c.o:
-	$(CC) -I./ -c $< -arch x86_64 $(CDEFINES) $(CDEBUG) $(COPT) $(WFORMAT) $(=
MDYNAMIC_NO_PIC) -mmacosx-version-min=3D10.5 -isysroot /Developer/SDKs/MacO=
SX10.5.sdk -o $@
+	$(CC) -include ../$(PLATFORM_H) -c $< -arch x86_64 $(CDEFINES) $(CDEBUG) =
$(COPT) $(WFORMAT) $(MDYNAMIC_NO_PIC) -mmacosx-version-min=3D10.5 -isysroot=
 /Developer/SDKs/MacOSX10.5.sdk -o $@
 =

 SPOBJ =3D x86-spjump64.o x86-spentry64.o x86-subprims64.o =

 ASMOBJ =3D x86-asmutils64.o imports.o
@@ -74,7 +75,7 @@
 =

 CHEADERS =3D area.h bits.h x86-constants.h lisp-errors.h gc.h lisp.h \
 	lisp-exceptions.h lisp_globals.h macros.h memprotect.h image.h \
-	Threads.h lisptypes.h x86-constants64.h x86-exceptions.h
+	Threads.h lisptypes.h x86-constants64.h x86-exceptions.h $(PLATFORM_H)
 =

 # Subprims linked into the kernel ?
 # Yes: