local no_scan_archive = $(NOARSCAN) ;
local target = [ ConstructLibraryTarget $(<) : $(3) ] ;
- local sources = [ DoSourceGrist $(>) ] ;
+ local sources = [ SearchSource $(>) ] ;
local objects = [ CompileObjects $(sources) : $(3) ] ;
local install_targets ;
# Generate install rules
if ! [ IsElem noinstall : $(3) ]
{
- install_targets = [ DoInstall $(target) : $(libdir) ] ;
+ install_targets = [ DoInstall $(target) : $(libdir) : $(INSTALL) : nopackage ] ;
Depends install_lib : $(install_targets) ;
}
}
# 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
## major:minor:patchlevel
rule LibraryVersion
{
- LFLAGS on $($(<)_TARGET) = -version-info $(>) ;
+ LIBS on $($(<)_TARGET) = -version-info $(>) ;
}
#----------------------------------------------------------------------------
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