remove glu dependency again, since it seems some people have trouble compiling it...

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

diff --git a/mk/jam/bisonflex.jam b/mk/jam/bisonflex.jam
index 83912b5..22dafde 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,14 +17,14 @@ if $(LEX)
   
   rule Lex++Rule
   {
-    local cppfile = [ LocateTarget $(<:S=.cpp) ] ;
+    local cppfile = [ LocateTarget $(<:S=.cpp) : $(SUBDIR) ] ;
     local object = [ CompileObjects $(cppfile) ] ;
 
     Lex $(cppfile) : $(<) ;
 
     return $(object) ;
   }
-  RegisterFileType Flex++Rule : .ll ;
+  RegisterFileType Lex++Rule : .ll ;
 
   if $(COMPILER_TYPE) != "GCC"
   {
@@ -51,13 +51,13 @@ 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) ;
     
-    Bison $(cfile) $(headerfile) : $(<) ;
+    Bison $(cfile) : $(<) ;
     # work around jam warning about independent target 
     Includes $(cfile) : $(headerfile) ;
 
@@ -67,8 +67,8 @@ if $(BISON)
 
   rule Bison++Rule
   {
-    local cppfile = [ LocateTarget $(<:S=.cpp) ] ;
-    local headerfile = [ LocateTarget $(<:S=.hpp) ] ;
+    local cppfile = [ LocateTarget $(<:S=.cpp) : $(SUBDIR) ] ;
+    local headerfile = [ LocateTarget $(<:S=.hpp) : $(SUBDIR) ] ;
     headerfile = $(headerfile:G=) ;
     local object = [ CompileObjects $(cppfile) ] ;
 
@@ -76,8 +76,8 @@ if $(BISON)
     # here
     Includes $(headerfile:G=) : $(headerfile) ;
 
-    Bison $(cppfile) $(headerfile) : $(<) ;
-    Includes $(cppfile) : $(headerfile) ;
+    Bison $(cppfile) $(headerfile:G=) : $(<) ;
+#Includes $(cppfile) : $(headerfile:G=) ;
 
     return $(object) ;
   }