--- capa/capa51/pProj/Makefile	2000/07/14 19:22:50	1.11
+++ capa/capa51/pProj/Makefile	2021/07/28 16:28:15	1.25
@@ -4,16 +4,16 @@
 #  Copyright (C) 1992-2000 Michigan State University
 #
 #  The CAPA system is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Library General Public License as
+#  modify it under the terms of the GNU General Public License as
 #  published by the Free Software Foundation; either version 2 of the
 #  License, or (at your option) any later version.
 #
 #  The CAPA system is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Library General Public License for more details.
+#  General Public License for more details.
 #
-#  You should have received a copy of the GNU Library General Public
+#  You should have received a copy of the GNU General Public
 #  License along with the CAPA system; see the file COPYING.  If not,
 #  write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 #
@@ -26,7 +26,7 @@
 
 
 VER = 5.1
-BUGFIX = 2
+BUGFIX = 6
 #CC = i486-linuxlibc1-gcc  -DCAPA_VER=\"$(VER).$(BUGFIX)\" -DCOMPILE_DATE=\"`date +'%b-%d-%Y'`\" 
 CC = cc  -DCAPA_VER=\"$(VER).$(BUGFIX)\" -DCOMPILE_DATE=\"`date +'%b-%d-%Y-%H:%M'`\" 
 DEF = -DUSE_DYNAMIC_SYMBOLS $(TTH_DEF) #-DLEX_DBUG 
@@ -49,6 +49,7 @@ TTH_DEF=
 #TTH_DEF=-DTTH
 
 ARCH = $(shell uname)
+LONCAPA =
 Linux = /usr/lib/libncurses.a 
 OSF1 = -lcurses #-ltermcap
 SunOS = /home/capa/source/lib/libncurses.a
@@ -58,17 +59,18 @@ HP-UX = -lcurses -ltermcap
 IRIX = -lcurses -ltermcap
 FreeBSD = -lncurses -ltermcap
 
-P_FLAGS =  -ll -lm 
+P_FLAGS =  -lfl -lm 
 
 S_FLAGS =  $($(ARCH)) $(P_FLAGS)
 
+LONCAPAFLAG = -DLONCAPA -fPIC -Dbool=char -DHAS_BOOL -D_REENTRANT
 OSF1FLAG = -O3 -Olimit 2048
 AIXFLAG=-O3 -DAIX $(DEF)
 NEXTSTEPFLAG=-arch i386 -arch m68k $(DEF)
 SunOSFLAG=-xO3 $(DEF)
 HP-UXFLAG=-O -Ae -Dhpux $(DEF)
 IRIXFLAG=-O2 -DIRIX $(DEF)
-LinuxFLAG=-g -Wall $(DEF)
+LinuxFLAG=-O2 -Wall $(DEF)
 
 CFLAG=$($(ARCH)FLAG)
 
@@ -131,7 +133,7 @@ $(ARCH)/qzparse: qzparse.c $(ARCH)/libca
 qzparse: $(ARCH)/qzparse
 	true
 
-$(ARCH)/libcapa$(VER).a: $(ARCH_OBJ) $(PAR_SRC)
+$(ARCH)/libcapa$(VER).a: $(ARCH) $(ARCH_OBJ) $(PAR_SRC)
 	$(AR) r $(ARCH)/libcapa$(VER).a $(ARCH_OBJ) 
 
 binclean:
@@ -147,27 +149,27 @@ $(ARCH)/convert: $(ARCH)libcapa($VER).a
 	$(CC) $(CFLAG) $(DEF) -o $@ $(ARCH)/convert.o -L$(ARCH) -lcapa$(VER) $(P_FLAGS)
 
 capaToken.h: capaGrammarDef.y
-	$(YACC) -d $< --output=capaParserFun.c
-	mv capaParserFun.h capaToken.h
+	$(YACC) -y -d $< --output=capaParserFun.c
+	cp capaParserFun.h capaToken.h
 
-capaForumla.h: capaFormula.y
-	$(YACC) -d $< -p fml_ --output=$@
-	mv capaFormulaParser.h capaFormula.h
+capaFormula.h: capaFormula.y
+	$(YACC) -y -d $< -p fml_ --output=$@
+	cp capaFormulaParser.h capaFormula.h
 
 capaParserFun.c: capaGrammarDef.y
-	$(YACC) -d $< --output=$@
-	mv capaParserFun.h capaToken.h
+	$(YACC) -y -d $< --output=$@
+	cp capaParserFun.h capaToken.h
 
 capaLexerFun.c: capaLexerDef.flex capaToken.h
 	$(LEX) -o$@ $<
 
 capaFormulaParser.c: capaFormula.y
-	$(YACC) -d $< -p fml_ --output=$@
-	mv capaFormulaParser.h capaFormula.h
+	$(YACC) -y -d $< -p fml_ --output=$@
+	cp capaFormulaParser.h capaFormula.h
 
 clean:
 	rm -f $(ARCH)/*.o
 	rm -f $(ARCH)/libcapa$(VER).a
 	rm -f capaToken.h capaParserFun.c capaLexerFun.c capaFormula.h \
-		capaFormulaParser.c
+		capaFormulaParser.c capaFormulaParser.h capaParserFun.h