diff --git a/Jamrules b/Jamrules index b8d0ee66cf..764cb88d06 100644 --- a/Jamrules +++ b/Jamrules @@ -822,12 +822,19 @@ rule R5KernelStaticLibrary rule MergeObjectFromObjects { - # MergeObjectFromObjects : ; + # MergeObjectFromObjects : : ; + # Merges object files to an object file. + # : Name of the object file to create. No grist will be added. + # : Object files to be merged. Grist will be added. + # : Object files or static libraries to be merged. No grist + # will be added. + # local objects = [ FGristFiles $(2) ] ; MakeLocate $(1) : $(LOCATE_TARGET) ; Depends $(1) : $(objects) ; + Depends $(1) : $(3) ; LINK on $(1) = ld ; - MergeObjectFromObjects1 $(1) : $(objects) ; + MergeObjectFromObjects1 $(1) : $(objects) $(3) ; } actions MergeObjectFromObjects1 @@ -837,12 +844,18 @@ actions MergeObjectFromObjects1 rule MergeObject { - # MergeObject : ; + # MergeObject : : ; + # Compiles source files and merges the object files to an object file. + # : Name of the object file to create. No grist will be added. + # : Sources to be compiled. Grist will be added. + # : Object files or static libraries to be merged. No grist + # will be added. + # SetupIncludes ; SetupObjectsDir ; MakeLocateObjects $(2) ; Objects $(2) ; - MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) ; + MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(3) ; } rule SharedLibraryFromObjects @@ -1640,13 +1653,20 @@ actions KernelLd rule KernelMergeObject { - # KernelMergeObject : : ; + # KernelMergeObject : : : ; + # Compiles source files and merges the object files to an object file. + # : Name of the object file to create. No grist will be added. + # : Sources to be compiled. Grist will be added. + # : Additional flags for compilation. + # : Object files or static libraries to be merged. No grist + # will be added. + # SetupKernel $(2) : $(3) ; MakeLocateObjects $(2) ; Objects $(2) ; - MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) ; + MergeObjectFromObjects $(1) : $(2:S=$(SUFOBJ)) : $(4) ; } rule KernelStaticLibrary