Index: branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/modules/KernelPatcher/Makefile	(revision 604)
@@ -59,7 +59,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: ${OBJS} dylib
+all embedtheme: ${OBJS} dylib
 
 
 dylib: ${OBJS}
@@ -73,7 +73,9 @@
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
 	-weak_library $(SYMROOT)/Symbols.dylib \
-	$(OBJROOT)/kernel_patcher.o -o $(SYMROOT)/$(MODULE_NAME).dylib
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
+	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
 kernel_patcher.o: 	
Index: branches/azimutz/Chazi/i386/modules/Memory/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/Memory/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/modules/Memory/Makefile	(revision 604)
@@ -59,7 +59,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: ${MEMORY_OBJS} dylib
+all embedtheme: ${MEMORY_OBJS} dylib
 
 
 dylib: ${GRAPHICS_ENABLER_OBJS}
@@ -71,10 +71,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/dram_controllers.o \
-	$(OBJROOT)/spd.o \
-	$(OBJROOT)/mem.o \
-	$(OBJROOT)/Memory.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/azimutz/Chazi/i386/modules/Symbols/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/Symbols/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/modules/Symbols/Makefile	(revision 604)
@@ -53,7 +53,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: dylib
+all embedtheme: dylib
 
 
 dylib: $(OBJS)
@@ -66,7 +66,8 @@
 	-bind_at_load \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/Symbols.o -o $(SYMROOT)/$(MODULE_NAME).dylib \
+	$(OBJROOT)/*.o \
+	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
 
Index: branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/modules/GraphicsEnabler/Makefile	(revision 604)
@@ -59,7 +59,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: ${GRAPHICS_ENABLER_OBJS} dylib
+all embedtheme: ${GRAPHICS_ENABLER_OBJS} dylib
 
 
 dylib: ${GRAPHICS_ENABLER_OBJS}
@@ -71,10 +71,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/nvidia.o \
-	$(OBJROOT)/ati.o \
-	$(OBJROOT)/gma.o \
-	$(OBJROOT)/GraphicsEnabler.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/modules/HelloWorld/Makefile	(revision 604)
@@ -59,7 +59,7 @@
 	$(HFILES) $(OTHERFILES)
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
-all embedtheme optionrom: ${HELLO_WORLD_OBJS} dylib
+all embedtheme: ${HELLO_WORLD_OBJS} dylib
 
 
 dylib: ${HELLO_WORLD_OBJS}
@@ -71,7 +71,9 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/HelloWorld.o -o $(SYMROOT)/$(MODULE_NAME).dylib
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
+	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
 
Index: branches/azimutz/Chazi/i386/modules/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/modules/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/modules/Makefile	(revision 604)
@@ -27,11 +27,12 @@
 
 # The order of building is important.
 # TODO: exclude Symbols from find so it isn't compiled twice
+#Azi:---
 #SUBDIRS = Symbols `find ./ -type d -depth 1 -not -name ".*"`
-#Azi:---
 SUBDIRS = Symbols Memory KernelPatcher HelloWorld GraphicsEnabler
+#AutoResolution
 
-all embedtheme optionrom tags debug install installhdrs:
+all embedtheme tags debug install installhdrs:
 	@rm -rf $(OBJROOT)
 	@mkdir $(OBJROOT)
 	@for i in ${SUBDIRS}; \
Index: branches/azimutz/Chazi/i386/cdboot/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/cdboot/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/cdboot/Makefile	(revision 604)
@@ -6,7 +6,7 @@
 INSTALLDIR = $(DSTROOT)/usr/standalone/i386
 DIRS_NEEDED = $(SYMROOT)
 
-all embedtheme optionrom: $(DIRS_NEEDED) cdboot
+all embedtheme: $(DIRS_NEEDED) cdboot
 
 cdboot: cdboot.s $(SYMROOT)/boot Makefile $(NASM)
 	$(NASM) cdboot.s -o $(SYMROOT)/cdboot
Index: branches/azimutz/Chazi/i386/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/Makefile	(revision 604)
@@ -28,7 +28,7 @@
 # The order of building is important.
 SUBDIRS = util libsa libsaio boot2 boot1 boot0 cdboot modules
 
-all embedtheme optionrom tags debug install installhdrs:
+all embedtheme tags debug install installhdrs:
 	@for i in ${SUBDIRS}; \
 	do \
 		echo ================= make $@ for $$i =================; \
Index: branches/azimutz/Chazi/i386/util/Makefile
===================================================================
--- branches/azimutz/Chazi/i386/util/Makefile	(revision 603)
+++ branches/azimutz/Chazi/i386/util/Makefile	(revision 604)
@@ -24,7 +24,7 @@
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT) $(LANGDIR)
 
-all embedtheme optionrom: $(DIRS_NEEDED) $(PROGRAMS)
+all embedtheme: $(DIRS_NEEDED) $(PROGRAMS)
 
 machOconv: machOconv.o
 	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $(SYMROOT)/$(@F) machOconv.o
Index: branches/azimutz/Chazi/Makefile
===================================================================
--- branches/azimutz/Chazi/Makefile	(revision 603)
+++ branches/azimutz/Chazi/Makefile	(revision 604)
@@ -46,7 +46,7 @@
 # Currently builds for i386
 #
 
-all embedtheme optionrom tags debug install installhdrs modules: $(SYMROOT) $(OBJROOT)
+all embedtheme tags debug install installhdrs modules: $(SYMROOT) $(OBJROOT)
 	@if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi
 	@if [ -z "$(RC_ARCHS)" ]; then					  \
 		RC_ARCHS="i386";					  \