several bugfixes to squirrel serialisation code, serializer/load worldmap state from...

[supertux.git] / mk / jam / bisonflex.jam

diff --git a/mk/jam/bisonflex.jam b/mk/jam/bisonflex.jam
index 141f839..2809261 100644 (file)
--- a/mk/jam/bisonflex.jam
+++ b/mk/jam/bisonflex.jam
@@ -6,7 +6,7 @@ if $(LEX)
 {
   rule LexRule
   {
-    local cfile = [ LocateTarget $(<:S=.c) ] ;
+    local cfile = [ LocateTarget $(<:S=.c) : $(SUBDIR) ] ;
     local object = [ CompileObjects $(cfile) ] ;
 
     Lex $(cfile) : $(<) ;
@@ -17,7 +17,7 @@ if $(LEX)
   
   rule Lex++Rule
   {
-    local cppfile = [ LocateTarget $(<:S=.cpp) ] ;
+    local cppfile = [ LocateTarget $(<:S=.cpp) : $(SUBDIR) ] ;
     local object = [ CompileObjects $(cppfile) ] ;
 
     Lex $(cppfile) : $(<) ;
@@ -51,8 +51,8 @@ if $(BISON)
 {
   rule BisonRule
   {
-    local cfile = [ LocateTarget $(<:S=.c) ] ;
-    local headerfile = [ LocateTarget $(<:S=.h) ] ;
+    local cfile = [ LocateTarget $(<:S=.c) : $(SUBDIR) ] ;
+    local headerfile = [ LocateTarget $(<:S=.h) : $(SUBDIR) ] ;
     local object = [ CompileObjects $(cfile) ] ;
 
     Includes $(headerfile:G=) : $(headerfile) ;
@@ -67,17 +67,16 @@ if $(BISON)
 
   rule Bison++Rule
   {
-    local cppfile = [ LocateTarget $(<:S=.cpp) ] ;
-    local headerfile = [ LocateTarget $(<:S=.hpp) ] ;
-    headerfile = $(headerfile:G=) ;
+    local cppfile = [ LocateTarget $(<:S=.cpp) : $(SUBDIR) ] ;
+    local headerfile = [ LocateTarget $(<:S=.hpp) : $(SUBDIR) ] ;
     local object = [ CompileObjects $(cppfile) ] ;
 
     # jams header file scannning doesn't use grist so we have to workaround this
     # here
     Includes $(headerfile:G=) : $(headerfile) ;
 
-    Bison $(cppfile) : $(<) ;
-#Includes $(cppfile) : $(headerfile) ;
+    Bison $(cppfile) $(headerfile) : $(<) ;
+#Includes $(cppfile) : $(headerfile:G=) ;
 
     return $(object) ;
   }