make to work again

diff --git a/util/cgg/Makefile b/util/cgg/Makefile
index 4888819..8de7762 100644 (file)
--- a/util/cgg/Makefile
+++ b/util/cgg/Makefile
@@ -6,7 +6,7 @@ LDFLAGS=-i
 LINTOPTS=-hbxac $(PREFLAGS)
 LIBS=../../lib/em_data.a
 # LEXLIB is system dependent, try -ll or -lln first
-LEXLIB=-lln
+LEXLIB = -lln
 
 cgg:   bootgram.o main.o bootlex.o
        $(CC) $(LDFLAGS) bootgram.o main.o bootlex.o $(LIBS) $(LEXLIB) -o cgg

diff --git a/util/cgg/bootgram.y b/util/cgg/bootgram.y
index f74d958..41aca07 100644 (file)
--- a/util/cgg/bootgram.y
+++ b/util/cgg/bootgram.y
@@ -11,8 +11,16 @@ static char rcsid[]="$Header$";
  * Author: Hans van Staveren
  */
 
+#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
+#include <em_spec.h>
+#include <em_flag.h>
+#include <em_reg.h>
+
 #define extern
 #include "booth.h"
+#undef extern
 
 %}
 

diff --git a/util/cgg/booth.h b/util/cgg/booth.h
index 42c5a9a..e44c8a4 100644 (file)
--- a/util/cgg/booth.h
+++ b/util/cgg/booth.h
@@ -55,12 +55,6 @@ typedef char * string;
 
 extern char *malloc(),*myalloc();
 
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-#include <em_spec.h>
-#include <em_flag.h>
-#include <em_reg.h>
 #include <cg_pattern.h>
 
 typedef struct list1str {

diff --git a/util/cgg/bootlex.l b/util/cgg/bootlex.l
index 254c562..99a49ba 100644 (file)
--- a/util/cgg/bootlex.l
+++ b/util/cgg/bootlex.l
@@ -16,6 +16,13 @@ static char rcsid2[]="$Header$";
 
 #define MAXBACKUP 50
 
+#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
+#include <em_spec.h>
+#include <em_flag.h>
+#include <em_reg.h>
+
 #include "booth.h"
 #include "y.tab.h"
 %}

diff --git a/util/cgg/main.c b/util/cgg/main.c
index f397e3f..bbbb06e 100644 (file)
--- a/util/cgg/main.c
+++ b/util/cgg/main.c
@@ -1,3 +1,10 @@
+#include <stdio.h>
+#include <assert.h>
+#include <ctype.h>
+#include <em_spec.h>
+#include <em_flag.h>
+#include <em_reg.h>
+
 #include "booth.h"
 
 char *strncpy(), strcpy(), sprintf();