--- capa/capa51/pProj/Makefile	2000/06/27 18:28:48	1.6
+++ capa/capa51/pProj/Makefile	2000/08/07 20:47:29	1.13
@@ -1,9 +1,32 @@
 # ==================================================================
 #     Makefile for CAPA 5.1
 # ==================================================================
+#  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 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
+#  General Public License for more details.
+#
+#  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,
+#
+#  Boston, MA 02111-1307, USA. 
+#  As a special exception, you have permission to link this program
+#  with the TtH/TtM library and distribute executables, as long as you
+#  follow the requirements of the GNU GPL in regard to all of the
+#  software in the executable aside from TtH/TtM.
+
+
 
 VER = 5.1
-BUGFIX = 1
+BUGFIX = 2
 #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 
@@ -18,12 +41,12 @@ LEXFLAG = -v
 
 # OSF1, SunOS, Linux, NEXTSTEP, HP-UX, IRIX
 
-#TTH_SRC=
-TTH_SRC=../../tth/tthdynamic/tthfunc.c
-#TTH_OBJ=
-TTH_OBJ=$(ARCH)/tthfunc.o
-#TTH_DEF=
-TTH_DEF=-DTTH
+TTH_SRC=
+#TTH_SRC=../../tth/tthdynamic/tthfunc.c
+TTH_OBJ=
+#TTH_OBJ=$(ARCH)/tthfunc.o
+TTH_DEF=
+#TTH_DEF=-DTTH
 
 ARCH = $(shell uname)
 Linux = /usr/lib/libncurses.a 
@@ -45,22 +68,22 @@ 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)
 
-PAR_SRC = capaCommon.c capaLexerFun.c capaParserFun.c capaFunction.c \
+PAR_SRC = capaLexerFun.c capaParserFun.c capaFormulaParser.c capaFunction.c \
 	  capaParserUtils.c capaMapExpr.c capaUnit.c com.c linpack.c ranlib.c \
           capaCgiUtils.c capaSubjective.c capaRQO.c capaFormulaLexer.c \
-	  capaFormulaParser.c $(TTH_SRC)
+	  capaFormulaParser.c capaCommon.c $(TTH_SRC)
 
 PAR_OBJ = $(PAR_SRC:.c=.o)
 
-ARCH_OBJ = $(ARCH)/capaCommon.o $(ARCH)/capaLexerFun.o $(ARCH)/capaParserFun.o \
+ARCH_OBJ = $(ARCH)/capaFormulaParser.o $(ARCH)/capaLexerFun.o $(ARCH)/capaParserFun.o \
 	   $(ARCH)/capaFunction.o $(ARCH)/capaParserUtils.o $(ARCH)/capaMapExpr.o \
 	   $(ARCH)/capaUnit.o $(ARCH)/com.o $(ARCH)/linpack.o $(ARCH)/ranlib.o \
            $(ARCH)/capaCgiUtils.o $(ARCH)/capaSubjective.o $(ARCH)/capaRQO.o \
-	   $(ARCH)/capaFormulaLexer.o $(ARCH)/capaFormulaParser.o $(TTH_OBJ)
+	   $(ARCH)/capaFormulaLexer.o $(ARCH)/capaCommon.o $(TTH_OBJ)
 ## ===================================================================
 
 #  conditional macros in alpha 
@@ -114,7 +137,7 @@ $(ARCH)/libcapa$(VER).a: $(ARCH_OBJ) $(P
 binclean:
 	$(RM) $(ARCH)/*.o $(ARCH)/*.a
 
-$(ARCH)/%.o: %.c capaToken.h
+$(ARCH)/%.o: %.c capaToken.h 
 	$(CC) $(CFLAG) -c $< -o $@ $(DEF)
 
 $(ARCH)/tthfunc.o: $(TTH_SRC)
@@ -123,7 +146,13 @@ $(ARCH)/tthfunc.o: $(TTH_SRC)
 $(ARCH)/convert: $(ARCH)libcapa($VER).a $(ARCH)/convert.o
 	$(CC) $(CFLAG) $(DEF) -o $@ $(ARCH)/convert.o -L$(ARCH) -lcapa$(VER) $(P_FLAGS)
 
-capaToken.h: capaParserFun.c
+capaToken.h: capaGrammarDef.y
+	$(YACC) -d $< --output=capaParserFun.c
+	mv capaParserFun.h capaToken.h
+
+capaForumla.h: capaFormula.y
+	$(YACC) -d $< -p fml_ --output=$@
+	mv capaFormulaParser.h capaFormula.h
 
 capaParserFun.c: capaGrammarDef.y
 	$(YACC) -d $< --output=$@
@@ -134,11 +163,11 @@ capaLexerFun.c: capaLexerDef.flex capaTo
 
 capaFormulaParser.c: capaFormula.y
 	$(YACC) -d $< -p fml_ --output=$@
+	mv capaFormulaParser.h capaFormula.h
 
 clean:
 	rm -f $(ARCH)/*.o
 	rm -f $(ARCH)/libcapa$(VER).a
-	rm -f capaToken.h
-	rm -f capaParserFun.c
-	rm -f capaLexerFun.c
+	rm -f capaToken.h capaParserFun.c capaLexerFun.c capaFormula.h \
+		capaFormulaParser.c