Clean up a couple #include and build dependencies.

diff --git a/JavaScript.hpp b/JavaScript.hpp
index ca2b0c1981e2856971193932d71b88e8fc3b3419..de7c88955516e525bed040a0ff93704d76483dbe 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -34,6 +34,10 @@
 #include <ffi.h>
 #endif
 
 #include <ffi.h>
 #endif
 

+#include <apr_pools.h>
+
+#include <String.hpp>
+

 extern JSStringRef Array_s;
 extern JSStringRef cy_s;
 extern JSStringRef length_s;
 extern JSStringRef Array_s;
 extern JSStringRef cy_s;
 extern JSStringRef length_s;

diff --git a/Makefile.am b/Makefile.am
index 0d73879d366efd3d4c8f4f154ac84b9a73980166..fc2287288cfd8d846f9afffc8b39f0d8ce04b2cd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,7 +92,7 @@ CLEANFILES += lex.cy.cpp
 lex.cy.cpp: Cycript.l
        $(FLEX) -t $< | $(SED) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/' >$@
 
 lex.cy.cpp: Cycript.l
        $(FLEX) -t $< | $(SED) -e 's/int yyl;/yy_size_t yyl;/;s/int yyleng_r;/yy_size_t yyleng_r;/' >$@
 

-Highlight.lo: Cycript.tab.hh
+Console.lo Execute.lo Highlight.lo Library.lo Parser.lo lex.cy.lo: Cycript.tab.hh

 
 CLEANFILES += Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy
 
 CLEANFILES += Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.output: Cycript.yy

diff --git a/Parser.cpp b/Parser.cpp
index 09aaf7a93d26815f087ad81a347b31a4ccf01655..3e94c4d83506340baa2548b0b2d73c1a41cc7102 100644 (file)
--- a/Parser.cpp
+++ b/Parser.cpp
@@ -19,8 +19,8 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-#include "Parser.hpp"

 #include "Cycript.tab.hh"
 #include "Cycript.tab.hh"

+#include "Parser.hpp"

 
 CYRange DigitRange_    (0x3ff000000000000LLU, 0x000000000000000LLU); // 0-9
 CYRange WordStartRange_(0x000001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$
 
 CYRange DigitRange_    (0x3ff000000000000LLU, 0x000000000000000LLU); // 0-9
 CYRange WordStartRange_(0x000001000000000LLU, 0x7fffffe87fffffeLLU); // A-Za-z_$