[cig-commits] r6210 - cs/babel/trunk/spike/Spike/Compiler

[leif at geodynamics.org]

Author: leif
Date: 2007-03-08 22:01:38 -0800 (Thu, 08 Mar 2007)
New Revision: 6210

Added:
   cs/babel/trunk/spike/Spike/Compiler/yy.h
Modified:
   cs/babel/trunk/spike/Spike/Compiler/Makefile
   cs/babel/trunk/spike/Spike/Compiler/gram.y
   cs/babel/trunk/spike/Spike/Compiler/scan.l
Log:
Fixed some build issues.

Modified: cs/babel/trunk/spike/Spike/Compiler/Makefile
===================================================================
--- cs/babel/trunk/spike/Spike/Compiler/Makefile	2007-03-09 05:35:49 UTC (rev 6209)
+++ cs/babel/trunk/spike/Spike/Compiler/Makefile	2007-03-09 06:01:38 UTC (rev 6210)
@@ -6,7 +6,7 @@
 OBJ	= gram.o scan.o main.o parser.o
 
 $(BIN)/pyspike: $(OBJ)
-	gcc $(CFLAGS) $(OBJ) -o $(BIN)/pyspike -lpython2.4
+	gcc $(CFLAGS) $(OBJ) -o $(BIN)/pyspike -L/usr/lib/python2.4/config -lpython2.4
 
 scan.o: gram.h
 
@@ -18,13 +18,15 @@
 scan.c: scan.l gram.c
 	flex -o$@ $<
 
-parser.h: parser.o
+parser.h: parser.c
 
-parser.o: parser.pyx
+parser.c: parser.pyx
 	pyrexc $<
-	gcc $(CFLAGS) -c -o $@ parser.c 
 
+parser.o: parser.c
+	gcc $(CFLAGS) -c -o $@ $<
+
 clean:
-	rm -f gram.h gram.c scan.c parser.c y.output *.o
+	rm -f gram.h gram.c gram.output scan.c parser.c parser.pxi parser.h y.output *.o $(BIN)/pyspike*
 
 #.PRECIOUS: gram.c scan.c

Modified: cs/babel/trunk/spike/Spike/Compiler/gram.y
===================================================================
--- cs/babel/trunk/spike/Spike/Compiler/gram.y	2007-03-09 05:35:49 UTC (rev 6209)
+++ cs/babel/trunk/spike/Spike/Compiler/gram.y	2007-03-09 06:01:38 UTC (rev 6210)
@@ -1,6 +1,8 @@
 %{
 
 #include <Python.h>
+#undef DL_IMPORT
+#define DL_IMPORT(RTYPE) RTYPE
 #include "parser.h"
 
 #define YYSTYPE PyObject *

Modified: cs/babel/trunk/spike/Spike/Compiler/scan.l
===================================================================
--- cs/babel/trunk/spike/Spike/Compiler/scan.l	2007-03-09 05:35:49 UTC (rev 6209)
+++ cs/babel/trunk/spike/Spike/Compiler/scan.l	2007-03-09 06:01:38 UTC (rev 6210)
@@ -13,6 +13,8 @@
 
 #include <stdio.h>
 #include <Python.h>
+#undef DL_IMPORT
+#define DL_IMPORT(RTYPE) RTYPE
 #include "gram.h"
 #include "parser.h"
 

Added: cs/babel/trunk/spike/Spike/Compiler/yy.h
===================================================================
--- cs/babel/trunk/spike/Spike/Compiler/yy.h	2007-03-09 05:35:49 UTC (rev 6209)
+++ cs/babel/trunk/spike/Spike/Compiler/yy.h	2007-03-09 06:01:38 UTC (rev 6210)
@@ -0,0 +1,4 @@
+
+extern FILE *yyin;
+int yyparse();
+