* Now the DEBUG_PRINTF variable can be set to cause the macro

DEBUG_PRINTF to be defined.
* Fixed KernelAddon rule: Now not the file but the target kernel.so is
  specified for linking the add-on against, which results in proper
  dependencies. Axel: Want to clarify the ToDo comment?


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10754 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-01-15 21:32:51 +00:00
parent cafa4dd931
commit d5807053ee

View File

@ -206,6 +206,16 @@ if $(DEBUG) != 0 {
# To disable for the tests OPTIM and DEBUG are overridden, set the environment # To disable for the tests OPTIM and DEBUG are overridden, set the environment
# variable NO_TEST_DEBUG. # variable NO_TEST_DEBUG.
# If the environment variable DEBUG_PRINTF is defined we define an equally
# named macro to the variable value. Some components use the macro to allow
# another function than printf() to print the debug output. The variable should
# be set to the name of the alternative function.
#
if $(DEBUG_PRINTF) {
CCFLAGS += [ FDefines DEBUG_PRINTF=$(DEBUG_PRINTF) ] ;
C++FLAGS += [ FDefines DEBUG_PRINTF=$(DEBUG_PRINTF) ] ;
}
# Instructs the Library rule to not make its object files temporary. # Instructs the Library rule to not make its object files temporary.
# This is needed as some objects are used in a static library and for an # This is needed as some objects are used in a static library and for an
# executable. # executable.
@ -1816,7 +1826,7 @@ rule KernelAddon
ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -no-fpic ; ObjectCcFlags $(sources) : -D_KERNEL_MODE=1 -no-fpic ;
ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic -fno-exceptions ; ObjectC++Flags $(sources) : -D_KERNEL_MODE=1 -no-fpic -fno-exceptions ;
LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ; LINKFLAGS on $(1) = [ on $(1) return $(LINKFLAGS) ] -nostdlib ;
LinkSharedOSLibs $(1) : $(4) $(OBOS_TOP)/objects/$(OBOS_ARCH).$(OBOS_VERSION)/kernel/kernel.so ; LinkSharedOSLibs $(1) : $(4) <nogrist>kernel.so ;
# ToDo this has to be changed! # ToDo this has to be changed!
SetupKernel $(sources) ; SetupKernel $(sources) ;
} }