Chameleon

Chameleon Commit Details

Date:2014-10-20 19:52:20 (5 years 9 months ago)
Author:ErmaC
Commit:2408
Parents: 2407
Message:- Temp disable klibc module, silence output, add --no-print-directory, replace \t with tab.
Changes:
M/trunk/i386/modules/klibc/Cconfig
M/trunk/i386/libsa/Makefile
M/trunk/i386/modules/KernelPatcher/Cconfig
M/trunk/i386/modules/FileNVRAM/Makefile
M/trunk/i386/modules/HDAEnabler/Makefile
M/trunk/i386/modules/Keylayout/layouts/Makefile
M/trunk/i386/modules/KernelPatcher/Makefile
M/trunk/Make.rules
M/trunk/CHANGES
M/trunk/i386/config/Makefile
M/trunk/i386/modules/Makefile
M/trunk/i386/cdboot/Makefile
M/trunk/i386/util/fdisk/Makefile
M/trunk/i386/util/Makefile
M/trunk/i386/modules/MakeInc.dir
M/trunk/i386/libsaio/Makefile
M/trunk/i386/modules/AcpiCodec/Makefile
M/trunk/i386/boot0/Makefile
M/trunk/i386/boot1/Makefile
M/trunk/i386/klibc/Makefile
M/trunk/i386/boot2/Makefile

File differences

