--- loncom/homework/CAPA-converter/Makefile	2000/04/12 20:06:16	1.1
+++ loncom/homework/CAPA-converter/Makefile	2001/04/30 21:33:53	1.5
@@ -6,7 +6,7 @@ VER = 5.1
 BUGFIX = 0
 #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
+DEF = -DUSE_DYNAMIC_SYMBOLS -D_GNU_SOURCE#-DLEX_DBUG 
 CFLAG = -g -Wall 
 LEX = flex -Cfa -s
 YACC = bison
@@ -55,13 +55,16 @@ ARCH_OBJ = $(ARCH)/capaCommon.o   $(ARCH
 # libcapa:=MACRO=string
 
 
-answers: $(ARCH)/answers
+convert: $(ARCH) $(ARCH)/convert
 	echo done
 
-all: $(ARCH)libcapa($VER).a $(ARCH)/answers 
+all: $(ARCH) $(ARCH)libcapa($VER).a $(ARCH)/convert 
+
+$(ARCH): 
+	mkdir $(ARCH)
 
 dmalloc: 
-	$(MAKE) DEF="-DDMALLOC -DDMALLOC_FUNC_CHECK $(DEF)" P_FLAGS="-ldmalloc $(P_FLAGS)" libcapa answers
+	$(MAKE) DEF="-DDMALLOC -DDMALLOC_FUNC_CHECK $(DEF)" P_FLAGS="-ldmalloc $(P_FLAGS)" libcapa convert
 
 $(ARCH)libcapa($VER).a: $(ARCH_OBJ)
 	$(AR) r $(ARCH)/libcapa$(VER).a $(ARCH_OBJ) 
@@ -72,8 +75,8 @@ binclean:
 $(ARCH)/%.o: %.c capaToken.h
 	$(CC) $(CFLAG) -c $< -o $@ $(DEF)
 
-$(ARCH)/answers: $(ARCH)libcapa($VER).a $(ARCH)/answers.o
-	$(CC) $(CFLAG) $(DEF) -o $@ $(ARCH)/answers.o -L$(ARCH) -lcapa$(VER) $(P_FLAGS)
+$(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
 
@@ -85,9 +88,9 @@ capaLexerFun.c: capaLexerDef.flex capaTo
 	$(LEX) -o$@ $<
 
 clean:
-	rm $(ARCH)/*.o
-	rm $(ARCH)/libcapa$(VER).a
-	rm capaToken.h
-	rm capaParserFun.c
-	rm capaLexerFun.c
+	rm -f $(ARCH)/*.o
+	rm -f $(ARCH)/libcapa$(VER).a
+	rm -f capaToken.h
+	rm -f capaParserFun.c
+	rm -f capaLexerFun.c