From: erg <devnull@localhost>
Date: Tue, 22 Aug 2006 16:09:22 +0000 (+0000)
Subject: Remove incorrect files from object file list;
X-Git-Tag: LAST_LIBGRAPH~32^2~5959
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e17833a3a6bc0ce6c4b838fb5c0807799064915c;p=graphviz

Remove incorrect files from object file list;
update yacc rules for osx
---

diff --git a/lib/common/Makefile.old b/lib/common/Makefile.old
index eceb95b17..4536ac937 100644
--- a/lib/common/Makefile.old
+++ b/lib/common/Makefile.old
@@ -31,7 +31,7 @@ OBJS = arrows.o colxlate.o fontmetrics.o \
 	args.o memory.o globals.o htmllex.o htmlparse.o htmltable.o input.o \
 	pointset.o postproc.o routespl.o splines.o psusershape.o \
 	timing.o labels.o ns.o shapes.o utils.o geom.o \
-	output.o emit.o ps.txt color_names $(CODEGENS)
+	output.o emit.o $(CODEGENS)
 
 libcommon.a : $(OBJS)
 	$(RM) libcommon.a
@@ -42,7 +42,7 @@ htmllex.o : htmlparse.c
 
 htmlparse.h htmlparse.c : htmlparse.y
 	$(YACC) -dv htmlparse.y
-	if test $(ARCH) != "netbsd.i386"; then $(SED) 1s/#include.*// < y.tab.c | $(SED) "s/yy/html/g" > htmlparse.c; else $(SED) "s/yy/html/g" < y.tab.c > htmlparse.c; fi
+	if test $(ARCH) = "netbsd.i386" -o $(ARCH) = "osx.i386"; then $(SED) "s/yy/html/g" < y.tab.c > htmlparse.c; else $(SED) 1s/#include.*// < y.tab.c | $(SED) "s/yy/html/g" > htmlparse.c; fi
 	$(SED) "s/yy/html/g" < y.tab.h > htmlparse.h
 	$(RM) y.tab.c y.tab.h