Index: trunk/Chameleon.xcodeproj/project.pbxproj =================================================================== --- trunk/Chameleon.xcodeproj/project.pbxproj (revision 1503) +++ trunk/Chameleon.xcodeproj/project.pbxproj (revision 1504) @@ -649,6 +649,235 @@ 6DBAFFC313B0D4590047ED33 /* ufsmount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ufsmount.h; sourceTree = ""; }; 6DBAFFC413B0D4590047ED33 /* unistd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unistd.h; sourceTree = ""; }; 6DBAFFC513B0D4590047ED33 /* unwind.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unwind.h; sourceTree = ""; }; + A3561C731413FD7800E9B51E /* auto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = auto.c; sourceTree = ""; }; + A3561C741413FD7800E9B51E /* auto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = auto.h; sourceTree = ""; }; + A3561C751413FD7800E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561C761413FD7800E9B51E /* cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cmd.c; sourceTree = ""; }; + A3561C771413FD7800E9B51E /* cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cmd.h; sourceTree = ""; }; + A3561C781413FD7800E9B51E /* disk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disk.c; sourceTree = ""; }; + A3561C791413FD7800E9B51E /* disk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = disk.h; sourceTree = ""; }; + A3561C7A1413FD7800E9B51E /* fdisk.8 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fdisk.8; sourceTree = ""; }; + A3561C7B1413FD7800E9B51E /* fdisk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fdisk.c; sourceTree = ""; }; + A3561C7C1413FD7800E9B51E /* getrawpartition.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = getrawpartition.c; sourceTree = ""; }; + A3561C7D1413FD7800E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561C7E1413FD7800E9B51E /* mbr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mbr.c; sourceTree = ""; }; + A3561C7F1413FD7800E9B51E /* mbr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mbr.h; sourceTree = ""; }; + A3561C801413FD7800E9B51E /* mbrcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mbrcode.h; sourceTree = ""; }; + A3561C811413FD7800E9B51E /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = ""; }; + A3561C821413FD7800E9B51E /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; + A3561C831413FD7800E9B51E /* opendev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opendev.c; sourceTree = ""; }; + A3561C841413FD7800E9B51E /* part.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = part.c; sourceTree = ""; }; + A3561C851413FD7800E9B51E /* part.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = part.h; sourceTree = ""; }; + A3561C861413FD7800E9B51E /* user.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = user.c; sourceTree = ""; }; + A3561C871413FD7800E9B51E /* user.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = user.h; sourceTree = ""; }; + A3561C881413FD7800E9B51E /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = ""; }; + A3561C891413FD7800E9B51E /* openUp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openUp.c; sourceTree = ""; }; + A3561C8A1413FD7800E9B51E /* dyldsymboltool.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dyldsymboltool.c; sourceTree = ""; }; + A3561C8B1413FD7800E9B51E /* bdmesg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bdmesg.c; sourceTree = ""; }; + A3561CAC1414024C00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561CAE1414024C00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561CAF1414024C00E9B51E /* HelloWorld.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HelloWorld.cpp; sourceTree = ""; }; + A3561CB11414024C00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561CB31414024C00E9B51E /* modules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = modules; sourceTree = ""; }; + A3561CB61414024D00E9B51E /* test */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = test; sourceTree = ""; }; + A3561CB81414024D00E9B51E /* __ashldi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __ashldi3.c; sourceTree = ""; }; + A3561CB91414024D00E9B51E /* __ashrdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __ashrdi3.c; sourceTree = ""; }; + A3561CBA1414024D00E9B51E /* __clzsi2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __clzsi2.c; sourceTree = ""; }; + A3561CBB1414024D00E9B51E /* __divdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __divdi3.c; sourceTree = ""; }; + A3561CBC1414024D00E9B51E /* __divsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __divsi3.c; sourceTree = ""; }; + A3561CBD1414024D00E9B51E /* __lshrdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __lshrdi3.c; sourceTree = ""; }; + A3561CBE1414024D00E9B51E /* __moddi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __moddi3.c; sourceTree = ""; }; + A3561CBF1414024D00E9B51E /* __modsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __modsi3.c; sourceTree = ""; }; + A3561CC01414024D00E9B51E /* __udivdi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivdi3.c; sourceTree = ""; }; + A3561CC11414024D00E9B51E /* __udivmoddi4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivmoddi4.c; sourceTree = ""; }; + A3561CC21414024D00E9B51E /* __udivmodsi4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivmodsi4.c; sourceTree = ""; }; + A3561CC31414024D00E9B51E /* __udivsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __udivsi3.c; sourceTree = ""; }; + A3561CC41414024D00E9B51E /* __umoddi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __umoddi3.c; sourceTree = ""; }; + A3561CC51414024D00E9B51E /* __umodsi3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = __umodsi3.c; sourceTree = ""; }; + A3561CC61414024D00E9B51E /* atexit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atexit.c; sourceTree = ""; }; + A3561CC71414024D00E9B51E /* atexit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = atexit.h; sourceTree = ""; }; + A3561CC81414024D00E9B51E /* atoi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atoi.c; sourceTree = ""; }; + A3561CC91414024D00E9B51E /* atol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atol.c; sourceTree = ""; }; + A3561CCA1414024D00E9B51E /* atoll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atoll.c; sourceTree = ""; }; + A3561CCB1414024D00E9B51E /* atox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = atox.c; sourceTree = ""; }; + A3561CCC1414024D00E9B51E /* bsearch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bsearch.c; sourceTree = ""; }; + A3561CCD1414024D00E9B51E /* calloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = calloc.c; sourceTree = ""; }; + A3561CCE1414024D00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561CCF1414024D00E9B51E /* exit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = exit.c; sourceTree = ""; }; + A3561CD01414024D00E9B51E /* jrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jrand48.c; sourceTree = ""; }; + A3561CD11414024D00E9B51E /* klibc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = klibc.c; sourceTree = ""; }; + A3561CD21414024D00E9B51E /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; + A3561CD31414024D00E9B51E /* limits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = limits.h; sourceTree = ""; }; + A3561CD41414024D00E9B51E /* lrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lrand48.c; sourceTree = ""; }; + A3561CD51414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561CD61414024D00E9B51E /* memccpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memccpy.c; sourceTree = ""; }; + A3561CD71414024D00E9B51E /* memchr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memchr.c; sourceTree = ""; }; + A3561CD81414024D00E9B51E /* memmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memmem.c; sourceTree = ""; }; + A3561CD91414024D00E9B51E /* memmove.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memmove.c; sourceTree = ""; }; + A3561CDA1414024D00E9B51E /* memrchr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memrchr.c; sourceTree = ""; }; + A3561CDB1414024D00E9B51E /* memswap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memswap.c; sourceTree = ""; }; + A3561CDC1414024D00E9B51E /* mrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mrand48.c; sourceTree = ""; }; + A3561CDD1414024D00E9B51E /* nrand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nrand48.c; sourceTree = ""; }; + A3561CDE1414024D00E9B51E /* onexit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = onexit.c; sourceTree = ""; }; + A3561CDF1414024D00E9B51E /* qsort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qsort.c; sourceTree = ""; }; + A3561CE01414024D00E9B51E /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; + A3561CE11414024D00E9B51E /* seed48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = seed48.c; sourceTree = ""; }; + A3561CE21414024D00E9B51E /* sha1hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1hash.c; sourceTree = ""; }; + A3561CE31414024D00E9B51E /* snprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snprintf.c; sourceTree = ""; }; + A3561CE41414024D00E9B51E /* srand48.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = srand48.c; sourceTree = ""; }; + A3561CE51414024D00E9B51E /* sscanf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sscanf.c; sourceTree = ""; }; + A3561CE61414024D00E9B51E /* strcasecmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strcasecmp.c; sourceTree = ""; }; + A3561CE71414024D00E9B51E /* strdup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strdup.c; sourceTree = ""; }; + A3561CE81414024D00E9B51E /* strlcat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strlcat.c; sourceTree = ""; }; + A3561CE91414024D00E9B51E /* strncasecmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strncasecmp.c; sourceTree = ""; }; + A3561CEA1414024D00E9B51E /* strndup.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strndup.c; sourceTree = ""; }; + A3561CEB1414024D00E9B51E /* strnlen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strnlen.c; sourceTree = ""; }; + A3561CEC1414024D00E9B51E /* strntoimax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strntoimax.c; sourceTree = ""; }; + A3561CED1414024D00E9B51E /* strntoumax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strntoumax.c; sourceTree = ""; }; + A3561CEE1414024D00E9B51E /* strpbrk.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strpbrk.c; sourceTree = ""; }; + A3561CEF1414024D00E9B51E /* strsep.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strsep.c; sourceTree = ""; }; + A3561CF01414024D00E9B51E /* strtoimax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoimax.c; sourceTree = ""; }; + A3561CF11414024D00E9B51E /* strtok.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtok.c; sourceTree = ""; }; + A3561CF21414024D00E9B51E /* strtok_r.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtok_r.c; sourceTree = ""; }; + A3561CF31414024D00E9B51E /* strtol.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtol.c; sourceTree = ""; }; + A3561CF41414024D00E9B51E /* strtoll.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoll.c; sourceTree = ""; }; + A3561CF51414024D00E9B51E /* strtotimespec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtotimespec.c; sourceTree = ""; }; + A3561CF61414024D00E9B51E /* strtotimeval.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtotimeval.c; sourceTree = ""; }; + A3561CF71414024D00E9B51E /* strtotimex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtotimex.c; sourceTree = ""; }; + A3561CF81414024D00E9B51E /* strtoul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoul.c; sourceTree = ""; }; + A3561CF91414024D00E9B51E /* strtoull.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoull.c; sourceTree = ""; }; + A3561CFA1414024D00E9B51E /* strtoumax.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtoumax.c; sourceTree = ""; }; + A3561CFB1414024D00E9B51E /* strtox.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strtox.c; sourceTree = ""; }; + A3561CFC1414024D00E9B51E /* strxspn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = strxspn.c; sourceTree = ""; }; + A3561CFD1414024D00E9B51E /* strxspn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strxspn.h; sourceTree = ""; }; + A3561CFE1414024D00E9B51E /* version */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = version; sourceTree = ""; }; + A3561CFF1414024D00E9B51E /* vsnprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vsnprintf.c; sourceTree = ""; }; + A3561D001414024D00E9B51E /* vsscanf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vsscanf.c; sourceTree = ""; }; + A3561D011414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D021414024D00E9B51E /* MakeInc.dir */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MakeInc.dir; sourceTree = ""; }; + A3561D031414024D00E9B51E /* Modules.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Modules.txt; sourceTree = ""; }; + A3561D051414024D00E9B51E /* 915resolution.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = 915resolution.c; sourceTree = ""; }; + A3561D061414024D00E9B51E /* 915resolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 915resolution.h; sourceTree = ""; }; + A3561D071414024D00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561D081414024D00E9B51E /* edid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = edid.c; sourceTree = ""; }; + A3561D0A1414024D00E9B51E /* edid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = edid.h; sourceTree = ""; }; + A3561D0B1414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D0C1414024D00E9B51E /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; + A3561D0D1414024D00E9B51E /* Resolution.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = Resolution.c; sourceTree = ""; }; + A3561D0E1414024D00E9B51E /* shortatombios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shortatombios.h; sourceTree = ""; }; + A3561D101414024D00E9B51E /* abi.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = abi.cpp; sourceTree = ""; }; + A3561D111414024D00E9B51E /* algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = algorithm.cpp; sourceTree = ""; }; + A3561D121414024D00E9B51E /* associative_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = associative_base.cpp; sourceTree = ""; }; + A3561D131414024D00E9B51E /* bitset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bitset.cpp; sourceTree = ""; }; + A3561D141414024D00E9B51E /* Cconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cconfig; sourceTree = ""; }; + A3561D151414024D00E9B51E /* char_traits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = char_traits.cpp; sourceTree = ""; }; + A3561D161414024D00E9B51E /* complex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = complex.cpp; sourceTree = ""; }; + A3561D171414024D00E9B51E /* del_op.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_op.cpp; sourceTree = ""; }; + A3561D181414024D00E9B51E /* del_opnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_opnt.cpp; sourceTree = ""; }; + A3561D191414024D00E9B51E /* del_opv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_opv.cpp; sourceTree = ""; }; + A3561D1A1414024D00E9B51E /* del_opvnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = del_opvnt.cpp; sourceTree = ""; }; + A3561D1B1414024D00E9B51E /* deque.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deque.cpp; sourceTree = ""; }; + A3561D1C1414024D00E9B51E /* eh_alloc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eh_alloc.cpp; sourceTree = ""; }; + A3561D1D1414024D00E9B51E /* eh_globals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eh_globals.cpp; sourceTree = ""; }; + A3561D1E1414024D00E9B51E /* exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = exception.cpp; sourceTree = ""; }; + A3561D1F1414024D00E9B51E /* fstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fstream.cpp; sourceTree = ""; }; + A3561D201414024D00E9B51E /* func_exception.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = func_exception.cpp; sourceTree = ""; }; + A3561D221414024D00E9B51E /* algorithm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = algorithm; sourceTree = ""; }; + A3561D231414024D00E9B51E /* associative_base */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = associative_base; sourceTree = ""; }; + A3561D241414024D00E9B51E /* basic_definitions */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = basic_definitions; sourceTree = ""; }; + A3561D251414024D00E9B51E /* bitset */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bitset; sourceTree = ""; }; + A3561D261414024D00E9B51E /* cassert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cassert; sourceTree = ""; }; + A3561D271414024D00E9B51E /* cctype */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cctype; sourceTree = ""; }; + A3561D281414024D00E9B51E /* cerrno */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cerrno; sourceTree = ""; }; + A3561D291414024D00E9B51E /* cfloat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cfloat; sourceTree = ""; }; + A3561D2A1414024D00E9B51E /* char_traits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = char_traits; sourceTree = ""; }; + A3561D2B1414024D00E9B51E /* climits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = climits; sourceTree = ""; }; + A3561D2C1414024D00E9B51E /* clocale */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = clocale; sourceTree = ""; }; + A3561D2D1414024D00E9B51E /* cmath */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cmath; sourceTree = ""; }; + A3561D2E1414024D00E9B51E /* complex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = complex; sourceTree = ""; }; + A3561D2F1414024D00E9B51E /* csetjmp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = csetjmp; sourceTree = ""; }; + A3561D301414024D00E9B51E /* csignal */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = csignal; sourceTree = ""; }; + A3561D311414024D00E9B51E /* cstdarg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstdarg; sourceTree = ""; }; + A3561D321414024D00E9B51E /* cstddef */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstddef; sourceTree = ""; }; + A3561D331414024D00E9B51E /* cstdio */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstdio; sourceTree = ""; }; + A3561D341414024D00E9B51E /* cstdlib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstdlib; sourceTree = ""; }; + A3561D351414024D00E9B51E /* cstring */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cstring; sourceTree = ""; }; + A3561D361414024D00E9B51E /* ctime */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ctime; sourceTree = ""; }; + A3561D371414024D00E9B51E /* cwchar */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cwchar; sourceTree = ""; }; + A3561D381414024D00E9B51E /* cwctype */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cwctype; sourceTree = ""; }; + A3561D391414024D00E9B51E /* deque */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = deque; sourceTree = ""; }; + A3561D3A1414024D00E9B51E /* exception */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = exception; sourceTree = ""; }; + A3561D3B1414024D00E9B51E /* fstream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = fstream; sourceTree = ""; }; + A3561D3C1414024D00E9B51E /* func_exception */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = func_exception; sourceTree = ""; }; + A3561D3D1414024D00E9B51E /* functional */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = functional; sourceTree = ""; }; + A3561D3E1414024D00E9B51E /* iomanip */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iomanip; sourceTree = ""; }; + A3561D3F1414024D00E9B51E /* ios */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ios; sourceTree = ""; }; + A3561D401414024D00E9B51E /* iosfwd */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iosfwd; sourceTree = ""; }; + A3561D411414024D00E9B51E /* iostream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iostream; sourceTree = ""; }; + A3561D421414024D00E9B51E /* istream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = istream; sourceTree = ""; }; + A3561D431414024D00E9B51E /* istream_helpers */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = istream_helpers; sourceTree = ""; }; + A3561D441414024D00E9B51E /* iterator */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iterator; sourceTree = ""; }; + A3561D451414024D00E9B51E /* iterator_base */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = iterator_base; sourceTree = ""; }; + A3561D461414024D00E9B51E /* limits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = limits; sourceTree = ""; }; + A3561D471414024D00E9B51E /* list */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = list; sourceTree = ""; }; + A3561D481414024D00E9B51E /* locale */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = locale; sourceTree = ""; }; + A3561D491414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D4A1414024D00E9B51E /* map */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = map; sourceTree = ""; }; + A3561D4B1414024D00E9B51E /* map.old */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = map.old; sourceTree = ""; }; + A3561D4C1414024D00E9B51E /* memory */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = memory; sourceTree = ""; }; + A3561D4D1414024D00E9B51E /* new */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = new; sourceTree = ""; }; + A3561D4E1414024D00E9B51E /* numeric */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = numeric; sourceTree = ""; }; + A3561D4F1414024D00E9B51E /* ostream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ostream; sourceTree = ""; }; + A3561D501414024D00E9B51E /* ostream_helpers */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ostream_helpers; sourceTree = ""; }; + A3561D511414024D00E9B51E /* queue */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = queue; sourceTree = ""; }; + A3561D521414024D00E9B51E /* set */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set; sourceTree = ""; }; + A3561D531414024D00E9B51E /* set.old */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = set.old; sourceTree = ""; }; + A3561D541414024D00E9B51E /* sstream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sstream; sourceTree = ""; }; + A3561D551414024D00E9B51E /* stack */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stack; sourceTree = ""; }; + A3561D561414024D00E9B51E /* stdexcept */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stdexcept; sourceTree = ""; }; + A3561D571414024D00E9B51E /* streambuf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = streambuf; sourceTree = ""; }; + A3561D581414024D00E9B51E /* string */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = string; sourceTree = ""; }; + A3561D591414024D00E9B51E /* string_iostream */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = string_iostream; sourceTree = ""; }; + A3561D5A1414024D00E9B51E /* support */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = support; sourceTree = ""; }; + A3561D5B1414024D00E9B51E /* system_configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system_configuration.h; sourceTree = ""; }; + A3561D5C1414024D00E9B51E /* type_traits */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = type_traits; sourceTree = ""; }; + A3561D5D1414024D00E9B51E /* typeinfo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = typeinfo; sourceTree = ""; }; + A3561D5E1414024D00E9B51E /* types */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = types; sourceTree = ""; }; + A3561D5F1414024D00E9B51E /* unwind-cxx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "unwind-cxx.h"; sourceTree = ""; }; + A3561D601414024D00E9B51E /* utility */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = utility; sourceTree = ""; }; + A3561D611414024D00E9B51E /* valarray */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = valarray; sourceTree = ""; }; + A3561D621414024D00E9B51E /* vector */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vector; sourceTree = ""; }; + A3561D631414024D00E9B51E /* iomanip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iomanip.cpp; sourceTree = ""; }; + A3561D641414024D00E9B51E /* ios.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ios.cpp; sourceTree = ""; }; + A3561D651414024D00E9B51E /* iostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iostream.cpp; sourceTree = ""; }; + A3561D661414024D00E9B51E /* istream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = istream.cpp; sourceTree = ""; }; + A3561D671414024D00E9B51E /* iterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iterator.cpp; sourceTree = ""; }; + A3561D681414024D00E9B51E /* limits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = limits.cpp; sourceTree = ""; }; + A3561D691414024D00E9B51E /* list.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = list.cpp; sourceTree = ""; }; + A3561D6A1414024D00E9B51E /* locale.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locale.cpp; sourceTree = ""; }; + A3561D6B1414024D00E9B51E /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + A3561D6C1414024D00E9B51E /* map.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = map.cpp; sourceTree = ""; }; + A3561D6D1414024D00E9B51E /* new_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_handler.cpp; sourceTree = ""; }; + A3561D6E1414024D00E9B51E /* new_op.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_op.cpp; sourceTree = ""; }; + A3561D6F1414024D00E9B51E /* new_opnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_opnt.cpp; sourceTree = ""; }; + A3561D701414024D00E9B51E /* new_opv.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_opv.cpp; sourceTree = ""; }; + A3561D711414024D00E9B51E /* new_opvnt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = new_opvnt.cpp; sourceTree = ""; }; + A3561D721414024D00E9B51E /* numeric.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = numeric.cpp; sourceTree = ""; }; + A3561D731414024D00E9B51E /* ostream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ostream.cpp; sourceTree = ""; }; + A3561D741414024D00E9B51E /* queue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = queue.cpp; sourceTree = ""; }; + A3561D751414024D00E9B51E /* Readme.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Readme.txt; sourceTree = ""; }; + A3561D761414024D00E9B51E /* set.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = set.cpp; sourceTree = ""; }; + A3561D771414024D00E9B51E /* sstream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sstream.cpp; sourceTree = ""; }; + A3561D781414024D00E9B51E /* stack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stack.cpp; sourceTree = ""; }; + A3561D791414024D00E9B51E /* stdexcept.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stdexcept.cpp; sourceTree = ""; }; + A3561D7A1414024D00E9B51E /* streambuf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = streambuf.cpp; sourceTree = ""; }; + A3561D7B1414024D00E9B51E /* string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string.cpp; sourceTree = ""; }; + A3561D7C1414024D00E9B51E /* support.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = support.cpp; sourceTree = ""; }; + A3561D7D1414024D00E9B51E /* typeinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = typeinfo.cpp; sourceTree = ""; }; + A3561D7E1414024D00E9B51E /* uClibc++.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "uClibc++.c"; sourceTree = ""; }; + A3561D7F1414024D00E9B51E /* utility.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = utility.cpp; sourceTree = ""; }; + A3561D801414024D00E9B51E /* valarray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = valarray.cpp; sourceTree = ""; }; + A3561D811414024D00E9B51E /* vector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vector.cpp; sourceTree = ""; }; A360AA7D14136C1A00084D3F /* Make.rules */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Make.rules; sourceTree = ""; }; B0056CE711F3868000754B65 /* boot0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = boot0.s; sourceTree = ""; }; B0056CE811F3868000754B65 /* chain0.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = chain0.s; sourceTree = ""; }; @@ -2038,6 +2267,326 @@ path = ufs; sourceTree = ""; }; + A3561C721413FD7800E9B51E /* fdisk */ = { + isa = PBXGroup; + children = ( + A3561C731413FD7800E9B51E /* auto.c */, + A3561C741413FD7800E9B51E /* auto.h */, + A3561C751413FD7800E9B51E /* Cconfig */, + A3561C761413FD7800E9B51E /* cmd.c */, + A3561C771413FD7800E9B51E /* cmd.h */, + A3561C781413FD7800E9B51E /* disk.c */, + A3561C791413FD7800E9B51E /* disk.h */, + A3561C7A1413FD7800E9B51E /* fdisk.8 */, + A3561C7B1413FD7800E9B51E /* fdisk.c */, + A3561C7C1413FD7800E9B51E /* getrawpartition.c */, + A3561C7D1413FD7800E9B51E /* Makefile */, + A3561C7E1413FD7800E9B51E /* mbr.c */, + A3561C7F1413FD7800E9B51E /* mbr.h */, + A3561C801413FD7800E9B51E /* mbrcode.h */, + A3561C811413FD7800E9B51E /* misc.c */, + A3561C821413FD7800E9B51E /* misc.h */, + A3561C831413FD7800E9B51E /* opendev.c */, + A3561C841413FD7800E9B51E /* part.c */, + A3561C851413FD7800E9B51E /* part.h */, + A3561C861413FD7800E9B51E /* user.c */, + A3561C871413FD7800E9B51E /* user.h */, + A3561C881413FD7800E9B51E /* util.h */, + ); + path = fdisk; + sourceTree = ""; + }; + A3561CAB1414024C00E9B51E /* modules */ = { + isa = PBXGroup; + children = ( + A3561CAC1414024C00E9B51E /* Cconfig */, + A3561CAD1414024C00E9B51E /* HelloWorld */, + A3561CB21414024C00E9B51E /* include */, + A3561CB41414024C00E9B51E /* Keylayout */, + A3561CB71414024D00E9B51E /* klibc */, + A3561D011414024D00E9B51E /* Makefile */, + A3561D021414024D00E9B51E /* MakeInc.dir */, + A3561D031414024D00E9B51E /* Modules.txt */, + A3561D041414024D00E9B51E /* Resolution */, + A3561D0F1414024D00E9B51E /* uClibcxx */, + ); + path = modules; + sourceTree = ""; + }; + A3561CAD1414024C00E9B51E /* HelloWorld */ = { + isa = PBXGroup; + children = ( + A3561CAE1414024C00E9B51E /* Cconfig */, + A3561CAF1414024C00E9B51E /* HelloWorld.cpp */, + A3561CB01414024C00E9B51E /* include */, + A3561CB11414024C00E9B51E /* Makefile */, + ); + path = HelloWorld; + sourceTree = ""; + }; + A3561CB01414024C00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + ); + path = include; + sourceTree = ""; + }; + A3561CB21414024C00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + A3561CB31414024C00E9B51E /* modules */, + ); + path = include; + sourceTree = ""; + }; + A3561CB41414024C00E9B51E /* Keylayout */ = { + isa = PBXGroup; + children = ( + A3561CB51414024C00E9B51E /* utils */, + ); + path = Keylayout; + sourceTree = ""; + }; + A3561CB51414024C00E9B51E /* utils */ = { + isa = PBXGroup; + children = ( + A3561CB61414024D00E9B51E /* test */, + ); + path = utils; + sourceTree = ""; + }; + A3561CB71414024D00E9B51E /* klibc */ = { + isa = PBXGroup; + children = ( + A3561CB81414024D00E9B51E /* __ashldi3.c */, + A3561CB91414024D00E9B51E /* __ashrdi3.c */, + A3561CBA1414024D00E9B51E /* __clzsi2.c */, + A3561CBB1414024D00E9B51E /* __divdi3.c */, + A3561CBC1414024D00E9B51E /* __divsi3.c */, + A3561CBD1414024D00E9B51E /* __lshrdi3.c */, + A3561CBE1414024D00E9B51E /* __moddi3.c */, + A3561CBF1414024D00E9B51E /* __modsi3.c */, + A3561CC01414024D00E9B51E /* __udivdi3.c */, + A3561CC11414024D00E9B51E /* __udivmoddi4.c */, + A3561CC21414024D00E9B51E /* __udivmodsi4.c */, + A3561CC31414024D00E9B51E /* __udivsi3.c */, + A3561CC41414024D00E9B51E /* __umoddi3.c */, + A3561CC51414024D00E9B51E /* __umodsi3.c */, + A3561CC61414024D00E9B51E /* atexit.c */, + A3561CC71414024D00E9B51E /* atexit.h */, + A3561CC81414024D00E9B51E /* atoi.c */, + A3561CC91414024D00E9B51E /* atol.c */, + A3561CCA1414024D00E9B51E /* atoll.c */, + A3561CCB1414024D00E9B51E /* atox.c */, + A3561CCC1414024D00E9B51E /* bsearch.c */, + A3561CCD1414024D00E9B51E /* calloc.c */, + A3561CCE1414024D00E9B51E /* Cconfig */, + A3561CCF1414024D00E9B51E /* exit.c */, + A3561CD01414024D00E9B51E /* jrand48.c */, + A3561CD11414024D00E9B51E /* klibc.c */, + A3561CD21414024D00E9B51E /* LICENSE */, + A3561CD31414024D00E9B51E /* limits.h */, + A3561CD41414024D00E9B51E /* lrand48.c */, + A3561CD51414024D00E9B51E /* Makefile */, + A3561CD61414024D00E9B51E /* memccpy.c */, + A3561CD71414024D00E9B51E /* memchr.c */, + A3561CD81414024D00E9B51E /* memmem.c */, + A3561CD91414024D00E9B51E /* memmove.c */, + A3561CDA1414024D00E9B51E /* memrchr.c */, + A3561CDB1414024D00E9B51E /* memswap.c */, + A3561CDC1414024D00E9B51E /* mrand48.c */, + A3561CDD1414024D00E9B51E /* nrand48.c */, + A3561CDE1414024D00E9B51E /* onexit.c */, + A3561CDF1414024D00E9B51E /* qsort.c */, + A3561CE01414024D00E9B51E /* Readme.txt */, + A3561CE11414024D00E9B51E /* seed48.c */, + A3561CE21414024D00E9B51E /* sha1hash.c */, + A3561CE31414024D00E9B51E /* snprintf.c */, + A3561CE41414024D00E9B51E /* srand48.c */, + A3561CE51414024D00E9B51E /* sscanf.c */, + A3561CE61414024D00E9B51E /* strcasecmp.c */, + A3561CE71414024D00E9B51E /* strdup.c */, + A3561CE81414024D00E9B51E /* strlcat.c */, + A3561CE91414024D00E9B51E /* strncasecmp.c */, + A3561CEA1414024D00E9B51E /* strndup.c */, + A3561CEB1414024D00E9B51E /* strnlen.c */, + A3561CEC1414024D00E9B51E /* strntoimax.c */, + A3561CED1414024D00E9B51E /* strntoumax.c */, + A3561CEE1414024D00E9B51E /* strpbrk.c */, + A3561CEF1414024D00E9B51E /* strsep.c */, + A3561CF01414024D00E9B51E /* strtoimax.c */, + A3561CF11414024D00E9B51E /* strtok.c */, + A3561CF21414024D00E9B51E /* strtok_r.c */, + A3561CF31414024D00E9B51E /* strtol.c */, + A3561CF41414024D00E9B51E /* strtoll.c */, + A3561CF51414024D00E9B51E /* strtotimespec.c */, + A3561CF61414024D00E9B51E /* strtotimeval.c */, + A3561CF71414024D00E9B51E /* strtotimex.c */, + A3561CF81414024D00E9B51E /* strtoul.c */, + A3561CF91414024D00E9B51E /* strtoull.c */, + A3561CFA1414024D00E9B51E /* strtoumax.c */, + A3561CFB1414024D00E9B51E /* strtox.c */, + A3561CFC1414024D00E9B51E /* strxspn.c */, + A3561CFD1414024D00E9B51E /* strxspn.h */, + A3561CFE1414024D00E9B51E /* version */, + A3561CFF1414024D00E9B51E /* vsnprintf.c */, + A3561D001414024D00E9B51E /* vsscanf.c */, + ); + path = klibc; + sourceTree = ""; + }; + A3561D041414024D00E9B51E /* Resolution */ = { + isa = PBXGroup; + children = ( + A3561D051414024D00E9B51E /* 915resolution.c */, + A3561D061414024D00E9B51E /* 915resolution.h */, + A3561D071414024D00E9B51E /* Cconfig */, + A3561D081414024D00E9B51E /* edid.c */, + A3561D091414024D00E9B51E /* include */, + A3561D0B1414024D00E9B51E /* Makefile */, + A3561D0C1414024D00E9B51E /* Readme.txt */, + A3561D0D1414024D00E9B51E /* Resolution.c */, + A3561D0E1414024D00E9B51E /* shortatombios.h */, + ); + path = Resolution; + sourceTree = ""; + }; + A3561D091414024D00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + A3561D0A1414024D00E9B51E /* edid.h */, + ); + path = include; + sourceTree = ""; + }; + A3561D0F1414024D00E9B51E /* uClibcxx */ = { + isa = PBXGroup; + children = ( + A3561D101414024D00E9B51E /* abi.cpp */, + A3561D111414024D00E9B51E /* algorithm.cpp */, + A3561D121414024D00E9B51E /* associative_base.cpp */, + A3561D131414024D00E9B51E /* bitset.cpp */, + A3561D141414024D00E9B51E /* Cconfig */, + A3561D151414024D00E9B51E /* char_traits.cpp */, + A3561D161414024D00E9B51E /* complex.cpp */, + A3561D171414024D00E9B51E /* del_op.cpp */, + A3561D181414024D00E9B51E /* del_opnt.cpp */, + A3561D191414024D00E9B51E /* del_opv.cpp */, + A3561D1A1414024D00E9B51E /* del_opvnt.cpp */, + A3561D1B1414024D00E9B51E /* deque.cpp */, + A3561D1C1414024D00E9B51E /* eh_alloc.cpp */, + A3561D1D1414024D00E9B51E /* eh_globals.cpp */, + A3561D1E1414024D00E9B51E /* exception.cpp */, + A3561D1F1414024D00E9B51E /* fstream.cpp */, + A3561D201414024D00E9B51E /* func_exception.cpp */, + A3561D211414024D00E9B51E /* include */, + A3561D631414024D00E9B51E /* iomanip.cpp */, + A3561D641414024D00E9B51E /* ios.cpp */, + A3561D651414024D00E9B51E /* iostream.cpp */, + A3561D661414024D00E9B51E /* istream.cpp */, + A3561D671414024D00E9B51E /* iterator.cpp */, + A3561D681414024D00E9B51E /* limits.cpp */, + A3561D691414024D00E9B51E /* list.cpp */, + A3561D6A1414024D00E9B51E /* locale.cpp */, + A3561D6B1414024D00E9B51E /* Makefile */, + A3561D6C1414024D00E9B51E /* map.cpp */, + A3561D6D1414024D00E9B51E /* new_handler.cpp */, + A3561D6E1414024D00E9B51E /* new_op.cpp */, + A3561D6F1414024D00E9B51E /* new_opnt.cpp */, + A3561D701414024D00E9B51E /* new_opv.cpp */, + A3561D711414024D00E9B51E /* new_opvnt.cpp */, + A3561D721414024D00E9B51E /* numeric.cpp */, + A3561D731414024D00E9B51E /* ostream.cpp */, + A3561D741414024D00E9B51E /* queue.cpp */, + A3561D751414024D00E9B51E /* Readme.txt */, + A3561D761414024D00E9B51E /* set.cpp */, + A3561D771414024D00E9B51E /* sstream.cpp */, + A3561D781414024D00E9B51E /* stack.cpp */, + A3561D791414024D00E9B51E /* stdexcept.cpp */, + A3561D7A1414024D00E9B51E /* streambuf.cpp */, + A3561D7B1414024D00E9B51E /* string.cpp */, + A3561D7C1414024D00E9B51E /* support.cpp */, + A3561D7D1414024D00E9B51E /* typeinfo.cpp */, + A3561D7E1414024D00E9B51E /* uClibc++.c */, + A3561D7F1414024D00E9B51E /* utility.cpp */, + A3561D801414024D00E9B51E /* valarray.cpp */, + A3561D811414024D00E9B51E /* vector.cpp */, + ); + path = uClibcxx; + sourceTree = ""; + }; + A3561D211414024D00E9B51E /* include */ = { + isa = PBXGroup; + children = ( + A3561D221414024D00E9B51E /* algorithm */, + A3561D231414024D00E9B51E /* associative_base */, + A3561D241414024D00E9B51E /* basic_definitions */, + A3561D251414024D00E9B51E /* bitset */, + A3561D261414024D00E9B51E /* cassert */, + A3561D271414024D00E9B51E /* cctype */, + A3561D281414024D00E9B51E /* cerrno */, + A3561D291414024D00E9B51E /* cfloat */, + A3561D2A1414024D00E9B51E /* char_traits */, + A3561D2B1414024D00E9B51E /* climits */, + A3561D2C1414024D00E9B51E /* clocale */, + A3561D2D1414024D00E9B51E /* cmath */, + A3561D2E1414024D00E9B51E /* complex */, + A3561D2F1414024D00E9B51E /* csetjmp */, + A3561D301414024D00E9B51E /* csignal */, + A3561D311414024D00E9B51E /* cstdarg */, + A3561D321414024D00E9B51E /* cstddef */, + A3561D331414024D00E9B51E /* cstdio */, + A3561D341414024D00E9B51E /* cstdlib */, + A3561D351414024D00E9B51E /* cstring */, + A3561D361414024D00E9B51E /* ctime */, + A3561D371414024D00E9B51E /* cwchar */, + A3561D381414024D00E9B51E /* cwctype */, + A3561D391414024D00E9B51E /* deque */, + A3561D3A1414024D00E9B51E /* exception */, + A3561D3B1414024D00E9B51E /* fstream */, + A3561D3C1414024D00E9B51E /* func_exception */, + A3561D3D1414024D00E9B51E /* functional */, + A3561D3E1414024D00E9B51E /* iomanip */, + A3561D3F1414024D00E9B51E /* ios */, + A3561D401414024D00E9B51E /* iosfwd */, + A3561D411414024D00E9B51E /* iostream */, + A3561D421414024D00E9B51E /* istream */, + A3561D431414024D00E9B51E /* istream_helpers */, + A3561D441414024D00E9B51E /* iterator */, + A3561D451414024D00E9B51E /* iterator_base */, + A3561D461414024D00E9B51E /* limits */, + A3561D471414024D00E9B51E /* list */, + A3561D481414024D00E9B51E /* locale */, + A3561D491414024D00E9B51E /* Makefile */, + A3561D4A1414024D00E9B51E /* map */, + A3561D4B1414024D00E9B51E /* map.old */, + A3561D4C1414024D00E9B51E /* memory */, + A3561D4D1414024D00E9B51E /* new */, + A3561D4E1414024D00E9B51E /* numeric */, + A3561D4F1414024D00E9B51E /* ostream */, + A3561D501414024D00E9B51E /* ostream_helpers */, + A3561D511414024D00E9B51E /* queue */, + A3561D521414024D00E9B51E /* set */, + A3561D531414024D00E9B51E /* set.old */, + A3561D541414024D00E9B51E /* sstream */, + A3561D551414024D00E9B51E /* stack */, + A3561D561414024D00E9B51E /* stdexcept */, + A3561D571414024D00E9B51E /* streambuf */, + A3561D581414024D00E9B51E /* string */, + A3561D591414024D00E9B51E /* string_iostream */, + A3561D5A1414024D00E9B51E /* support */, + A3561D5B1414024D00E9B51E /* system_configuration.h */, + A3561D5C1414024D00E9B51E /* type_traits */, + A3561D5D1414024D00E9B51E /* typeinfo */, + A3561D5E1414024D00E9B51E /* types */, + A3561D5F1414024D00E9B51E /* unwind-cxx.h */, + A3561D601414024D00E9B51E /* utility */, + A3561D611414024D00E9B51E /* valarray */, + A3561D621414024D00E9B51E /* vector */, + ); + path = include; + sourceTree = ""; + }; B0056CE511F3868000754B65 /* i386 */ = { isa = PBXGroup; children = ( @@ -2049,6 +2598,7 @@ B0056D1311F3868000754B65 /* doc */, B0056D1611F3868000754B65 /* libsa */, B0056D2411F3868000754B65 /* libsaio */, + A3561CAB1414024C00E9B51E /* modules */, B0056D7911F3868000754B65 /* util */, B0056D7611F3868000754B65 /* Makefile */, ); @@ -2252,6 +2802,10 @@ B0056D7911F3868000754B65 /* util */ = { isa = PBXGroup; children = ( + A3561C721413FD7800E9B51E /* fdisk */, + A3561C891413FD7800E9B51E /* openUp.c */, + A3561C8A1413FD7800E9B51E /* dyldsymboltool.c */, + A3561C8B1413FD7800E9B51E /* bdmesg.c */, B0056D7A11F3868000754B65 /* machOconv.c */, B0056D7B11F3868000754B65 /* Makefile */, ); Index: trunk/i386/libsaio/Makefile =================================================================== --- trunk/i386/libsaio/Makefile (revision 1503) +++ trunk/i386/libsaio/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/libsaio SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -10,7 +10,7 @@ DIR = libsaio include ${SRCROOT}/Make.rules -UTILDIR = ../util +UTILDIR = ../util LIBSADIR = ../libsa BOOT2DIR = ../boot2 @@ -26,7 +26,7 @@ CPPFLAGS := $(CPPFLAGS) -nostdinc++ -INC = -I. -I$(SYMROOT) -I$(LIBSADIR) -I$(BOOT2DIR) -I${SRCROOT}/i386/include +INC = -I. -I$(SRCROOT) -I$(SYMROOT) -I$(LIBSADIR) -I$(BOOT2DIR) -I${SRCROOT}/i386/include SAIO_OBJS = table.o asm.o bios.o biosfn.o \ disk.o sys.o cache.o bootstruct.o \ @@ -41,15 +41,17 @@ device_inject.o nvidia.o ati.o gma.o pci_root.o \ convert.o aml_generator.o console.o +SAIO_OBJS := $(addprefix $(OBJROOT)/, $(SAIO_OBJS)) + LIBS = libsaio.a LIBS := $(addprefix $(SYMROOT)/, $(LIBS)) DIRS_NEEDED = $(OBJROOT) $(SYMROOT) -all: $(DIRS_NEEDED) $(LIBS) +all: $(DIRS_NEEDED) $(CONFIG_HEADERS) $(LIBS) all-recursive -$(LIBS): $(addprefix $(OBJROOT)/, $(SAIO_OBJS)) +$(LIBS): $(SAIO_OBJS) @echo "\t[RM] $@" @rm -f $@ @echo "\t[AR] $(@F)" @@ -57,6 +59,8 @@ @echo "\t[RANLIB] $(@F)" @ranlib $(SYMROOT)/$(@F) +clean-local: + @rm -f $(LIBS) $(SAIO_OBJS) # dependencies -include $(OBJROOT)/Makedep Index: trunk/i386/boot0/Makefile =================================================================== --- trunk/i386/boot0/Makefile (revision 1503) +++ trunk/i386/boot0/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/boot0 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -12,15 +12,15 @@ DIRS_NEEDED = $(SYMROOT) +OBJS = boot0 boot0hfs boot0md chain0 +OBJS := $(addprefix $(SYMROOT)/, $(OBJS)) -OBJECTS = boot0 boot0hfs boot0md chain0 -OBJECTS := $(addprefix $(SYMROOT)/, $(OBJECTS)) +all: $(DIRS_NEEDED) $(OBJS) -all: $(DIRS_NEEDED) $(OBJECTS) - -$(OBJECTS): $(SRCROOT)/autoconf.inc +$(OBJS): $(SRCROOT)/autoconf.inc @echo "\t[NASM] $(@F)" @$(NASM) $(@F).s -o $@ -#dependencies - +clean-local: + @for o in $(OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @rm -f $(OBJS) Index: trunk/i386/boot1/Makefile =================================================================== --- trunk/i386/boot1/Makefile (revision 1503) +++ trunk/i386/boot1/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/boot1 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -16,8 +16,6 @@ VERS = `vers_string -f 5.0 | tr - .` NEW_VERS = Darwin boot1h v$(VERS) - - PROGRAMS = boot1hp boot1f32 ifeq (${CONFIG_BOOT1_HFS}, y) @@ -41,3 +39,7 @@ install_i386:: all $(INSTALLDIR) cp $(SYMROOT)/boot1h $(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 + @rm -f $(PROGRAMS) Index: trunk/i386/boot2/Makefile =================================================================== --- trunk/i386/boot2/Makefile (revision 1503) +++ trunk/i386/boot2/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/boot2 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -33,7 +33,7 @@ LIBSAIODIR = ../libsaio THEME = $(CONFIG_EMBEDED_THEME) THEMEDIR = ../../artwork/themes/$(THEME) -INC = -I. -I$(SYMDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include +INC = -I. -I$(SRCROOT) -I$(SYMDIR) -I$(LIBSADIR) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include LIBS= -L$(SYMDIR) -lsaio -lsa LIBDEP= libsaio.a libsa.a @@ -45,7 +45,8 @@ 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 -# button.o browser.o scrollbar.o == NOTYET +# button.o browser.o scrollbar.o == NOTYET +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) UTILDIR = ../util DIRS_NEEDED = $(OBJROOT) $(SYMROOT) @@ -64,15 +65,15 @@ PATCH_ADDR = $(shell echo ${SYMBOL_ADDR}-${DATA_ADDR}+${DATA_OFFSET} | bc) -all: $(DIRS_NEEDED) boot +all: $(DIRS_NEEDED) boot all-recursive ifeq (${CONFIG_EMBED_THEME}, y) -boot: $(SYMROOT)/art.h $(SYMROOT)/vers.h $(SYMROOT)/embedded.h $(addprefix $(OBJROOT)/, $(OBJS)) $(addprefix $(SYMROOT)/, $(LIBDEP)) +boot: $(CONFIG_HEADERS) $(SYMROOT)/art.h $(SYMROOT)/embedded.h $(OBJS) $(addprefix $(SYMROOT)/, $(LIBDEP)) else -boot: $(SYMROOT)/vers.h $(SYMROOT)/embedded.h $(addprefix $(OBJROOT)/, $(OBJS)) $(addprefix $(SYMROOT)/, $(LIBDEP)) +boot: $(CONFIG_HEADERS) $(SYMROOT)/embedded.h $(OBJS) $(addprefix $(SYMROOT)/, $(LIBDEP)) endif @@ -183,7 +184,12 @@ @cd $(SYMROOT)/../../doc && xxd -i BootHelp.txt > $(SYMROOT)/embedded.h -.PHONY: $(SYMROOT)/vers.h - #dependencies -include $(OBJROOT)/Makedep + +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 + @rm -f $(SYMROOT)/boot $(SYMROOT)/boot.sys $(SYMROOT)/embedded.h $(OBJS) + @rm -rf $(OBJROOT) Index: trunk/i386/config/Makefile =================================================================== --- trunk/i386/config/Makefile (revision 1503) +++ trunk/i386/config/Makefile (revision 1504) @@ -3,7 +3,7 @@ # we'll just keep the generated files in this directory # and install them directly, rather than generating them again. # -SRCROOT = $(shell pwd)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/config SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -15,10 +15,12 @@ DIR = util include ${SRCROOT}/Make.rules -OBJECTS = cconfig.o32 cconfig.o64 zconf.tab.o32 zconf.tab.o64 \ +OBJS = 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 +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) + DEFINES = -DKBUILD_NO_NLS -DCURSES_LOC=\ -DPATH_MAX=256 -DPACKAGE=\"chameleon\" LDFLAGS = -lncurses -lmenu @@ -30,7 +32,7 @@ all: $(DIRS_NEEDED) $(SYMPROG) -$(SYMPROG): $(addprefix $(OBJROOT)/, $(OBJECTS)) +$(SYMPROG): $(OBJS) @echo "\t[LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/*.o32 @echo "\t[LD64] $(@F)_64" @@ -46,7 +48,10 @@ @cd ${SRCROOT} && $(SYMPROG) $(SRCROOT)/Cconfig rebuild -.PHONY: config +.PHONY: config rebuild_config #dependencies --include $(OBJROOT)/Makedep \ No newline at end of file +-include $(OBJROOT)/Makedep + +distclean-local: + @rm -f $(SYMPROG) $(OBJS) $(OBJROOT)/Makedep Index: trunk/i386/modules/MakeInc.dir =================================================================== --- trunk/i386/modules/MakeInc.dir (revision 1503) +++ trunk/i386/modules/MakeInc.dir (revision 1504) @@ -1,6 +1,6 @@ -SRCROOT = $(shell pwd)/../../../ +SRCROOT = $(abspath $(CURDIR)/../../..) OBJROOT = $(SRCROOT)/obj/i386/modules/$(DIR) -SYMROOT = $(SRCROOT)/sym/i386/modules/ +SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 DOCROOT = $(SRCROOT)/doc IMGROOT = $(SRCROOT)/sym/cache @@ -22,7 +22,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) -arch i386 -static -nostdinc++ -Wmost -Werror \ -fno-builtin -mpreferred-stack-boundary=2 \ -fno-align-functions -fno-stack-protector \ @@ -36,7 +36,7 @@ -fno-align-functions -fno-stack-protector \ -march=pentium4 -msse2 -mfpmath=sse -msoft-float \ -arch i386 -include $(SRCROOT)/autoconf.h - + CPPFLAGS := $(CPPFLAGS) -nostdinc++ -Wmost -Werror \ -fno-builtin -mpreferred-stack-boundary=2 \ -fno-align-functions -fno-stack-protector \ @@ -71,12 +71,11 @@ ifneq ($(BUILT_IN),yes) # Make this as a *MODULE* -all: dylib - @for d in $(SUBDIRS); do (cd $$d; $(MAKE) $@ ); done +all: $(CONFIG_HEADERS) $(HEADER_VERSION) dylib all-recursive else # Module not selected to be compiled as a module -all: +all: $(CONFIG_HEADERS) $(HEADER_VERSION) all-recursive endif @@ -86,12 +85,11 @@ ifeq ($(BUILT_IN),yes) # Make this *BUILT IN* -all: dylib_LINKER - @for d in $(SUBDIRS); do (cd $$d; $(MAKE) $@ ); done +all: $(CONFIG_HEADERS) $(HEADER_VERSION) dylib_LINKER all-recursive else # Module not selected to be built in -all: +all: $(CONFIG_HEADERS) $(HEADER_VERSION) all-recursive endif else @@ -107,10 +105,11 @@ dylib: ${SYMROOT}/modules/ ${OBJROOT} $(SYMROOT)/modules/$(MODULE_NAME).dylib +MODULE_OBJS := $(addprefix $(OBJROOT)/, ${MODULE_OBJS}) ifeq ($(BUILT_IN),yes) -$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(addprefix $(OBJROOT)/, ${MODULE_OBJS}) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author Makefile +$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(MODULE_OBJS) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author Makefile @echo "\t[LD] $(MODULE_NAME).dylib" @ld -arch i386 -undefined dynamic_lookup \ -dylib -read_only_relocs suppress \ @@ -126,9 +125,9 @@ else -$(SYMROOT)/modules/$(MODULE_NAME).dylib: $(addprefix $(OBJROOT)/, ${MODULE_OBJS}) $(MODULE_DEPENDENCIES) $(OBJROOT)/$(MODULE_NAME).desc $(OBJROOT)/$(MODULE_NAME).author $(SRCROOT)/obj/i386/boot2/Symbols_LINKER_ONLY.dylib Makefile +$(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" - + @ld -arch i386 \ -alias _$(MODULE_START) start \ -dylib -read_only_relocs suppress \ @@ -143,41 +142,37 @@ -sectcreate __INFO __description $(OBJROOT)/$(MODULE_NAME).desc \ -macosx_version_min 10.6 \ -o $@ - + endif -clean: - @for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@ ); done - @echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib" - @echo "\t[RM] $(OBJROOT)" - @echo "\t[RM] $(DSTROOT)" - @echo "\t[RM] $(SRCROOT)/revision" - @echo "\t[RM] $(SRCROOT)/i386/modules/module_includes" - @rm -rf $(SYMROOT)/modules/$(MODULE_NAME).dylib &> /dev/null - @rm -rf $(OBJROOT) $(DSTROOT) $(SRCROOT)/revision $(SRCROOT)/i386/modules/module_includes +clean-local: + @if [ -f "$(SYMROOT)/modules/$(MODULE_NAME).dylib" ];then \ + echo "\t[RM] $(SYMROOT)/modules/$(MODULE_NAME).dylib";\ + fi + @for o in $(MODULE_OBJS); do if [ -f "$${o}" ];then echo "\t[RM] $${o}"; fi; done + @rm -f $(SYMROOT)/modules/$(MODULE_NAME).dylib + @rm -rf $(OBJROOT) - + ${SYMROOT}/modules/: @echo "\t[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));" >> $@ - + $(SRCROOT)/sym/i386/boot_modules.h: @echo "void $(MODULE_START)(); // $(MODULE_NAME)" >> $@ - + $(OBJROOT)/$(MODULE_NAME).author: Makefile @echo "$(MODULE_AUTHOR)" > $@ - + $(OBJROOT)/$(MODULE_NAME).desc: Makefile @echo "$(MODULE_DESCRIPTION)" > $@ #dependencies --include $(OBJROOT)/Makedep \ No newline at end of file +-include $(OBJROOT)/Makedep Index: trunk/i386/modules/Makefile =================================================================== --- trunk/i386/modules/Makefile (revision 1503) +++ trunk/i386/modules/Makefile (revision 1504) @@ -1,5 +1,5 @@ -# Makefile for i386 modules -SRCROOT = $(shell pwd)/../../ +# Makefile for i386 modules +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/modules/ SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -37,28 +37,13 @@ ifeq (${CONFIG_MODULES}, y) -all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h - @for i in ${SUBDIRS}; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; $(MKDIRS) $(OBJROOT)/$$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)/" \ - "DSTROOT=$(DSTROOT)/" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done - +all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h all-recursive @# Finish up boot_modules.c @echo "}" >> $(SYMROOT)/boot_modules.c else -all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h +all: $(SYMROOT) $(OBJROOT) objroot_dirs $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h all-recursive @# Finish up boot_modules.c @echo "}" >> $(SYMROOT)/boot_modules.c @@ -85,3 +70,6 @@ @echo "// Autogenerated - do not modify" > $@ @echo "void start_built_in_modules(); " > $@ endif + +clean-local: + @rm -f $(SYMROOT)/boot_modules.c $(SYMROOT)/boot_modules.h Index: trunk/i386/cdboot/Makefile =================================================================== --- trunk/i386/cdboot/Makefile (revision 1503) +++ trunk/i386/cdboot/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/cdboot SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -25,4 +25,6 @@ | perl -ane "print pack('V',@F[0]);" \ | dd of=$(SYMROOT)/cdboot bs=1 count=4 seek=2044 conv=notrunc &> /dev/null -#dependencies +clean-local: + @if [ -f "$(SYMROOT)/cdboot" ];then echo "\t[RM] $(SYMROOT)/cdboot"; fi + @rm -f $(SYMROOT)/cdboot Index: trunk/i386/libsa/Makefile =================================================================== --- trunk/i386/libsa/Makefile (revision 1503) +++ trunk/i386/libsa/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/libsa SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -22,10 +22,12 @@ INC = -I. -I$(SYMROOT) -I$(LIBSAIODIR) -I${SRCROOT}/i386/include -SA_OBJS = prf.o printf.o zalloc.o \ +OBJS = prf.o printf.o zalloc.o \ string.o strtol.o error.o \ setjmp.o qsort.o efi_tables.o +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) + LIBS = libsa.a LIBS := $(addprefix $(SYMROOT)/, $(LIBS)) @@ -34,7 +36,7 @@ all embedtheme: $(DIRS_NEEDED) $(LIBS) -$(LIBS): $(addprefix $(OBJROOT)/, $(SA_OBJS)) +$(LIBS): $(OBJS) @echo "\t[RM] $@" @rm -f $@ @echo "\t[AR] $(@F)" @@ -44,3 +46,8 @@ # 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 + @rm -f $(LIBS) $(OBJS) Index: trunk/i386/Makefile =================================================================== --- trunk/i386/Makefile (revision 1503) +++ trunk/i386/Makefile (revision 1504) @@ -3,7 +3,7 @@ # # these paths are only valid in subdirectories of this directory # -SRCROOT = $(CURDIR)/../ +SRCROOT = $(abspath $(CURDIR)/..) OBJROOT = $(SRCROOT)/obj/i386 SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -16,57 +16,10 @@ # The order of building is important. SUBDIRS_PRE = util -SUBDIRS = libsa libsaio boot0 boot1 boot2 cdboot modules +SUBDIRS = $(SUBDIRS_PRE) libsa libsaio boot0 boot1 boot2 cdboot modules -all: - @for i in ${SUBDIRS_PRE}; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done +modules-builtin: + @cd modules; ${MAKE} BUILT_IN=yes - @cd modules; ${MAKE} BUILT_IN=yes $@ +all: $(CONFIG_HEADERS) modules-builtin all-recursive - - @for i in ${SUBDIRS}; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done - -config rebuild_config: - @for i in config; \ - do \ - echo ================= make $@ for $$i =================; \ - ( cd $$i; ${MAKE} \ - "OBJROOT=$(OBJROOT)/$$i" \ - "SYMROOT=$(SYMROOT)" \ - "DSTROOT=$(DSTROOT)" \ - "SRCROOT=$(SRCROOT)" \ - "RC_ARCHS=$(RC_ARCHS)" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$(RC_CFLAGS)" $@ \ - ) || exit $$?; \ - done - - -.PHONY: config \ No newline at end of file Index: trunk/i386/util/fdisk/Cconfig =================================================================== --- trunk/i386/util/fdisk/Cconfig (revision 1503) +++ trunk/i386/util/fdisk/Cconfig (revision 1504) @@ -3,5 +3,5 @@ default y help Say Y here if you want to compile the fdisk440 utility. - fdisk440 is used to update the boot0 file on the partition by replacing the first 440 bytes, instead of the first 446 bytes as with frisk. + fdisk440 is used to update the boot0 file on the partition by replacing the first 440 bytes, instead of the first 446 bytes as with fdisk. When in doubt, say "Y". Index: trunk/i386/util/fdisk/Makefile =================================================================== --- trunk/i386/util/fdisk/Makefile (revision 1503) +++ trunk/i386/util/fdisk/Makefile (revision 1504) @@ -1,4 +1,4 @@ -SRCROOT = $(shell pwd)/../../../ +SRCROOT = $(abspath $(CURDIR)/../../..) OBJROOT = $(SRCROOT)/obj/i386/util/fdisk SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -19,16 +19,16 @@ OBJS = cmd.o32 disk.o32 fdisk.o32 getrawpartition.o32 mbr.o32 misc.o32 opendev.o32 part.o32 user.o32 auto.o32 \ cmd.o64 disk.o64 fdisk.o64 getrawpartition.o64 mbr.o64 misc.o64 opendev.o64 part.o64 user.o64 auto.o64 +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) PROGRAM = fdisk440 PROGRAM:= $(addprefix $(SYMROOT)/, $(PROGRAM)) - ifeq ($(CONFIG_FDISK440),y) all: $(SYMROOT) $(OBJROOT) $(PROGRAM) -$(PROGRAM): $(addprefix $(OBJROOT)/, $(OBJS)) +$(PROGRAM): $(OBJS) @echo "\t[LD32] $@_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $@_32 $(filter %.o32,$^) @echo "\t[LD64] $@_64" @@ -47,3 +47,7 @@ #dependencies -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 + @rm -f $(PROGRAM) $(OBJS) Index: trunk/i386/util/Makefile =================================================================== --- trunk/i386/util/Makefile (revision 1503) +++ trunk/i386/util/Makefile (revision 1504) @@ -3,7 +3,7 @@ # we'll just keep the generated files in this directory # and install them directly, rather than generating them again. # -SRCROOT = $(CURDIR)/../../ +SRCROOT = $(abspath $(CURDIR)/../..) OBJROOT = $(SRCROOT)/obj/i386/util SYMROOT = $(SRCROOT)/sym/i386 DSTROOT = $(SRCROOT)/dst/i386 @@ -17,19 +17,20 @@ include ${SRCROOT}/Make.rules PROGRAMS = machOconv dyldsymboltool -OBJECTS = dyldsymboltool.o32 dyldsymboltool.o64 machOconv.o32 machOconv.o64 +OBJS = dyldsymboltool.o32 dyldsymboltool.o64 machOconv.o32 machOconv.o64 ifeq (${CONFIG_BDMESG}, y) PROGRAMS += bdmesg -OBJECTS += bdmesg.o32 bdmesg.o64 +OBJS += bdmesg.o32 bdmesg.o64 endif ifeq (${CONFIG_OPENUP}, y) PROGRAMS += openUp -OBJECTS += openUp.o64 openUp.o32 +OBJS += openUp.o64 openUp.o32 endif +OBJS := $(addprefix $(OBJROOT)/, $(OBJS)) LDFLAGS := $(LDFALGS) -framework IOKit -framework CoreFoundation -mmacosx-version-min=10.5 @@ -37,9 +38,11 @@ DIRS_NEEDED = $(OBJROOT) $(SYMROOT) -all: $(DIRS_NEEDED) $(SYMPROG) fdisk440 +SUBDIRS = fdisk -$(SYMPROG): $(addprefix $(OBJROOT)/, $(OBJECTS)) +all: $(DIRS_NEEDED) $(SYMPROG) all-recursive + +$(SYMPROG): $(OBJS) @echo "\t[LD32] $(@F)_32" @$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -arch i386 -o $(SYMROOT)/$(@F)_32 $(OBJROOT)/$(@F).o32 @echo "\t[LD64] $(@F)_64" @@ -48,13 +51,10 @@ @lipo -create -arch i386 $(SYMROOT)/$(@F)_32 -arch x86_64 $(SYMROOT)/$(@F)_64 -output $(SYMROOT)/$(@F) @$(RM) $(SYMROOT)/$(@F)_32 $(SYMROOT)/$(@F)_64 +#dependencies +-include $(OBJROOT)/Makedep - -.PHONY: fdisk440 -fdisk440: - @echo ================= make all for fdisk =================; - @$(MAKE) -C fdisk - - -#dependencies --include $(OBJROOT)/Makedep \ No newline at end of file +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 + @rm -f $(SYMPROG) $(OBJS) Index: trunk/package/slimpkg.sh =================================================================== --- trunk/package/slimpkg.sh (revision 1503) +++ trunk/package/slimpkg.sh (revision 1504) @@ -18,11 +18,11 @@ COL_BLUE="\x1b[34;01m" COL_RESET="\x1b[39;49;00m" -#version=$( grep I386BOOT_CHAMELEONVERSION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) +#version=$( grep I386BOOT_CHAMELEONVERSION vers.h | awk '{ print $3 }' | tr -d '\"' ) version=$( cat version ) stage=${version##*-} -revision=$( grep I386BOOT_CHAMELEONREVISION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) -builddate=$( grep I386BOOT_BUILDDATE sym/i386/vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) # ================= Index: trunk/package/builddmg.sh =================================================================== --- trunk/package/builddmg.sh (revision 1503) +++ trunk/package/builddmg.sh (revision 1504) @@ -36,8 +36,8 @@ version=$( cat version ) stage=${version##*-} -revision=$( grep I386BOOT_CHAMELEONREVISION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) -builddate=$( grep I386BOOT_BUILDDATE sym/i386/vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) # ========================= Index: trunk/package/buildpkg.sh =================================================================== --- trunk/package/buildpkg.sh (revision 1503) +++ trunk/package/buildpkg.sh (revision 1504) @@ -18,11 +18,11 @@ COL_BLUE="\x1b[34;01m" COL_RESET="\x1b[39;49;00m" -#version=$( grep I386BOOT_CHAMELEONVERSION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) +#version=$( grep I386BOOT_CHAMELEONVERSION vers.h | awk '{ print $3 }' | tr -d '\"' ) version=$( cat version ) stage=${version##*-} -revision=$( grep I386BOOT_CHAMELEONREVISION sym/i386/vers.h | awk '{ print $3 }' | tr -d '\"' ) -builddate=$( grep I386BOOT_BUILDDATE sym/i386/vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) +revision=$( grep I386BOOT_CHAMELEONREVISION vers.h | awk '{ print $3 }' | tr -d '\"' ) +builddate=$( grep I386BOOT_BUILDDATE vers.h | awk '{ print $3,$4 }' | tr -d '\"' ) timestamp=$( date -j -f "%Y-%m-%d %H:%M:%S" "${builddate}" "+%s" ) # ================= Index: trunk/CREDITS =================================================================== --- trunk/CREDITS (revision 1503) +++ trunk/CREDITS (revision 1504) @@ -3,11 +3,11 @@ Developers: ---------- -zef, Turbo, dfe, netkas, mackerintel, fassl, Kabyl, kaitek, iNDi, asereBLN, mozodojo, meklort, AzimutZ, Slice, cosmo1t, cparm +zef, Turbo, dfe, netkas, mackerintel, fassl, Kabyl, kaitek, iNDi, JrCs, asereBLN, mozodojo, meklort, AzimutZ, Slice, cosmo1t, cparm Thanks to: --------- -JrCs, mercurysquad, munky, rekursor, kalyway, Krazubu, XyZ, blackosx, DHP, nawcom, anval, scorpius, macman +mercurysquad, munky, rekursor, kalyway, Krazubu, XyZ, blackosx, DHP, nawcom, anval, scorpius, macman Package: --------- Index: trunk/Make.rules =================================================================== --- trunk/Make.rules (revision 1503) +++ trunk/Make.rules (revision 1504) @@ -1,7 +1,7 @@ + -include $(SRCROOT)/auto.conf export USE_APPLE_PB_SUPPORT = all - ifneq "" "$(wildcard /bin/mkdirs)" MKDIRS = /bin/mkdirs @@ -20,6 +20,7 @@ CPPFLAGS = $(MORECPP) -g -Wmost -Werror -fno-exceptions -fno-rtti DEFINES= +DIST_SUBDIRS += $(SUBDIRS) # # Common makefile targets. @@ -74,7 +75,7 @@ @$(CC) -Wa,-n -c $(INC) -arch i386 -o $(OBJROOT)/$(@F) boot2.s \ -MD -dependency-file $*.d @md -u $(OBJROOT)/Makedep -f -d $*.d - + $(OBJROOT)/%.o: %.s @echo "\t[AS] $<" @$(CC) $(CPPFLAGS) -c $(INC) -arch i386 -o $@ $< \ @@ -82,18 +83,80 @@ @md -u $(OBJROOT)/Makedep -f -d $*.d +CONFIG_FILES=$(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config +$(CONFIG_FILES): $(SRCROOT)/.config + @echo "\t[MAKE] config" + @make -C $(SRCROOT)/i386/config rebuild_config +HEADER_VERSION=$(SRCROOT)/vers.h +$(HEADER_VERSION): $(SRCROOT)/version + @echo "#define I386BOOT_VERSION \"5.0.132\"" > $@ + @echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $@ + @echo "#define I386BOOT_CHAMELEONVERSION \"`cat $(SRCROOT)/version`\"" >> $@ + @echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $@ + +CONFIG_HEADERS=$(CONFIG_FILES) $(HEADER_VERSION) + # This breaks make, must use make all (FIXME) $(DIRS_NEEDED) $(INSTALLDIR) $(OBJROOT) $(SYMROOT): @echo "\t[MKDIR] $@" @$(MKDIRS) $@ - -$(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/.config: - @echo "\t[MAKE] config" - @cd $(SRCROOT) && make rebuild_config -.PHONY: clean -clean: - @for d in $(SUBDIRS); do (cd $$d && $(MAKE) $@ ); done +# Recursive rules +RECURSIVE_TARGETS = all-recursive +RECURSIVE_CLEAN_TARGETS = distclean-recursive clean-recursive +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) +$(RECURSIVE_TARGETS): + @failcom='exit 1'; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo ================= Making $$target in $$subdir =================; \ + (cd $$subdir && $(MAKE) $$target) \ + || eval $$failcom; \ + done; + +$(RECURSIVE_CLEAN_TARGETS): + @failcom='exit 1'; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-local"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $$local_target) \ + || eval $$failcom; \ + done + +clean: clean-recursive + @if [ -f "$(OBJROOT)/Makedep" ];then echo "\t[RM] $(OBJROOT)/Makedep"; fi + @rm -f $(OBJROOT)/Makedep + +distclean: distclean-recursive clean-local + +clean-local: + +distclean-local: + .DEFAULT_GOAL := all + +# Local Variables: # +# mode: Makefile # +# tab-width: 2 # +# indent-tabs-mode: t # +# End: # +# +# vi: set noexpandtab ts=2 sw=2 sts=2: # Index: trunk/Makefile =================================================================== --- trunk/Makefile (revision 1503) +++ trunk/Makefile (revision 1504) @@ -27,73 +27,30 @@ EXCLUDE = --exclude=.svn --exclude=.DS_Store --exclude=sym --exclude=obj \ --exclude=package --exclude=archive --exclude=User_Guide_src --exclude=*.sh +#RC_CFLAGS = i386 ARCHLESS_RC_CFLAGS=`echo $(RC_CFLAGS) | sed 's/-arch [a-z0-9]*//g'` GENERIC_SUBDIRS = +SUBDIRS = $(GENERIC_SUBDIRS) i386 +DIST_SUBDIRS = $(SUBDIRS) +$(SRCROOT)/revision: + @svnversion -n | tr -d [:alpha:] > $(SRCROOT)/revision + # # Currently builds for i386 # config rebuild_config: - @if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi - @echo ================= make config for i386 =================; - @( OBJROOT=$(OBJROOT)/i386; \ - SYMROOT=$(SYMROOT)/i386; \ - DSTROOT=$(DSTROOT); \ - SRCROOT=$(SRCROOT); \ - cd i386; ${MAKE} \ - "OBJROOT=$$OBJROOT" \ - "SYMROOT=$$SYMROOT" \ - "DSTROOT=$$DSTROOT" \ - "SRCROOT=$$SRCROOT" \ - "RC_ARCHS=$$RC_ARCHS" \ - "TARGET=$$i" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$$XCFLAGS" $@ \ - ) || exit $$?; \ + @make -C $(SRCROOT)/i386/config $@ +all: $(SYMROOT) $(OBJROOT) $(CONFIG_HEADERS) $(HEADER_VERSION) $(SRCROOT)/revision + @$(MAKE) all-recursive -all: $(SYMROOT) $(OBJROOT) $(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config $(SYMROOT)/i386/vers.h - @if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi - @if [ -z "$(RC_ARCHS)" ]; then \ - RC_ARCHS="i386"; \ - fi; \ - SUBDIRS="$(GENERIC_SUBDIRS) $$RC_ARCHS"; \ - for i in $$SUBDIRS; \ - do \ - if [ -d $$i ]; then \ - echo ================= make $@ for $$i =================; \ - ( OBJROOT=$(OBJROOT)/$${i}; \ - SYMROOT=$(SYMROOT)/$${i}; \ - DSTROOT=$(DSTROOT); \ - SRCROOT=$(SRCROOT); \ - XCFLAGS=$(ARCHLESS_RC_CFLAGS); \ - GENSUBDIRS="$(GENERIC_SUBDIRS)"; \ - for x in $$GENSUBDIRS; \ - do \ - if [ "$$x" == "$$i" ]; then \ - XCFLAGS="$(RC_CFLAGS)"; \ - break; \ - fi \ - done; \ - cd $$i; ${MAKE} \ - "OBJROOT=$$OBJROOT" \ - "SYMROOT=$$SYMROOT" \ - "DSTROOT=$$DSTROOT" \ - "SRCROOT=$$SRCROOT" \ - "RC_ARCHS=$$RC_ARCHS" \ - "TARGET=$$i" \ - "RC_KANJI=$(RC_KANJI)" \ - "JAPANESE=$(JAPANESE)" \ - "RC_CFLAGS=$$XCFLAGS" $@ \ - ) || exit $$?; \ - else \ - echo "========= nothing to build for $$i ========="; \ - fi; \ - done - dist image: all + @# To force the read of auto.conf (generated by 'all' target) + @make $@-local + +dist-local image-local: @echo "================= Distrib =================" @echo "\t[RM] ${IMGROOT}" @rm -rf ${IMGROOT} @@ -118,9 +75,12 @@ @cp -f ${SYMROOT}/i386/boot0md ${IMGROOT}/usr/standalone/i386 @cp -f ${SYMROOT}/i386/boot1h ${IMGROOT}/usr/standalone/i386 @cp -f ${SYMROOT}/i386/boot1f32 ${IMGROOT}/usr/standalone/i386 +ifdef CONFIG_FDISK440 @cp -f ${SYMROOT}/i386/fdisk440 ${IMGROOT}/usr/bin +endif +ifdef CONFIG_BDMESG @cp -f ${SYMROOT}/i386/bdmesg ${IMGROOT}/usr/bin - +endif @echo "\t[HDIUTIL] ${ISOIMAGE}" @hdiutil makehybrid -iso -joliet -hfs -hfs-volume-name \ ${CDLABEL} -eltorito-boot ${CDBOOT} -no-emul-boot -ov -o \ @@ -131,20 +91,26 @@ @gzip --best ${DISTFILE}.tar @mv ${DISTFILE}.tar.gz ${DISTFILE}.tgz -clean: - @echo "\t[RM] $(OBJROOT)" - @echo "\t[RM] $(SYMROOT)" - @echo "\t[RM] $(DSTROOT)" - @echo "\t[RM] $(SRCROOT)/revision" - @echo "\t[RM] $(SRCROOT)/i386/modules/module_includes" - @echo "\t[RM] $(SRCROOT)/auto.conf" - @echo "\t[RM] $(SRCROOT)/autoconf.h" - @echo "\t[RM] $(SRCROOT)/autoconf.inc" +clean-local: + @if [ -f "$(HEADER_VERSION)" ];then echo "\t[RM] $(HEADER_VERSION)"; fi + @if [ -f "$(SRCROOT)/revision" ];then echo "\t[RM] $(SRCROOT)/revision"; fi + @rm -f $(HEADER_VERSION) $(SRCROOT)/revision - @rm -rf $(OBJROOT) $(SYMROOT) $(DSTROOT) $(SRCROOT)/revision \ +distclean-local: + @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 "$(SRCROOT)/i386/modules/module_includes" ];then \ + echo "\t[RMDIR] $(SRCROOT)/i386/modules/module_includes"; \ + fi + @if [ -f "$(SRCROOT)/auto.conf" ];then echo "\t[RM] $(SRCROOT)/auto.conf"; fi + @if [ -f "$(SRCROOT)/autoconf.h" ];then echo "\t[RM] $(SRCROOT)/autoconf.h"; fi + @if [ -f "$(SRCROOT)/autoconf.inc" ];then echo "\t[RM] $(SRCROOT)/autoconf.inc"; fi + + @rm -rf $(OBJROOT) $(SYMROOT) $(DSTROOT) \ $(SRCROOT)/i386/modules/module_includes \ - $(SRCROOT)/auto.conf \ - $(SRCROOT)/autoconf.h \ + $(SRCROOT)/auto.conf \ + $(SRCROOT)/autoconf.h \ $(SRCROOT)/autoconf.inc pkg installer: all @@ -152,15 +118,6 @@ @echo "\t[GZ] ${DISTFILE}.pkg" @gzip --best ${DISTFILE}.pkg - -$(SYMROOT)/i386/vers.h: version - @echo "#define I386BOOT_VERSION \"5.0.132\"" > $@ - @echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $@ - @echo "#define I386BOOT_CHAMELEONVERSION \"`cat version`\"" >> $@ - @echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $@ - - -.PHONY: $(SYMROOT)/i386/vers.h .PHONY: config .PHONY: clean .PHONY: image