From: Robert Griesemer <gri@golang.org>
Date: Fri, 27 Mar 2009 00:51:44 +0000 (-0700)
Subject: move AST into src/lib/go
X-Git-Tag: weekly.2009-11-06~1957
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b499da48a4d8a06ae3b0f6ccb2d861474a11a554;p=gostls13.git

move AST into src/lib/go

R=r
DELTA=1509  (756 added, 751 deleted, 2 changed)
OCL=26799
CL=26801
---

diff --git a/src/lib/go/Makefile b/src/lib/go/Makefile
index 58b562171f..354602363e 100644
--- a/src/lib/go/Makefile
+++ b/src/lib/go/Makefile
@@ -35,8 +35,10 @@ O1=\
 	token.$O\
 
 O2=\
+	ast.$O\
 	scanner.$O\
 
+ast.a: a1 a2
 scanner.a: a1 a2
 token.a: a1 a2
 
@@ -45,10 +47,12 @@ a1:	$(O1)
 	rm -f $(O1)
 
 a2:	$(O2)
+	$(AR) grc ast.a ast.$O
 	$(AR) grc scanner.a scanner.$O
 	rm -f $(O2)
 
 newpkg: clean
+	$(AR) grc ast.a
 	$(AR) grc scanner.a
 	$(AR) grc token.a
 
@@ -56,11 +60,12 @@ $(O1): newpkg
 $(O2): a1
 
 nuke: clean
-	rm -f $(GOROOT)/pkg/scanner.a $(GOROOT)/pkg/token.a
+	rm -f $(GOROOT)/pkg/ast.a $(GOROOT)/pkg/scanner.a $(GOROOT)/pkg/token.a
 
-packages: scanner.a token.a
+packages: ast.a scanner.a token.a
 
 install: packages
+	cp ast.a $(GOROOT)/pkg/ast.a
 	cp scanner.a $(GOROOT)/pkg/scanner.a
 	cp token.a $(GOROOT)/pkg/token.a
 
diff --git a/usr/gri/pretty/ast.go b/src/lib/go/ast.go
similarity index 100%
rename from usr/gri/pretty/ast.go
rename to src/lib/go/ast.go