X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=mk%2Fjam%2Flibrary.jam;h=f968a74cfe167c020bede3cf5402031fda579ac7;hb=cf66e7ab073b4e9479d5b6d479f8c351b89e8aee;hp=1be44286e32c08eb3134a75d68164440497c9e0f;hpb=6c3a5307b87bc3fff19e819281cf2b87a2b5010b;p=supertux.git

diff --git a/mk/jam/library.jam b/mk/jam/library.jam
index 1be44286e..f968a74cf 100644
--- a/mk/jam/library.jam
+++ b/mk/jam/library.jam
@@ -22,7 +22,7 @@ rule Library
 
     local no_scan_archive = $(NOARSCAN) ;
     local target = [ ConstructLibraryTarget $(<) : $(3) ] ;
-    local sources = [ DoSourceGrist $(>) ] ;
+    local sources = [ SearchSource $(>) ] ;
     local objects = [ CompileObjects $(sources) : $(3) ] ;
     local install_targets ;
 
@@ -113,16 +113,18 @@ rule Library
     }
 
     # Import default flags
-    CppFlags $(<) : $(CPPFLAGS) $(LIBRARY_CPPFLAGS) ;
-    CFlags $(<) : $(CFLAGS) $(LIBRARY_CFLAGS) ;
-    C++Flags $(<) : $(C++FLAGS) $(LIBRARY_C++FLAGS) ;
-    LFlags $(<) : $(LFLAGS) $(LIBRARY_LFLAGS) ;
+    CppFlags $(<) : $(LIBRARY_CPPFLAGS) ;
+    CFlags $(<) : $(LIBRARY_CFLAGS) ;
+    C++Flags $(<) : $(LIBRARY_CXXFLAGS) ;
+    LFlags $(<) : $(LIBRARY_LIBS) ;
 
     # Sources are part of the package
     if ! [ IsElem nopackage : $(3) ]
     {
       Package $(sources) ;
     }
+
+    return $(target) ;
 }
 
 ##  LibraryVersion
@@ -130,7 +132,7 @@ rule Library
 ##    major:minor:patchlevel
 rule LibraryVersion
 {
-    LFLAGS on $($(<)_TARGET) = -version-info $(>) ;
+    LIBS on $($(<)_TARGET) = -version-info $(>) ;
 }
 
 #----------------------------------------------------------------------------
@@ -160,7 +162,7 @@ actions together Ranlib
 
 actions LinkLibrary bind NEEDLIBS bind EXTRAOBJECTS
 {
-    $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LFLAGS)
+    $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
 }
 
 # Construct pseudo target libs which is used instead of the pseudo target lib