Index: trunk/i386/libsaio/Makefile =================================================================== --- trunk/i386/libsaio/Makefile (revision 2407) +++ trunk/i386/libsaio/Makefile (revision 2408) @@ -51,11 +51,11 @@ all: $(DIRS_NEEDED) $(CONFIG_HEADERS) $(LIBS) all-recursive $(LIBS): $(SAIO_OBJS) - @echo "\t[RM] $@" + @echo " [RM] $@" @rm -f $@ - @echo "\t[AR] $(@F)" + @echo " [AR] $(@F)" @ar q $@ $^ &> /dev/null - @echo "\t[RANLIB] $(@F)" + @echo " [RANLIB] $(@F)" @ranlib $(SYMROOT)/$(@F) clean-local: Index: trunk/i386/boot0/Makefile =================================================================== --- trunk/i386/boot0/Makefile (revision 2407) +++ trunk/i386/boot0/Makefile (revision 2408) @@ -18,9 +18,9 @@ all: $(DIRS_NEEDED) $(OBJS) $(OBJS): $(SRCROOT)/autoconf.inc - @echo "\t[NASM] $(@F)" + @echo " [NASM] $(@F)" @$(NASM) $(@F).s -o $@ clean-local: - @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done @rm -f $(OBJS) Index: trunk/i386/boot1/Makefile =================================================================== --- trunk/i386/boot1/Makefile (revision 2407) +++ trunk/i386/boot1/Makefile (revision 2408) @@ -33,7 +33,7 @@ $(PROGRAMS): $(SRCROOT)/autoconf.inc - @echo "\t[NASM] $(@F)" + @echo " [NASM] $(@F)" @$(NASM) $(@F).s -o $@ install_i386:: all $(INSTALLDIR) @@ -41,5 +41,5 @@ cd $(INSTALLDIR); chmod u+w $(VERSIONED_FILES) clean-local: - @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done + @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo " [RM] $${p}"; fi; done @rm -f $(PROGRAMS) Index: trunk/i386/klibc/Makefile =================================================================== --- trunk/i386/klibc/Makefile (revision 2407) +++ trunk/i386/klibc/Makefile (revision 2408) @@ -34,17 +34,17 @@ $(LIBS): $(OBJS) - @echo "\t[RM] $@" + @echo " [RM] $@" @rm -f $@ - @echo "\t[AR] $(@F)" + @echo " [AR] $(@F)" @ar q $@ $^ &> /dev/null - @echo "\t[RANLIB] $(@F)" + @echo " [RANLIB] $(@F)" @ranlib $@ # dependencies -include $(OBJROOT)/Makedep clean-local: - @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done - @for l in $(LIBS); do if [ -f "$${l}" ];then echo "\t[RM] $${l}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done + @for l in $(LIBS); do if [ -f "$${l}" ];then echo " [RM] $${l}"; fi; done @rm -f $(LIBS) $(OBJS) Index: trunk/i386/boot2/Makefile =================================================================== --- trunk/i386/boot2/Makefile (revision 2407) +++ trunk/i386/boot2/Makefile (revision 2408) @@ -29,10 +29,10 @@ DEFINES= CONFIG = hd SYMDIR = $(SYMROOT) -LIBSADIR = ../libsa -LIBSAIODIR = ../libsaio +LIBSADIR = $(SRCROOT)/i386/libsa +LIBSAIODIR = $(SRCROOT)/i386/libsaio THEME = $(CONFIG_EMBEDED_THEME) -THEMEDIR = ../../artwork/themes/$(THEME) +THEMEDIR = $(SRCROOT)/artwork/themes/$(THEME) INC = -I. -I$(SRCROOT) -I$(SYMDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include LIBS= -L$(SYMDIR) -lsaio -lsa -lklibc @@ -48,7 +48,7 @@ # button.o browser.o scrollbar.o == NOTYET OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) -UTILDIR = ../util +UTILDIR = $(SRCROOT)/i386/util DIRS_NEEDED = $(OBJROOT) $(SYMROOT) BOOT2ADDR = 20200 MAXBOOTSIZE = 458240 @@ -82,7 +82,7 @@ @${MKDIRS} $(OBJROOT)/../boot2_modules/ @### First pass, don't worry abount segment alignment. - @echo "\t[LD] boot.sys" + @echo " [LD] boot.sys" @$(CC) -Wl,-preload -Wl,-alias,boot2,start \ -nostdlib -arch i386 -Wl,-pie \ -Wl,-read_only_relocs,suppress \ @@ -94,10 +94,10 @@ ifeq (${CONFIG_MODULES}, y) @# Generate the Symbols.dylib file - @echo "\t[dyldsymboltool] Symbols.dylib" + @echo " [dyldsymboltool] Symbols.dylib" @$(SYMROOT)/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE} - @echo "\t[LD] boot.sys" + @echo " [LD] boot.sys" @$(CC) -Wl,-preload -Wl,-alias,boot2,start \ -nostdlib -arch i386 -Wl,-pie \ -Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \ @@ -114,10 +114,10 @@ @${RM} $(SYMROOT)/${SYMBOLS_MODULE} @# Generate the Symbols.dylib file - @echo "\t[dyldsymboltool] Symbols.dylib" + @echo " [dyldsymboltool] Symbols.dylib" @$(SYMROOT)/dyldsymboltool $(SYMROOT)/boot.sys $(SYMROOT)/${SYMBOLS_MODULE} - @echo "\t[LD] boot.sys" + @echo " [LD] boot.sys" @$(CC) -Wl,-preload -Wl,-alias,boot2,start \ -nostdlib -arch i386 -Wl,-pie \ -Wl,-sectcreate,__DATA,__Symbols,$(SYMROOT)/Symbols.dylib \ @@ -142,7 +142,7 @@ -o $(OBJROOT)/Symbols_LINKER_ONLY.dylib else - @echo "\t[LD] boot.sys" + @echo " [LD] boot.sys" @$(CC) -Wl,-preload -Wl,-alias,boot2,start \ -nostdlib -arch i386 -Wl,-pie \ -Wl,-segaddr,__INIT,`echo obase=16\; $$((0x${BOOT2ADDR})) | bc` \ @@ -155,7 +155,7 @@ endif - @echo "\t[MACHOCONV] boot" + @echo " [MACHOCONV] boot" @$(SYMROOT)/machOconv ${SYMROOT}/$@.sys $(SYMROOT)/$@ &> /dev/null @( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \ @@ -190,7 +190,7 @@ @echo "" >> $(SYMROOT)/art.h @echo "embeddedpng_t embeddedImages[] = {" >> $(SYMROOT)/art.h @cd $(SYMROOT)/embed && find . -name '*.png' | sort | cut -f 2 -d '/' | cut -f 1 -d '.' | \ - awk '{ printf "\t{.name = \"%s\", .pngdata = __%s_png, .length = &__%s_png_len},\n", $$1, $$1, $$1 }' >> $(SYMROOT)/art.h + awk '{ printf " {.name = \"%s\", .pngdata = __%s_png, .length = &__%s_png_len},\n", $$1, $$1, $$1 }' >> $(SYMROOT)/art.h @echo "};" >> $(SYMROOT)/art.h @echo "#endif /* !__BOOT2_ART_H */" >> $(SYMROOT)/art.h ;\ @@ -204,7 +204,7 @@ clean-local: @for o in $(SYMROOT)/boot $(SYMROOT)/boot.sys $(SYMROOT)/embedded.h $(OBJROOT)/Symbols_LINKER_ONLY.dylib; do \ - if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done - @if [ -d "$(OBJROOT)" ];then echo "\t[RM] all objects in $(OBJROOT)"; fi + if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done + @if [ -d "$(OBJROOT)" ];then echo " [RM] all objects in $(OBJROOT)"; fi @rm -f $(SYMROOT)/boot $(SYMROOT)/boot.sys $(SYMROOT)/embedded.h $(OBJS) @rm -rf $(OBJROOT) Index: trunk/i386/config/Makefile =================================================================== --- trunk/i386/config/Makefile (revision 2407) +++ trunk/i386/config/Makefile (revision 2408) @@ -33,11 +33,11 @@ all: $(DIRS_NEEDED) $(SYMPROG) $(SYMPROG): $(OBJS) - @echo "\t[LD32] $(@F)_32" + @echo " [LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/*.o32 - @echo "\t[LD64] $(@F)_64" + @echo " [LD64] $(@F)_64" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/*.o64 - @echo "\t[LIPO] $(@F)" + @echo " [LIPO] $(@F)" @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 Index: trunk/i386/modules/FileNVRAM/Makefile =================================================================== --- trunk/i386/modules/FileNVRAM/Makefile (revision 2407) +++ trunk/i386/modules/FileNVRAM/Makefile (revision 2408) @@ -13,7 +13,7 @@ include ../MakeInc.dir $(SYMROOT)/modules/$(MODULE_NAME).dylib: - @echo "\t[CP] $(MODULE_NAME).dylib" + @echo " [CP] $(MODULE_NAME).dylib" @cp $(MODULE_NAME).dylib $(SRCROOT)/sym/i386/modules/$(MODULE_NAME).dylib $(SRCROOT)/sym/i386/boot_modules.c: Index: trunk/i386/modules/MakeInc.dir =================================================================== --- trunk/i386/modules/MakeInc.dir (revision 2407) +++ trunk/i386/modules/MakeInc.dir (revision 2408) @@ -105,7 +105,7 @@ ifeq ($(BUILT_IN),yes) $(SYMROOT)/modules/$(MODULE_NAME).dylib: $(MODULE_OBJS) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author Makefile - @echo "\t[LD] $(MODULE_NAME).dylib" + @echo " [LD] $(MODULE_NAME).dylib" @ld -arch i386 -undefined dynamic_lookup \ -dylib -read_only_relocs suppress \ -S -x -Z -dead_strip_dylibs \ @@ -121,7 +121,7 @@ else $(SYMROOT)/modules/$(MODULE_NAME).dylib: $(MODULE_OBJS) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author $(SRCROOT)/obj/i386/boot2/Symbols_LINKER_ONLY.dylib Makefile - @echo "\t[LD] $(MODULE_NAME).dylib" + @echo " [LD] $(MODULE_NAME).dylib" @ld -arch i386 \ -alias _$(MODULE_START) start \ @@ -143,22 +143,22 @@ clean-local: @if [ -f "$(SYMROOT)/modules/$(MODULE_NAME).dylib" ];then \ - echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib";\ + echo " [RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib";\ fi - @for o in $(MODULE_OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @for o in $(MODULE_OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done @rm -f $(SYMROOT)/modules/$(MODULE_NAME).dylib @rm -rf $(OBJROOT) ${SYMROOT}/modules/: - @echo "\t[MKDIR] $@" + @echo " [MKDIR] $@" @$(MKDIRS) $@ .PHONY: $(SRCROOT)/sym/i386/boot_modules.h .PHONY: $(SRCROOT)/sym/i386/boot_modules.c $(SRCROOT)/sym/i386/boot_modules.c: - @echo "\tstart_built_in_module(\"$(MODULE_NAME)\", \"$(MODULE_AUTHOR)\", \"$(MODULE_DESCRIPTION)\", 0, 0, &$(MODULE_START));" >> $@ + @echo " start_built_in_module(\"$(MODULE_NAME)\", \"$(MODULE_AUTHOR)\", \"$(MODULE_DESCRIPTION)\", 0, 0, &$(MODULE_START));" >> $@ $(SRCROOT)/sym/i386/boot_modules.h: @echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@ Index: trunk/i386/modules/klibc/Cconfig =================================================================== --- trunk/i386/modules/klibc/Cconfig (revision 2407) +++ trunk/i386/modules/klibc/Cconfig (revision 2408) @@ -4,7 +4,7 @@ config KLIBC_MODULE tristate "klibc Module" - default m + default n ---help--- Say Y here if you want to enable the use of this module. Index: trunk/i386/modules/HDAEnabler/Makefile =================================================================== --- trunk/i386/modules/HDAEnabler/Makefile (revision 2407) +++ trunk/i386/modules/HDAEnabler/Makefile (revision 2408) @@ -13,7 +13,7 @@ include ../MakeInc.dir $(SYMROOT)/modules/$(MODULE_NAME).dylib: - @echo "\t[CP] $(MODULE_NAME).dylib" + @echo " [CP] $(MODULE_NAME).dylib" @cp $(MODULE_NAME).dylib $(SRCROOT)/sym/i386/modules/$(MODULE_NAME).dylib $(SRCROOT)/sym/i386/boot_modules.c: Index: trunk/i386/modules/Keylayout/layouts/Makefile =================================================================== --- trunk/i386/modules/Keylayout/layouts/Makefile (revision 2407) +++ trunk/i386/modules/Keylayout/layouts/Makefile (revision 2408) @@ -28,13 +28,13 @@ all: $(DIRS_NEEDED) $(OBJROOT) $(SYMROOT) keymaps $(PROGRAMS): $(OBJS) - @echo "\t[LD32] $(@F)_32" + @echo " [LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -arch i386 \ -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 - @echo "\t[LD64] $(@F)_64" + @echo " [LD64] $(@F)_64" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) $(INCLUDES) -arch x86_64 \ -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64 - @echo "\t[LIPO] $(@F)" + @echo " [LIPO] $(@F)" @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 \ -output $(SYMROOT)/$(@F) @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 @@ -42,16 +42,16 @@ keymaps: $(KEYBOARD_LAYOUTS) $(KEYMAPSROOT)/%.lyt: $(LAYOUTS_SRC_DIR)/%.slt $(MKLAYOUT) - @echo "\t[LAYOUT] Creating keyboard layout: $*" + @echo " [LAYOUT] Creating keyboard layout: $*" @$(MKLAYOUT) -i $< -o $@ #.PHONY layouts clean-local: - @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done - @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done - @for k in $(KEYBOARD_LAYOUTS); do if [ -f "$${k}" ];then echo "\t[RM] $${k}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done + @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo " [RM] $${p}"; fi; done + @for k in $(KEYBOARD_LAYOUTS); do if [ -f "$${k}" ];then echo " [RM] $${k}"; fi; done @$(RM) -f $(PROGRAMS) $(OBJS) distclean-local: - @if [ -d "$(KEYMAPSROOT)" ];then echo "\t[RMDIR] $(KEYMAPSROOT)"; fi + @if [ -d "$(KEYMAPSROOT)" ];then echo " [RMDIR] $(KEYMAPSROOT)"; fi @$(RM) -rf $(KEYMAPSROOT) Index: trunk/i386/modules/KernelPatcher/Cconfig =================================================================== --- trunk/i386/modules/KernelPatcher/Cconfig (revision 2407) +++ trunk/i386/modules/KernelPatcher/Cconfig (revision 2408) @@ -6,5 +6,5 @@ bool "Kernel Patcher Module" default y ---help--- - Say Y here if you want to enable to use of this module. + Say Y here if you want to enable the use of this module. Index: trunk/i386/modules/KernelPatcher/Makefile =================================================================== --- trunk/i386/modules/KernelPatcher/Makefile (revision 2407) +++ trunk/i386/modules/KernelPatcher/Makefile (revision 2408) @@ -13,7 +13,7 @@ include ../MakeInc.dir $(SYMROOT)/modules/$(MODULE_NAME).dylib: - @echo "\t[CP] $(MODULE_NAME).dylib" + @echo " [CP] $(MODULE_NAME).dylib" @cp $(MODULE_NAME).dylib $(SRCROOT)/sym/i386/modules/$(MODULE_NAME).dylib $(SRCROOT)/sym/i386/boot_modules.c: Index: trunk/i386/modules/AcpiCodec/Makefile =================================================================== --- trunk/i386/modules/AcpiCodec/Makefile (revision 2407) +++ trunk/i386/modules/AcpiCodec/Makefile (revision 2408) @@ -6,8 +6,8 @@ MODULE_START = $(MODULE_NAME)_start MODULE_DEPENDENCIES = -DIR = ACPICodec +DIR = AcpiCodec MODULE_OBJS = ACPICodec.o acpi_tools.o acpi_codec.o acpidecode.o acpicode.o -include ../MakeInc.dir \ No newline at end of file +include ../MakeInc.dir Index: trunk/i386/modules/Makefile =================================================================== --- trunk/i386/modules/Makefile (revision 2407) +++ trunk/i386/modules/Makefile (revision 2408) @@ -11,7 +11,7 @@ include ${SRCROOT}/Make.rules # The order of building modules is important. -SUBDIRS = KernelPatcher +SUBDIRS = ifdef CONFIG_KLIBC_MODULE SUBDIRS += klibc @@ -25,6 +25,14 @@ SUBDIRS += Resolution endif +ifdef CONFIG_KERNELPATCHER_MODULE +SUBDIRS += KernelPatcher +endif + +ifdef CONFIG_KEXTPATCHER_MODULE +SUBDIRS += KextPatcher +endif + ifdef CONFIG_HELLOWORLD_MODULE SUBDIRS += HelloWorld endif @@ -45,10 +53,6 @@ SUBDIRS += FileNVRAM endif -#ifdef CONFIG_KEXTPATCHER_MODULE -#SUBDIRS += KextPatcher -#endif - #ifdef CONFIG_HDAENABLER_MODULE #SUBDIRS += HDAEnabler #endif Index: trunk/i386/cdboot/Makefile =================================================================== --- trunk/i386/cdboot/Makefile (revision 2407) +++ trunk/i386/cdboot/Makefile (revision 2408) @@ -16,7 +16,7 @@ all embedtheme optionrom: $(DIRS_NEEDED) $(SYMROOT)/cdboot $(SYMROOT)/cdboot: - @echo "\t[NASM] cdboot.s" + @echo " [NASM] cdboot.s" @$(NASM) cdboot.s -o $(SYMROOT)/cdboot @dd if=$(SYMROOT)/boot of=$(SYMROOT)/cdboot conv=sync bs=2k seek=1 &> /dev/null @@ -26,5 +26,5 @@ | dd of=$(SYMROOT)/cdboot bs=1 count=4 seek=2044 conv=notrunc &> /dev/null clean-local: - @if [ -f "$(SYMROOT)/cdboot" ];then echo "\t[RM] $(SYMROOT)/cdboot"; fi + @if [ -f "$(SYMROOT)/cdboot" ];then echo " [RM] $(SYMROOT)/cdboot"; fi @rm -f $(SYMROOT)/cdboot Index: trunk/i386/libsa/Makefile =================================================================== --- trunk/i386/libsa/Makefile (revision 2407) +++ trunk/i386/libsa/Makefile (revision 2408) @@ -36,17 +36,17 @@ $(LIBS): $(OBJS) - @echo "\t[RM] $@" + @echo " [RM] $@" @rm -f $@ - @echo "\t[AR] $(@F)" + @echo " [AR] $(@F)" @ar q $@ $^ &> /dev/null - @echo "\t[RANLIB] $(@F)" + @echo " [RANLIB] $(@F)" @ranlib $@ # dependencies -include $(OBJROOT)/Makedep clean-local: - @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done - @for l in $(LIBS); do if [ -f "$${l}" ];then echo "\t[RM] $${l}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done + @for l in $(LIBS); do if [ -f "$${l}" ];then echo " [RM] $${l}"; fi; done @rm -f $(LIBS) $(OBJS) Index: trunk/i386/util/fdisk/Makefile =================================================================== --- trunk/i386/util/fdisk/Makefile (revision 2407) +++ trunk/i386/util/fdisk/Makefile (revision 2408) @@ -29,11 +29,11 @@ all: $(SYMROOT) $(OBJROOT) $(PROGRAM) $(PROGRAM): $(OBJS) - @echo "\t[LD32] $@_32" + @echo " [LD32] $@_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $@_32 $(filter %.o32,$^) - @echo "\t[LD64] $@_64" + @echo " [LD64] $@_64" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $@_64 $(filter %.o64,$^) - @echo "\t[LIPO] $@" + @echo " [LIPO] $@" @lipo -create -arch i386 $@_32 -arch x86_64 $@_64 -output $@ @rm $@_32 $@_64 @@ -48,6 +48,6 @@ -include $(OBJROOT)/Makedep clean-local: - @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done - @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @for p in $(PROGRAMS); do if [ -f "$${p}" ];then echo " [RM] $${p}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done @rm -f $(PROGRAM) $(OBJS) Index: trunk/i386/util/Makefile =================================================================== --- trunk/i386/util/Makefile (revision 2407) +++ trunk/i386/util/Makefile (revision 2408) @@ -12,7 +12,6 @@ IMGSKELROOT = $(SRCROOT)/imgskel CDBOOT = ${IMGROOT}/usr/standalone/i386/cdboot - DIR = util include ${SRCROOT}/Make.rules @@ -43,11 +42,11 @@ all: $(DIRS_NEEDED) $(SYMPROG) all-recursive $(SYMPROG): $(OBJS) - @echo "\t[LD32] $(@F)_32" + @echo " [LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 - @echo "\t[LD64] $(@F)_64" + @echo " [LD64] $(@F)_64" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch x86_64 -o $(SYMROOT)/$(@F)_64 $(OBJROOT)/$(@F).o64 - @echo "\t[LIPO] $(@F)" + @echo " [LIPO] $(@F)" @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 @@ -55,6 +54,6 @@ -include $(OBJROOT)/Makedep clean-local: - @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done - @for p in $(SYMPROG); do if [ -f "$${p}" ];then echo "\t[RM] $${p}"; fi; done + @for o in $(OBJS); do if [ -f "$${o}" ];then echo " [RM] $${o}"; fi; done + @for p in $(SYMPROG); do if [ -f "$${p}" ];then echo " [RM] $${p}"; fi; done @rm -f $(SYMPROG) $(OBJS) Index: trunk/Make.rules =================================================================== --- trunk/Make.rules (revision 2407) +++ trunk/Make.rules (revision 2408) @@ -54,22 +54,22 @@ $(OBJROOT)/%.o: %.c - @echo "\t[CC] $<" + @echo " [CC] $<" @$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $@.Makedep @$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ $(OBJROOT)/%.o: %.m - @echo "\t[M] $<" + @echo " [M] $<" @$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -MM -M -o $@.Makedep @$(CC) $(CFLAGS) $(DEFINES) -c $(INC) $< -o $@ $(OBJROOT)/%.o: %.cpp - @echo "\t[CPP] $<" + @echo " [CPP] $<" @$(CPP) $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -MM -M -o $@.Makedep @$(CPP) $(CPPFLAGS) $(CFLAGS) -c "$<" $(INC) -o $@ $(OBJROOT)/%.o: %.s - @echo "\t[AS] $<" + @echo " [AS] $<" @$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -MM -M -o $@.Makedep @$(CC) $(CPPFLAGS) -c $(INC) -arch i386 $< -o $@ @@ -89,7 +89,7 @@ # This breaks make, must use make all (FIXME) $(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT): - @echo "\t[MKDIR] $@" + @echo " [MKDIR] $@" @$(MKDIRS) $@ # Recursive rules @@ -127,13 +127,13 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $$local_target) \ + (cd $$subdir && $(MAKE) --no-print-directory $$local_target) \ || eval $$failcom; \ done clean-dep: - @if [ -f "$(OBJROOT)/Makedep" ];then echo "\t[RM] $(OBJROOT)/Makedep"; fi + @if [ -f "$(OBJROOT)/Makedep" ];then echo " [RM] $(OBJROOT)/Makedep"; fi @rm -f $(OBJROOT)/Makedep @@ -141,11 +141,11 @@ # clean: remove almost everything (execpt auto.conf, autoconf.h, autoconf.inc) clean: clean-recursive clean-dep - @if [ -d "$(OBJROOT)" ];then echo "\t[RMDIR] $(OBJROOT)"; fi - @if [ -d "$(SYMROOT)" ];then echo "\t[RMDIR] $(SYMROOT)"; fi - @if [ -d "$(DSTROOT)" ];then echo "\t[RMDIR] $(DSTROOT)"; fi + @if [ -d "$(OBJROOT)" ];then echo " [RMDIR] $(OBJROOT)"; fi + @if [ -d "$(SYMROOT)" ];then echo " [RMDIR] $(SYMROOT)"; fi + @if [ -d "$(DSTROOT)" ];then echo " [RMDIR] $(DSTROOT)"; fi @if [ -d "$(SRCROOT)/i386/modules/module_includes" ];then \ - echo "\t[RMDIR] $(SRCROOT)/i386/modules/module_includes"; \ + echo " [RMDIR] $(SRCROOT)/i386/modules/module_includes"; \ fi @rm -rf $(OBJROOT) $(SYMROOT) $(DSTROOT) \ $(SRCROOT)/i386/modules/module_includes Index: trunk/CHANGES =================================================================== --- trunk/CHANGES (revision 2407) +++ trunk/CHANGES (revision 2408) @@ -1,3 +1,7 @@ +- Temp disable klibc module +- Silence output. +- Add --no-print-directory. +- Replace \t with tab. - Update Chameleon.xcodeproj - ErmaC : Merge LZVN decompression routine by MinusZwei (C Conversion) based on works from Pike R. Alpha and AnV Software (Andy Vandijck). - Bungo : Loading custom ECDT.aml, Darwin version string printing, clean boot-args, change firmware rev. to real Mac (0x0001000a), added kernel-compatibility, boot-file, boot-args, machine-signature, random-seed DT properties & some minor changes.