Index: branches/meklort/i386/modules/NetbookInstaller/Makefile
===================================================================
--- branches/meklort/i386/modules/NetbookInstaller/Makefile	(revision 600)
+++ branches/meklort/i386/modules/NetbookInstaller/Makefile	(revision 601)
@@ -70,9 +70,10 @@
 	-S -x -Z -dead_strip_dylibs \
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
-	-weak_library $(SYMROOT)/GUI.dylib \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/NBI.o -o $(SYMROOT)/$(MODULE_NAME).dylib
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
+	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
 
Index: branches/meklort/i386/modules/HPET/Makefile
===================================================================
--- branches/meklort/i386/modules/HPET/Makefile	(revision 600)
+++ branches/meklort/i386/modules/HPET/Makefile	(revision 601)
@@ -71,7 +71,9 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/HPET.o -o $(SYMROOT)/$(MODULE_NAME).dylib
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
+	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
 
Index: branches/meklort/i386/modules/USBFix/Makefile
===================================================================
--- branches/meklort/i386/modules/USBFix/Makefile	(revision 600)
+++ branches/meklort/i386/modules/USBFix/Makefile	(revision 601)
@@ -71,8 +71,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/USBFix.o \
-	$(OBJROOT)/usb.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/meklort/i386/modules/KextPatcher/Makefile
===================================================================
--- branches/meklort/i386/modules/KextPatcher/Makefile	(revision 600)
+++ branches/meklort/i386/modules/KextPatcher/Makefile	(revision 601)
@@ -74,15 +74,8 @@
 	-final_output $(MODULE_NAME) \
 	-weak_library $(SYMROOT)/Symbols.dylib \
 	-weak_library $(SYMROOT)/GUI.dylib \
-	$(OBJROOT)/kext_patcher.o \
-	$(OBJROOT)/inflate.o \
-	$(OBJROOT)/deflate.o \
-	$(OBJROOT)/inftrees.o \
-	$(OBJROOT)/zutil.o \
-	$(OBJROOT)/inffast.o \
-	$(OBJROOT)/adler32.o \
-	$(OBJROOT)/trees.o \
-	$(OBJROOT)/hex_editor.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/meklort/i386/modules/ACPIPatcher/Makefile
===================================================================
--- branches/meklort/i386/modules/ACPIPatcher/Makefile	(revision 600)
+++ branches/meklort/i386/modules/ACPIPatcher/Makefile	(revision 601)
@@ -71,9 +71,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/ACPIPatcher.o \
-	$(OBJROOT)/aml_generator.o \
-	$(OBJROOT)/acpi_patcher.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/meklort/i386/modules/Resolution/Makefile
===================================================================
--- branches/meklort/i386/modules/Resolution/Makefile	(revision 600)
+++ branches/meklort/i386/modules/Resolution/Makefile	(revision 601)
@@ -71,9 +71,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/edid.o \
-	$(OBJROOT)/915resolution.o \
-	$(OBJROOT)/Resolution.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/meklort/i386/modules/GUI/GUI_module.c
===================================================================
--- branches/meklort/i386/modules/GUI/GUI_module.c	(revision 600)
+++ branches/meklort/i386/modules/GUI/GUI_module.c	(revision 601)
@@ -745,11 +745,10 @@
 		gui.redraw = true;
 		if (!(gBootMode & kBootModeQuiet))
 		{
-			bool showBootBanner = true;
+			bool showBootBanner = false;
 			
 			// Check if "Boot Banner"=N switch is present in config file.
-			getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig); 
-			if (showBootBanner)
+			if (getBoolForKey(kBootBannerKey, &showBootBanner, &bootInfo->bootConfig) && !showBootBanner)
 			{
 				// Display banner and show hardware info.
 				gprintf(&gui.screen, bootBanner + 1, (bootInfo->convmem + bootInfo->extmem) / 1024);
Index: branches/meklort/i386/modules/GUI/Makefile
===================================================================
--- branches/meklort/i386/modules/GUI/Makefile	(revision 600)
+++ branches/meklort/i386/modules/GUI/Makefile	(revision 601)
@@ -82,11 +82,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/GUI_module.o \
-	$(OBJROOT)/gui.o \
-	$(OBJROOT)/picopng.o \
-	$(OBJROOT)/graphic_utils.o \
-	-weak_library $(SYMROOT)/Resolution.dylib \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	 -o $(SYMROOT)/$(MODULE_NAME).dylib
 
 GUI_module.o: 	
Index: branches/meklort/i386/modules/KernelPatcher/Makefile
===================================================================
--- branches/meklort/i386/modules/KernelPatcher/Makefile	(revision 600)
+++ branches/meklort/i386/modules/KernelPatcher/Makefile	(revision 601)
@@ -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/meklort/i386/modules/Networking/Makefile
===================================================================
--- branches/meklort/i386/modules/Networking/Makefile	(revision 600)
+++ branches/meklort/i386/modules/Networking/Makefile	(revision 601)
@@ -71,7 +71,9 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/Networking.o -o $(SYMROOT)/$(MODULE_NAME).dylib
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
+	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
 
Index: branches/meklort/i386/modules/Memory/Makefile
===================================================================
--- branches/meklort/i386/modules/Memory/Makefile	(revision 600)
+++ branches/meklort/i386/modules/Memory/Makefile	(revision 601)
@@ -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/meklort/i386/modules/Symbols/Makefile
===================================================================
--- branches/meklort/i386/modules/Symbols/Makefile	(revision 600)
+++ branches/meklort/i386/modules/Symbols/Makefile	(revision 601)
@@ -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/meklort/i386/modules/GraphicsEnabler/Makefile
===================================================================
--- branches/meklort/i386/modules/GraphicsEnabler/Makefile	(revision 600)
+++ branches/meklort/i386/modules/GraphicsEnabler/Makefile	(revision 601)
@@ -71,10 +71,8 @@
 	-no_uuid \
 	-current_version $(MODULE_VERSION) -compatibility_version $(MODULE_COMPAT_VERSION) \
 	-final_output $(MODULE_NAME) \
-	$(OBJROOT)/ati.o \
-	$(OBJROOT)/nvidia.o \
-	$(OBJROOT)/gma.o \
-	$(OBJROOT)/GraphicsEnabler.o \
+	$(OBJROOT)/*.o \
+	-weak_library $(SYMROOT)/*.dylib \
 	-o $(SYMROOT)/$(MODULE_NAME).dylib
 
 
Index: branches/meklort/i386/modules/HelloWorld/Makefile
===================================================================
--- branches/meklort/i386/modules/HelloWorld/Makefile	(revision 600)
+++ branches/meklort/i386/modules/HelloWorld/Makefile	(revision 601)
@@ -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/meklort/i386/modules/Makefile
===================================================================
--- branches/meklort/i386/modules/Makefile	(revision 600)
+++ branches/meklort/i386/modules/Makefile	(revision 601)
@@ -27,7 +27,8 @@
 
 # The order of building is important.
 # TODO: exclude Symbols from find so it isn't compiled twice
-SUBDIRS = Symbols Resolution KernelPatcher KextPatcher GUI GraphicsEnabler ACPIPatcher HPET USBFix Memory Networking NetbookInstaller
+SUBDIRS = Symbols Resolution KernelPatcher GUI KextPatcher GraphicsEnabler ACPIPatcher HPET USBFix Memory Networking NetbookInstaller
+#SUBDIRS = USB
 
 all embedtheme optionrom tags debug install installhdrs:
 	@rm -rf $(OBJROOT)