trunk/i386/libsaio/Makefile
5151
5252
5353
54
54
5555
56
56
5757
58
58
5959
6060
6161
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:
trunk/i386/boot0/Makefile
1818
1919
2020
21
21
2222
2323
2424
25
25
2626
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)
trunk/i386/boot1/Makefile
3333
3434
3535
36
36
3737
3838
3939
......
4141
4242
4343
44
44
4545
$(PROGRAMS): $(SRCROOT)/autoconf.inc
@echo "\t[NASM] $(@F)"
@echo "[NASM] $(@F)"
@$(NASM) $(@F).s -o $@
install_i386:: all $(INSTALLDIR)
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)
trunk/i386/klibc/Makefile
3434
3535
3636
37
37
3838
39
39
4040
41
41
4242
4343
4444
4545
4646
4747
48
49
48
49
5050
$(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)
trunk/i386/boot2/Makefile
2929
3030
3131
32
33
32
33
3434
35
35
3636
3737
3838
......
4848
4949
5050
51
51
5252
5353
5454
......
8282
8383
8484
85
85
8686
8787
8888
......
9494
9595
9696
97
97
9898
9999
100
100
101101
102102
103103
......
114114
115115
116116
117
117
118118
119119
120
120
121121
122122
123123
......
142142
143143
144144
145
145
146146
147147
148148
......
155155
156156
157157
158
158
159159
160160
161161
......
190190
191191
192192
193
193
194194
195195
196196
......
204204
205205
206206
207
208
207
208
209209
210210
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
# 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
@${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 \
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 \
@${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 \
-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` \
endif
@echo "\t[MACHOCONV] boot"
@echo "[MACHOCONV] boot"
@$(SYMROOT)/machOconv ${SYMROOT}/$@.sys $(SYMROOT)/$@ &> /dev/null
@( size=`ls -l $(SYMROOT)/boot | awk '{ print $$5}'` ; \
@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 ;\
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)
trunk/i386/config/Makefile
3333
3434
3535
36
36
3737
38
38
3939
40
40
4141
4242
4343
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
trunk/i386/modules/FileNVRAM/Makefile
1313
1414
1515
16
16
1717
1818
1919
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:
trunk/i386/modules/MakeInc.dir
105105
106106
107107
108
108
109109
110110
111111
......
121121
122122
123123
124
124
125125
126126
127127
......
143143
144144
145145
146
146
147147
148
148
149149
150150
151151
152152
153153
154
154
155155
156156
157157
158158
159159
160160
161
161
162162
163163
164164
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 \
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 \
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)" >> $@
trunk/i386/modules/klibc/Cconfig
44
55
66
7
7
88
99
1010
config KLIBC_MODULE
tristate "klibc Module"
default m
default n
---help---
Say Y here if you want to enable the use of this module.
trunk/i386/modules/HDAEnabler/Makefile
1313
1414
1515
16
16
1717
1818
1919
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:
trunk/i386/modules/Keylayout/layouts/Makefile
2828
2929
3030
31
31
3232
3333
34
34
3535
3636
37
37
3838
3939
4040
......
4242
4343
4444
45
45
4646
4747
4848
4949
50
51
52
50
51
52
5353
5454
5555
56
56
5757
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
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)
trunk/i386/modules/KernelPatcher/Cconfig
66
77
88
9
9
1010
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.
trunk/i386/modules/KernelPatcher/Makefile
1313
1414
1515
16
16
1717
1818
1919
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:
trunk/i386/modules/AcpiCodec/Makefile
66
77
88
9
9
1010
1111
1212
13
13
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
include ../MakeInc.dir
trunk/i386/modules/Makefile
1111
1212
1313
14
14
1515
1616
1717
......
2525
2626
2727
28
29
30
31
32
33
34
35
2836
2937
3038
......
4553
4654
4755
48
49
50
51
5256
5357
5458
include ${SRCROOT}/Make.rules
# The order of building modules is important.
SUBDIRS = KernelPatcher
SUBDIRS =
ifdef CONFIG_KLIBC_MODULE
SUBDIRS += klibc
SUBDIRS += Resolution
endif
ifdef CONFIG_KERNELPATCHER_MODULE
SUBDIRS += KernelPatcher
endif
ifdef CONFIG_KEXTPATCHER_MODULE
SUBDIRS += KextPatcher
endif
ifdef CONFIG_HELLOWORLD_MODULE
SUBDIRS += HelloWorld
endif
SUBDIRS += FileNVRAM
endif
#ifdef CONFIG_KEXTPATCHER_MODULE
#SUBDIRS += KextPatcher
#endif
#ifdef CONFIG_HDAENABLER_MODULE
#SUBDIRS += HDAEnabler
#endif
trunk/i386/cdboot/Makefile
1616
1717
1818
19
19
2020
2121
2222
......
2626
2727
2828
29
29
3030
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
| 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
trunk/i386/libsa/Makefile
3636
3737
3838
39
39
4040
41
41
4242
43
43
4444
4545
4646
4747
4848
4949
50
51
50
51
5252
$(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)
trunk/i386/util/fdisk/Makefile
2929
3030
3131
32
32
3333
34
34
3535
36
36
3737
3838
3939
......
4848
4949
5050
51
52
51
52
5353
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
-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)
trunk/i386/util/Makefile
1212
1313
1414
15
1615
1716
1817
......
4342
4443
4544
46
45
4746
48
47
4948
50
49
5150
5251
5352
......
5554
5655
5756
58
59
57
58
6059
IMGSKELROOT = $(SRCROOT)/imgskel
CDBOOT = ${IMGROOT}/usr/standalone/i386/cdboot
DIR = util
include ${SRCROOT}/Make.rules
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
-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)
trunk/Make.rules
5454
5555
5656
57
57
5858
5959
6060
6161
62
62
6363
6464
6565
6666
67
67
6868
6969
7070
7171
72
72
7373
7474
7575
......
8989
9090
9191
92
92
9393
9494
9595
......
127127
128128
129129
130
130
131131
132132
133133
134134
135135
136
136
137137
138138
139139
......
141141
142142
143143
144
145
146
144
145
146
147147
148
148
149149
150150
151151
$(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 $@
# This breaks make, must use make all (FIXME)
$(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT):
@echo "\t[MKDIR] $@"
@echo "[MKDIR] $@"
@$(MKDIRS) $@
# Recursive rules
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
# 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
trunk/CHANGES
1
2
3
4
15
26
37
- 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.

Archive Download the corresponding diff file

Revision: 2408