[darwinbuild-changes] [606] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 29 11:05:27 PDT 2009
Revision: 606
http://trac.macosforge.org/projects/darwinbuild/changeset/606
Author: wsiegrist at apple.com
Date: 2009-10-29 11:05:23 -0700 (Thu, 29 Oct 2009)
Log Message:
-----------
Back out r605 since that approach is not going to work well
Revision Links:
--------------
http://trac.macosforge.org/projects/darwinbuild/changeset/605
Modified Paths:
--------------
trunk/darwinbuild/Makefile
trunk/darwintrace/Makefile
trunk/darwinup/Makefile
trunk/darwinxref/Makefile
Modified: trunk/darwinbuild/Makefile
===================================================================
--- trunk/darwinbuild/Makefile 2009-10-23 23:36:25 UTC (rev 605)
+++ trunk/darwinbuild/Makefile 2009-10-29 18:05:23 UTC (rev 606)
@@ -5,8 +5,6 @@
###
DATDIR:=$(DATDIR)/darwinbuild
-override OBJROOT:=$(OBJROOT)/darwinbuild~obj
-
PrefixReplacements = darwinbuild \
darwinmaster.sh \
packageRoots.sh \
@@ -17,27 +15,25 @@
all: manifest prefixes
manifest: manifest.c
- @mkdir -p $(OBJROOT)
cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^
prefixes: $(PrefixReplacements)
$(PrefixReplacements): % : %.in
- @mkdir -p $(OBJROOT)
- $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $(OBJROOT)/$@ ;
+ $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $@ ;
install: all
[ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinbuild $(BINDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinmaster.sh $(BINDIR)/darwinmaster
+ $(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR)
+ $(INSTALL) $(INSTALL_EXE_FLAGS) darwinmaster.sh $(BINDIR)/darwinmaster
[ -d $(DATDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)
$(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode $(DATDIR)
+ $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode $(DATDIR)
$(INSTALL) $(INSTALL_EXE_FLAGS) installXcode2 $(DATDIR)
$(INSTALL) $(INSTALL_EXE_FLAGS) installXcode3 $(DATDIR)
$(INSTALL) $(INSTALL_EXE_FLAGS) installXcode31 $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode32 $(DATDIR)
+ $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode32 $(DATDIR)
$(INSTALL) $(INSTALL_DOC_FLAGS) Info.plist $(DATDIR)
$(INSTALL) $(INSTALL_DOC_FLAGS) SDKSettings.plist $(DATDIR)
@@ -46,10 +42,10 @@
$(INSTALL) $(INSTALL_EXE_FLAGS) ditto.sh $(DATDIR)/ditto
$(INSTALL) $(INSTALL_EXE_FLAGS) buildlist.sh $(DATDIR)/buildlist
$(INSTALL) $(INSTALL_EXE_FLAGS) buildorder.pl $(DATDIR)/buildorder
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/packageRoots.sh $(DATDIR)/packageRoots
+ $(INSTALL) $(INSTALL_EXE_FLAGS) packageRoots.sh $(DATDIR)/packageRoots
$(INSTALL) $(INSTALL_EXE_FLAGS) synthfat.sh $(DATDIR)/synthfat
$(INSTALL) $(INSTALL_EXE_FLAGS) thinFile.sh $(DATDIR)/thinFile
- $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/thinPackages.sh $(DATDIR)/thinPackages
+ $(INSTALL) $(INSTALL_EXE_FLAGS) thinPackages.sh $(DATDIR)/thinPackages
uninstall:
rm -f $(BINDIR)/darwinbuild
@@ -74,5 +70,6 @@
clean:
- rm -rf $(OBJROOT)
-
+ rm -f manifest
+ @$(foreach SCRIPT,$(PrefixReplacements), \
+ rm -f $(SCRIPT) ; )
Modified: trunk/darwintrace/Makefile
===================================================================
--- trunk/darwintrace/Makefile 2009-10-23 23:36:25 UTC (rev 605)
+++ trunk/darwintrace/Makefile 2009-10-29 18:05:23 UTC (rev 606)
@@ -7,8 +7,6 @@
###
DATDIR:=$(DATDIR)/darwinbuild
-override OBJROOT:=$(OBJROOT)/darwintrace~obj
-
all: darwintrace.dylib
VERSION=$(shell uname -r | cut -f1 -d. )
@@ -19,7 +17,6 @@
endif
darwintrace.dylib: darwintrace.c
- @mkdir -p $(OBJROOT)
cc -o $(OBJROOT)/$@ \
$(CFLAGS) \
-Wall -Werror -pedantic -std=c99 \
@@ -30,7 +27,7 @@
-dynamiclib \
$^ $(LIBS)
clean:
- rm -rf $(OBJROOT)
+ rm -f darwintrace.dylib
install: all
[ -d $(DATDIR) ] || \
Modified: trunk/darwinup/Makefile
===================================================================
--- trunk/darwinup/Makefile 2009-10-23 23:36:25 UTC (rev 605)
+++ trunk/darwinup/Makefile 2009-10-29 18:05:23 UTC (rev 606)
@@ -1,7 +1,5 @@
include ../common.mk
-override OBJROOT:=$(OBJROOT)/darwinup~obj
-
CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(CFLAGS)
# libredo.o is generated from cctools_ofiles
REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \
@@ -29,5 +27,4 @@
rm -f $(BINDIR)/darwinup
clean:
- rm -rf $(OBJROOT)
-
+ rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o
Modified: trunk/darwinxref/Makefile
===================================================================
--- trunk/darwinxref/Makefile 2009-10-23 23:36:25 UTC (rev 605)
+++ trunk/darwinxref/Makefile 2009-10-29 18:05:23 UTC (rev 606)
@@ -6,8 +6,6 @@
DATDIR:=$(DATDIR)/darwinxref
INCDIR:=$(INCDIR)/darwinbuild
-override OBJROOT:=$(OBJROOT)/darwinxref~obj
-
SOURCES= \
DBDataStore.c \
DBPlugin.c \
@@ -77,10 +75,15 @@
-rmdir $(INCDIR)
clean:
- rm -rf $(OBJROOT)
+ 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
darwinxref: $(SOURCES)
- @mkdir -p $(OBJROOT)
@for CFILE in $(SOURCES); do \
OFILE=$$(echo $$(basename $${CFILE}) | sed -e 's,\.[^.]*$$,.o,') ; \
CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \
@@ -100,7 +103,6 @@
cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h darwinxref
- @mkdir -p $(OBJROOT)/plugins-darwinports
cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
apple_plugins:
@@ -114,6 +116,5 @@
fi
upgrade_plist: upgrade_plist.c cfutils.c
- @mkdir -p $(OBJROOT)
cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20091029/3bea7792/attachment.html>
More information about the darwinbuild-changes
mailing list