--- capa/capa51/GUITools/Makefile	2000/07/14 19:22:50	1.9
+++ capa/capa51/GUITools/Makefile	2000/08/04 15:54:49	1.10
@@ -54,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
@@ -63,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)
@@ -79,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                 
@@ -87,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
@@ -100,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)
@@ -116,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)