Correcting build issues.

5 files changed, 22 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..533ecb7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+*.o
+.*.swp
+/build
+/build~
+/.build_cache
+/libbu++
+src/build.tab.c
+src/build.tab.h
+src/build.yy.c
+src/build.yy.h
+/plugins
+
diff --git a/build.sh b/build.sh
index b51e796..29eda52 100755
--- a/build.sh
+++ b/build.sh
@@ -47,19 +47,19 @@ function presetup()
         cmd BOOTSTRAP minibu/bu/${file} cp bootstrap/${file} minibu/bu
     done
     for F in $BUSRC; do
-        bld minibu/src/$F || cmd WGET minibu/src/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/stable/$F -O minibu/src/$F
+        bld minibu/src/$F || cmd CP minibu/src/$F cp ../libbu++/src/stable/$F minibu/src/$F
     done
     for F in $BUHDR; do
-        bld minibu/bu/$F || cmd WGET minibu/bu/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/stable/$F -O minibu/bu/$F
+        bld minibu/bu/$F || cmd CP minibu/bu/$F cp ../libbu++/src/stable/$F minibu/bu/$F
     done
     for F in $BUEXPSRC; do
-        bld minibu/src/$F || cmd WGET minibu/src/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/experimental/$F -O minibu/src/$F
+        bld minibu/src/$F || cmd CP minibu/src/$F cp ../libbu++/src/experimental/$F minibu/src/$F
     done
     for F in $BUEXPHDR; do
-        bld minibu/bu/$F || cmd WGET minibu/bu/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/experimental/$F -O minibu/bu/$F
+        bld minibu/bu/$F || cmd CP minibu/bu/$F cp ../libbu++/src/experimental/$F minibu/bu/$F
     done
     for F in $BUCOMPAT; do
-        bld minibu/bu/$F || cmd WGET minibu/bu/$F wget -q http://svn.xagasoft.com/libbu++/trunk/src/$F -O minibu/bu/$F
+        bld minibu/bu/$F || cmd CP minibu/bu/$F cp ../libbu++/src/$F minibu/bu/$F
     done
 
     bld src/build.tab.c src/build.y || cmd BISON src/build.tab.c bison -bsrc/build src/build.y
diff --git a/src/ast.cpp b/src/ast.cpp
index 24d3193..4bbe186 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -9,7 +9,7 @@
 #include "astleaf.h"
 #include "astbranch.h"
 
-#include "build.tab.h"
+#include "buildparser.h"
 
 Ast::Ast()
 {
diff --git a/src/buildparser.h b/src/buildparser.h
index 47597bb..5337554 100644
--- a/src/buildparser.h
+++ b/src/buildparser.h
@@ -8,6 +8,9 @@
 #ifndef BUILD_PARSER_H
 #define BUILD_PARSER_H
 
+typedef void * yyscan_t;
+class BuildParser;
+
 #include "build.tab.h"
 
 #include "bu/stack.h"
@@ -41,7 +44,6 @@ private:
     Bu::Hash<Bu::String, bool> hConds;
 };
 
-typedef void * yyscan_t;
 #define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b )
 YY_DECL;
 
diff --git a/src/location.cpp b/src/location.cpp
index 1e2dfcd..507c922 100644
--- a/src/location.cpp
+++ b/src/location.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "location.h"
-#include "build.tab.h"
+#include "buildparser.h"
 
 Location::Location() :
     sFile("none"),