Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/Makefile
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/Makefile	(revision 1015)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/Makefile	(revision 1016)
@@ -23,7 +23,7 @@
 		-fno-builtin -DSAIO_INTERNAL_USER -static $(OMIT_FRAME_POINTER_CFLAG) \
 		-mpreferred-stack-boundary=2 -fno-align-functions -fno-stack-protector \
 		-march=pentium4 -msse2 -mfpmath=sse -msoft-float -nostdinc -include $(SRCROOT)/autoconf.h
-	      
+
 CPPFLAGS := $(CPPFLAGS) -nostdinc++ -include $(SRCROOT)/autoconf.h
 
 DEFINES=
@@ -43,7 +43,8 @@
 # The ordering is important;
 # boot2.o must be first.
 OBJS = boot2.o boot.o graphics.o drivers.o prompt.o options.o lzss.o mboot.o \
-	ramdisk.o picopng.o resume.o bmdecompress.o graphic_utils.o gui.o modules.o modules_support.o boot_modules.o
+	   ramdisk.o picopng.o resume.o bmdecompress.o graphic_utils.o gui.o modules.o \
+	   modules_support.o boot_modules.o
 # button.o browser.o scrollbar.o == NOTYET	
 
 UTILDIR = ../util
@@ -112,7 +113,6 @@
 
 	@${RM} $(SYMROOT)/${SYMBOLS_MODULE}
 
-
 	@$(LD) -arch i386 \
 	-undefined dynamic_lookup \
 	-dylib -read_only_relocs suppress \
@@ -122,17 +122,13 @@
 	-final_output Symbols \
 	-macosx_version_min 10.6 \
 	-o $(OBJROOT)/Symbols_LINKER_ONLY.dylib
-	
 
-
-
-
 endif
 
-	@make embed_symbols		# this is done in a sub process after boot.sys exists so the strings are populated correctly
+	# this is done in a sub process after boot.sys exists so the strings are populated correctly
+	@make embed_symbols
 
 	@${RM} $(SYMROOT)/boot2.sys
-	
 
 	@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
 	  if expr "$$size" ">" "$(MAXBOOTSIZE)" > /dev/null ;\
@@ -145,7 +141,6 @@
 	  	echo "\t******* boot is $$size bytes *******"; \
 	  fi)
 
-	
 embed_symbols:
 ifeq (${CONFIG_MODULES}, y)
 	@echo ================= Embedding Symbols.dylib =================
@@ -153,12 +148,11 @@
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot2.sys $(SYMROOT)/boot &> /dev/null
 
 	@echo "\t******* Patching at $(PATCH_ADDR) ******"
-	@stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot.sys bs=1 count=4 seek=$(PATCH_ADDR)	 &> /dev/null
+	@stat -f%z $(SYMROOT)/boot | perl -ane "print pack('V',@F[0]);" | dd conv=notrunc of=${SYMROOT}/boot.sys bs=1 count=4 seek=$(PATCH_ADDR) &> /dev/null
 endif
 	@echo "\t[MACHOCONV] boot"
 	@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot
 
-	
 $(SYMROOT)/art.h:
 	@if [ "$(PNGCRUSH)" ]; then	\
 		echo "optimizing art files ...\n$(PNGCRUSH) $(PNGOPTIONS) artwork/$(THEME)"; \
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.h
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.h	(revision 1015)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/boot2/boot.h	(revision 1016)
@@ -92,14 +92,14 @@
 
 #define kPCIRootUID			"PCIRootUID"		/* pci_root.c */
 
-//#define kUseAtiROM			"UseAtiROM"			/* ati.c */
-//#define kAtiConfig			"AtiConfig"			/* ati.c */
+//#define kUseAtiROM		"UseAtiROM"			/* ati.c */
+//#define kAtiConfig		"AtiConfig"			/* ati.c */
 //#define kATYbinimage		"ATYbinimage"		/* ati.c */
 
 //#define kUseNvidiaROM		"UseNvidiaROM"		/* nvidia.c */
-//#define kVBIOS				"VBIOS"				/* nvidia.c */
-//#define kdcfg0              "display_0"			/* nvidia.c */
-//#define kdcfg1              "display_1"			/* nvidia.c */
+//#define kVBIOS			"VBIOS"				/* nvidia.c */
+//#define kdcfg0			"display_0"			/* nvidia.c */
+//#define kdcfg1			"display_1"			/* nvidia.c */
 
 #define kEthernetBuiltIn	"EthernetBuiltIn"	/* pci_setup.c */
 #define kGraphicsEnabler	"GraphicsEnabler"	/* pci_setup.c */
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/config/Makefile
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/config/Makefile	(revision 1015)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/config/Makefile	(revision 1016)
@@ -15,27 +15,21 @@
 DIR = util
 include ${SRCROOT}/Make.rules
 
+OBJECTS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 \
+		  yesno.o32 yesno.o64 textbox.o32 textbox.o64 menubox.o32 \
+		  menubox.o64 checklist.o32 checklist.o64 inputbox.o32 inputbox.o64
 
-
-OBJECTS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 yesno.o32 yesno.o64 textbox.o32 textbox.o64 menubox.o32 menubox.o64 checklist.o32 checklist.o64 inputbox.o32 inputbox.o64
-
 DEFINES = -DKBUILD_NO_NLS -DCURSES_LOC=\<ncurses.h\> -DPATH_MAX=256 -DPACKAGE=\"chameleon\" 
 LDFLAGS = -lncurses -lmenu
 
-
 PROGRAMS = cconfig
 
-
-
 SYMPROG = $(addprefix $(SYMROOT)/, $(PROGRAMS))
 
 DIRS_NEEDED = $(OBJROOT) $(SYMROOT)
 
 all: $(DIRS_NEEDED) $(SYMPROG)
 
-
-
-
 $(SYMPROG): $(addprefix $(OBJROOT)/, $(OBJECTS))
 	@echo "\t[LD32] $(@F)_32"
 	@$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/*.o32
Index: branches/azimutz/trunkGraphicsEnablerModules/i386/Makefile
===================================================================
--- branches/azimutz/trunkGraphicsEnablerModules/i386/Makefile	(revision 1015)
+++ branches/azimutz/trunkGraphicsEnablerModules/i386/Makefile	(revision 1016)
@@ -51,7 +51,7 @@
 			"RC_CFLAGS=$(RC_CFLAGS)" $@ 			  \
 		) || exit $$?; 						  \
 	done
-	
+
 config rebuild_config:
 	@for i in config; \
 	do \

Property changes on: branches/azimutz/trunkGraphicsEnablerModules
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk:r1010