applied farnkerls patch to handle the jam commandline limitation problems

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

diff --git a/mk/jam/flags.jam b/mk/jam/flags.jam
index 1b8ea61..1364136 100644 (file)
--- a/mk/jam/flags.jam
+++ b/mk/jam/flags.jam
@@ -22,8 +22,8 @@ rule LinkWith
                 # inherit the exported flags
                 CppFlags $(<) : $($(i)_CPPFLAGS) : $(3) ;
                 CFlags $(<) : $($(i)_CFLAGS) : $(3) ;
-                C++Flags $(<) : $($(i)_C++FLAGS) : $(3) ;
-                LFlags $(<) : $($(i)_LFLAGS) : $(3) ;
+                C++Flags $(<) : $($(i)_CXXFLAGS) : $(3) ;
+                LFlags $(<) : $($(i)_LIBS) : $(3) ;
             }
         } else {
             echo "WARNING: Trying to link" $(i)
@@ -74,10 +74,10 @@ rule CFlags
 
 rule C++Flags
 {
-    C++FLAGS on $($(<)_OBJECTS) += $(>) ;
+    CXXFLAGS on $($(<)_OBJECTS) += $(>) ;
 
     if [ IsElem export : $(3) ] {
-       $(<)_C++FLAGS = $(>) ;
+       $(<)_CXXFLAGS = $(>) ;
     }
 }
 
@@ -85,10 +85,10 @@ rule C++Flags
 ##    Sets linker flags for a library, plugin or application target
 rule LFlags
 {
-    LFLAGS on $($(<)_TARGET) += $(>) ;
+    LIBS on $($(<)_TARGET) += $(>) ;
 
     if [ IsElem export : $(3) ] {
-        $(<)_LFLAGS = $(>) ;
+        $(<)_LIBS = $(>) ;
     }
 }
 
@@ -124,7 +124,7 @@ rule ExtraObjects
 ##    sure the dependency scanner is able to locate your header files. The
 ##    directories are relative to the current subdir specified with the SubDir
 ##    rule.
-##    Implementation: The directories are simply added to the HDRS variable
+##    Implementation: The directories are simply added to the HDRSEARCH variable
 ##    which is respected by all jam rules.
 rule IncludeDir
 {
@@ -136,14 +136,14 @@ rule IncludeDir
             CppFlags $(<) : [ CreateIncludeFlags $(dir) ] ;
 
             # needed for header scanning
-            HDRS on $($(<)_SOURCES) += $(dir) ;
+            HDRSEARCH on $($(<)_SOURCES) += $(dir) ;
         }
     } else {
         for i in $(<) {
             dir = [ ConcatDirs $(SUBDIR) $(i) ] ;
             CPPFLAGS += [ CreateIncludeFlags $(dir) ] ;
             # needed for header scanning
-            HDRS += $(dir) ;
+            HDRSEARCH += $(dir) ;
         }
     }
 }