Index: branches/xZenu/src/modules/MakeInc.dir =================================================================== --- branches/xZenu/src/modules/MakeInc.dir (revision 1281) +++ branches/xZenu/src/modules/MakeInc.dir (revision 1282) @@ -44,6 +44,8 @@ LIBSAIODIR = ../../libsaio BOOT2DIR = ../../boot2 +VPATH = ${ARCH} + MODULE_INCLUDES := $(foreach x,ModuleSystem $(MODULE_DEPENDENCIES),-I$(SRCROOT)/modules/$(x)/include/) @@ -92,8 +94,8 @@ endif -dylib_LINKER: ${OBJROOT} $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h $(SYMROOT)/$(MODULE_NAME).${ARCH}.linker.dylib -dylib: ${OBJROOT} $(SYMROOT)/$(MODULE_NAME).${ARCH}.dylib +dylib_LINKER: ${OBJROOT} ${MODULE_OBJECTS} $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h $(SYMROOT)/$(MODULE_NAME).${ARCH}.linker.dylib +dylib: ${OBJROOT} ${MODULE_OBJECTS} $(SYMROOT)/$(MODULE_NAME).${ARCH}.dylib Index: branches/xZenu/src/modules/ModuleSystem/linker.c =================================================================== --- branches/xZenu/src/modules/ModuleSystem/linker.c (revision 1281) +++ branches/xZenu/src/modules/ModuleSystem/linker.c (revision 1282) @@ -154,7 +154,6 @@ /********************************************************************************/ /* dyld / Linker Interface */ /********************************************************************************/ -void dyld_stub_binder() __attribute__((alias("dyld_stub_binder"))); void dyld_stub_binder() { printf("ERROR: dyld_stub_binder was called, should have been take care of by the linker.\n"); Index: branches/xZenu/src/modules/ModuleSystem/Makefile =================================================================== --- branches/xZenu/src/modules/ModuleSystem/Makefile (revision 1281) +++ branches/xZenu/src/modules/ModuleSystem/Makefile (revision 1282) @@ -8,7 +8,7 @@ DIR = ModuleSystem -MODULE_OBJS = modules_support linker -#macho modules +MODULE_OBJS = linker +I386_OBJS = modules_support include ../MakeInc.dir \ No newline at end of file Index: branches/xZenu/src/arch/ppc/Make.rules =================================================================== --- branches/xZenu/src/arch/ppc/Make.rules (revision 1281) +++ branches/xZenu/src/arch/ppc/Make.rules (revision 1282) @@ -41,3 +41,4 @@ ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS))) MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS))) +MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(PPC_OBJS))) \ No newline at end of file Index: branches/xZenu/src/arch/i386/Make.rules =================================================================== --- branches/xZenu/src/arch/i386/Make.rules (revision 1281) +++ branches/xZenu/src/arch/i386/Make.rules (revision 1282) @@ -41,4 +41,5 @@ ACTUAL_OBJECTS = $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS))) -MODULE_OBJECTS = $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS))) \ No newline at end of file +MODULE_OBJECTS = $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS))) +MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(I386_OBJS))) \ No newline at end of file Index: branches/xZenu/src/arch/armv5/Make.rules =================================================================== --- branches/xZenu/src/arch/armv5/Make.rules (revision 1281) +++ branches/xZenu/src/arch/armv5/Make.rules (revision 1282) @@ -42,4 +42,4 @@ ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS))) MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS))) - +MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(ARMV5_OBJS))) Index: branches/xZenu/src/arch/x86_64/Make.rules =================================================================== --- branches/xZenu/src/arch/x86_64/Make.rules (revision 1281) +++ branches/xZenu/src/arch/x86_64/Make.rules (revision 1282) @@ -34,4 +34,5 @@ ACTUAL_OBJECTS := ${ACTUAL_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(OBJECTS))) -MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS))) \ No newline at end of file +MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(MODULE_OBJS))) +MODULE_OBJECTS := ${MODULE_OBJECTS} $(addsuffix .${ARCH}o, $(addprefix $(OBJROOT)/, $(X86_64_OBJS))) \ No newline at end of file