<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[605] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/darwinbuild/changeset/605">605</a></dd>
<dt>Author</dt> <dd>wsiegrist@apple.com</dd>
<dt>Date</dt> <dd>2009-10-23 16:36:25 -0700 (Fri, 23 Oct 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Obey OBJROOT more. Darwinup still needs to be fixed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdarwinbuildMakefile">trunk/darwinbuild/Makefile</a></li>
<li><a href="#trunkdarwintraceMakefile">trunk/darwintrace/Makefile</a></li>
<li><a href="#trunkdarwinupMakefile">trunk/darwinup/Makefile</a></li>
<li><a href="#trunkdarwinxrefMakefile">trunk/darwinxref/Makefile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdarwinbuildMakefile"></a>
<div class="modfile"><h4>Modified: trunk/darwinbuild/Makefile (604 => 605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/darwinbuild/Makefile        2009-10-23 23:10:22 UTC (rev 604)
+++ trunk/darwinbuild/Makefile        2009-10-23 23:36:25 UTC (rev 605)
</span><span class="lines">@@ -5,6 +5,8 @@
</span><span class="cx"> ###
</span><span class="cx"> DATDIR:=$(DATDIR)/darwinbuild
</span><span class="cx"> 
</span><ins>+override OBJROOT:=$(OBJROOT)/darwinbuild~obj
+
</ins><span class="cx"> PrefixReplacements = darwinbuild \
</span><span class="cx">                      darwinmaster.sh \
</span><span class="cx">                      packageRoots.sh \
</span><span class="lines">@@ -15,25 +17,27 @@
</span><span class="cx"> all: manifest prefixes
</span><span class="cx"> 
</span><span class="cx"> manifest: manifest.c
</span><ins>+        @mkdir -p $(OBJROOT)
</ins><span class="cx">         cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^
</span><span class="cx"> 
</span><span class="cx"> prefixes: $(PrefixReplacements)
</span><span class="cx"> 
</span><span class="cx"> $(PrefixReplacements): % : %.in
</span><del>-        $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in &gt; $@ ;                        
</del><ins>+        @mkdir -p $(OBJROOT)
+        $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in &gt; $(OBJROOT)/$@ ;
</ins><span class="cx"> 
</span><span class="cx"> install: all
</span><span class="cx">         [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
</span><del>-        $(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR)
-        $(INSTALL) $(INSTALL_EXE_FLAGS) darwinmaster.sh $(BINDIR)/darwinmaster
</del><ins>+        $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinbuild $(BINDIR)
+        $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinmaster.sh $(BINDIR)/darwinmaster
</ins><span class="cx"> 
</span><span class="cx">         [ -d $(DATDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)
</span><span class="cx">         $(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR)
</span><del>-        $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode $(DATDIR)
</del><ins>+        $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode $(DATDIR)
</ins><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode2 $(DATDIR)
</span><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode3 $(DATDIR)
</span><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode31 $(DATDIR)
</span><del>-        $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode32 $(DATDIR)
</del><ins>+        $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode32 $(DATDIR)
</ins><span class="cx">         $(INSTALL) $(INSTALL_DOC_FLAGS) Info.plist $(DATDIR)
</span><span class="cx">         $(INSTALL) $(INSTALL_DOC_FLAGS) SDKSettings.plist $(DATDIR)
</span><span class="cx"> 
</span><span class="lines">@@ -42,10 +46,10 @@
</span><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) ditto.sh $(DATDIR)/ditto
</span><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) buildlist.sh $(DATDIR)/buildlist
</span><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) buildorder.pl $(DATDIR)/buildorder
</span><del>-        $(INSTALL) $(INSTALL_EXE_FLAGS) packageRoots.sh $(DATDIR)/packageRoots
</del><ins>+        $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/packageRoots.sh $(DATDIR)/packageRoots
</ins><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) synthfat.sh $(DATDIR)/synthfat
</span><span class="cx">         $(INSTALL) $(INSTALL_EXE_FLAGS) thinFile.sh $(DATDIR)/thinFile
</span><del>-        $(INSTALL) $(INSTALL_EXE_FLAGS) thinPackages.sh $(DATDIR)/thinPackages
</del><ins>+        $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/thinPackages.sh $(DATDIR)/thinPackages
</ins><span class="cx"> 
</span><span class="cx"> uninstall:
</span><span class="cx">         rm -f $(BINDIR)/darwinbuild
</span><span class="lines">@@ -70,6 +74,5 @@
</span><span class="cx">         
</span><span class="cx"> 
</span><span class="cx"> clean:
</span><del>-        rm -f manifest
-        @$(foreach SCRIPT,$(PrefixReplacements), \
-                rm -f $(SCRIPT) ; )
</del><ins>+        rm -rf $(OBJROOT) 
+
</ins></span></pre></div>
<a id="trunkdarwintraceMakefile"></a>
<div class="modfile"><h4>Modified: trunk/darwintrace/Makefile (604 => 605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/darwintrace/Makefile        2009-10-23 23:10:22 UTC (rev 604)
+++ trunk/darwintrace/Makefile        2009-10-23 23:36:25 UTC (rev 605)
</span><span class="lines">@@ -7,6 +7,8 @@
</span><span class="cx"> ###
</span><span class="cx"> DATDIR:=$(DATDIR)/darwinbuild
</span><span class="cx"> 
</span><ins>+override OBJROOT:=$(OBJROOT)/darwintrace~obj
+
</ins><span class="cx"> all: darwintrace.dylib
</span><span class="cx"> 
</span><span class="cx"> VERSION=$(shell uname -r | cut -f1 -d. )
</span><span class="lines">@@ -17,6 +19,7 @@
</span><span class="cx"> endif
</span><span class="cx"> 
</span><span class="cx"> darwintrace.dylib: darwintrace.c
</span><ins>+        @mkdir -p $(OBJROOT)
</ins><span class="cx">         cc -o $(OBJROOT)/$@ \
</span><span class="cx">                 $(CFLAGS) \
</span><span class="cx">                 -Wall -Werror -pedantic -std=c99 \
</span><span class="lines">@@ -27,7 +30,7 @@
</span><span class="cx">                 -dynamiclib \
</span><span class="cx">                 $^ $(LIBS)
</span><span class="cx"> clean:
</span><del>-        rm -f darwintrace.dylib
</del><ins>+        rm -rf $(OBJROOT) 
</ins><span class="cx"> 
</span><span class="cx"> install: all
</span><span class="cx">         [ -d $(DATDIR) ] || \
</span></span></pre></div>
<a id="trunkdarwinupMakefile"></a>
<div class="modfile"><h4>Modified: trunk/darwinup/Makefile (604 => 605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/darwinup/Makefile        2009-10-23 23:10:22 UTC (rev 604)
+++ trunk/darwinup/Makefile        2009-10-23 23:36:25 UTC (rev 605)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><span class="cx"> include ../common.mk
</span><span class="cx"> 
</span><ins>+override OBJROOT:=$(OBJROOT)/darwinup~obj
+
</ins><span class="cx"> CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(CFLAGS)
</span><span class="cx"> # libredo.o is generated from cctools_ofiles
</span><span class="cx"> REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \
</span><span class="lines">@@ -27,4 +29,5 @@
</span><span class="cx">         rm -f $(BINDIR)/darwinup        
</span><span class="cx"> 
</span><span class="cx"> clean:
</span><del>-        rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o
</del><ins>+        rm -rf $(OBJROOT)

</ins></span></pre></div>
<a id="trunkdarwinxrefMakefile"></a>
<div class="modfile"><h4>Modified: trunk/darwinxref/Makefile (604 => 605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/darwinxref/Makefile        2009-10-23 23:10:22 UTC (rev 604)
+++ trunk/darwinxref/Makefile        2009-10-23 23:36:25 UTC (rev 605)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> DATDIR:=$(DATDIR)/darwinxref
</span><span class="cx"> INCDIR:=$(INCDIR)/darwinbuild
</span><span class="cx"> 
</span><ins>+override OBJROOT:=$(OBJROOT)/darwinxref~obj
+
</ins><span class="cx"> SOURCES= \
</span><span class="cx">         DBDataStore.c \
</span><span class="cx">         DBPlugin.c \
</span><span class="lines">@@ -75,15 +77,10 @@
</span><span class="cx">         -rmdir $(INCDIR)
</span><span class="cx"> 
</span><span class="cx"> clean:
</span><del>-        rm -f darwinxref
-        rm -rf darwinxref.dSYM
-        rm -f $(SOURCES:.c=.o)
-        rm -f $(PLUGIN_SOURCES:.c=.so)
-        rm -rf $(PLUGIN_SOURCES:.c=.so.dSYM)
-        rm -f upgrade_plist
-        rm -rf upgrade_plist.dSYM
</del><ins>+        rm -rf $(OBJROOT)
</ins><span class="cx"> 
</span><span class="cx"> darwinxref: $(SOURCES)
</span><ins>+        @mkdir -p $(OBJROOT)
</ins><span class="cx">         @for CFILE in $(SOURCES); do \
</span><span class="cx">                 OFILE=$$(echo $$(basename $${CFILE}) | sed -e 's,\.[^.]*$$,.o,') ; \
</span><span class="cx">                 CMD=&quot;$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}&quot;; \
</span><span class="lines">@@ -103,6 +100,7 @@
</span><span class="cx">         cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $&lt;
</span><span class="cx"> 
</span><span class="cx"> plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h darwinxref
</span><ins>+        @mkdir -p $(OBJROOT)/plugins-darwinports
</ins><span class="cx">         cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $&lt;
</span><span class="cx"> 
</span><span class="cx"> apple_plugins:
</span><span class="lines">@@ -116,5 +114,6 @@
</span><span class="cx">         fi
</span><span class="cx"> 
</span><span class="cx"> upgrade_plist: upgrade_plist.c cfutils.c
</span><ins>+        @mkdir -p $(OBJROOT)
</ins><span class="cx">         cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>