--- capa/capa51/GUITools/Makefile	2000/06/27 18:28:48	1.7
+++ capa/capa51/GUITools/Makefile	2000/08/04 15:54:49	1.10
@@ -1,13 +1,35 @@
 # Makefile for quizzer and grader and manager
-# Copyright Guy Albertelli II 1998
+#  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
+#  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.
+#
+#  You should have received a copy of the GNU Library 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.
+
+# Guy Albertelli II 1998
 # The target all creates TCL/TK dependent programs.
 # The target all.2 creates stand alone programs.
 
 MAJORVER=\"5.1\"
-QUIZZERMINORVER=\"1\"
-GRADERMINORVER=\"1\"
-MANAGERMINORVER=\"1\"
-WEBPAGEMINORVER=\"1\"
+QUIZZERMINORVER=\"2\"
+GRADERMINORVER=\"2\"
+MANAGERMINORVER=\"2\"
+WEBPAGEMINORVER=\"2\"
 UNAME=$(shell uname)
 
 QUIZZERDEFS=-DQUIZZERMINORVER=$(QUIZZERMINORVER)
@@ -32,7 +54,7 @@ ARCHLIB=-lfl $(TCLTK)/lib/libtk8.0.a $(T
 ARCHLIBTCL=-lfl $(TCLTK)/lib/libtcl8.0.a -lm $(LIBPATH) -ldl 
 LIBPATH=-L/usr/X11R6/lib/
 ARCHCOPT=-g -Wall $(DEFS)
-INC=-I. -I$(TCLTK)/include
+INC=-I. -I.. -I$(TCLTK)/include
 TCLSH=$(TCLTK)/bin/tclsh8.0
 
 else
@@ -41,7 +63,7 @@ ifeq ($(UNAME),OSF1)
 CC=cc 
 ARCHCOPT=-O3 -Olimit 768 $(DEFS)
 #ARCHCOPT=-g $(DEFS)
-INC=-I. -I/usr/local/include
+INC=-I. -I.. -I/usr/local/include
 ARCHLIB=-ly -ll -lm -lX11 \
     /usr/local/lib/libtk8.0.a /usr/local/lib/libtcl8.0.a 
 ARCHLIBTCL=-ll /usr/local/lib/libtcl8.0.a -lm $(LIBPATH)
@@ -57,7 +79,7 @@ ARCHLIB=-ldl -ly -ll -lm -lX11 -lsocket
 ARCHLIBTCL=-ldl -ly -ll -lm -lsocket -lnsl $(TCLTK)/lib/libtcl8.0.a
 LIBPATH=-L/usr/openwin/lib
 ARCHCOPT=-xO3 $(DEFS)
-INC=-I. -I$(TCLTK)/include -I/usr/openwin/include
+INC=-I. -I.. -I$(TCLTK)/include -I/usr/openwin/include
 TCLSH=$(TCLTK)/bin/tclsh8.0
 
 else                 
@@ -65,7 +87,7 @@ ifeq ($(UNAME),IRIX)
 
 CC=cc                          
 ARCHCOPT=-O3 $(DEFS)          
-INC=-I. -I/usr/people/capa/include                             
+INC=-I. -I.. -I/usr/people/capa/include                             
 ARCHLIB=-ll -ltk8.0 -ltcl8.0 -lm -lX11 
 LIBPATH=-L/usr/people/capa/lib
 TCLSH=/usr/people/capa/bin/tclsh
@@ -78,7 +100,7 @@ endif
 LIB=$(DBUGLIB) $(ARCHLIB)
 LIBTCL=$(DBUGLIB) $(ARCHLIBTCL)
 COPT=$(ARCHCOPT) $(DBUGDEF)
-CAPALIB=Capa/$(UNAME)/libcapa5.1.a 
+CAPALIB=../pProj/$(UNAME)/libcapa5.1.a 
 
 QUIZZEROBJ=$(UNAME)/quizzer.o $(UNAME)/quizzer.init.o $(UNAME)/common.funct.o $(UNAME)/quizzer.funct.o $(CAPALIB)
 QUIZZEROBJ2=$(UNAME)/quizzer.init.o $(UNAME)/quizzer.tcl.o $(UNAME)/common.funct.o $(UNAME)/quizzer.funct.o $(CAPALIB)
@@ -94,15 +116,18 @@ MANAGEROBJ2=$(UNAME)/manager.tcl.o $(MAN
 WEBPAGEOBJ=$(UNAME)/webpage.o $(UNAME)/webpage.init.o $(UNAME)/common.funct.o $(UNAME)/webpage.funct.o $(CAPALIB)
 WEBPAGEOBJ2=$(UNAME)/webpage.init.o $(UNAME)/webpage.tcl.o $(UNAME)/common.funct.o $(UNAME)/webpage.funct.o $(CAPALIB)
 
-all:	$(UNAME)/quizzer $(UNAME)/grader $(UNAME)/manager $(UNAME)/webpage $(UNAME)/answers
+all:	$(UNAME) $(UNAME)/quizzer $(UNAME)/grader $(UNAME)/manager $(UNAME)/webpage $(UNAME)/answers
 
 dmalloc:
 	$(MAKE) $(UNAME)/quizzer DBUGDEF="-DDMALLOC -DDMALLOC_FUNC_CHECK" DBUGLIB="-ldmalloc"
 
-all.2:	$(UNAME)/quizzer.2 $(UNAME)/grader.2 $(UNAME)/manager.2 $(UNAME)/webpage.2 $(UNAME)/answers 
+all.2:	$(UNAME) $(UNAME)/quizzer.2 $(UNAME)/grader.2 $(UNAME)/manager.2 $(UNAME)/webpage.2 $(UNAME)/answers 
+
+$(UNAME):
+	mkdir $(UNAME)
 
 $(UNAME)/answers:	$(UNAME)/answers.o
-	$(CC) $(COPT) -o $@ $< $(LIBPATH) $(CAPALIB) $(DBUGLIB) -lm -lfl
+	$(CC) $(COPT) -o $@ $< $(LIBPATH) $(CAPALIB) $(DBUGLIB) -lm -ll
 
 $(UNAME)/quizzer:	$(QUIZZEROBJ)
 	$(CC) $(COPT) -o $@ $(QUIZZEROBJ) $(LIBPATH) $(LIB)