[darwinbuild-changes] [398] trunk

[source_changes at macosforge.org]

Revision: 398
          http://trac.macosforge.org/projects/darwinbuild/changeset/398
Author:   wsiegrist at apple.com
Date:     2008-10-24 07:27:04 -0700 (Fri, 24 Oct 2008)
Log Message:
-----------
Build darwinup by default and fix a build failure when SYMROOT != OBJROOT

Modified Paths:
--------------
    trunk/Makefile
    trunk/darwinup/Makefile
    trunk/darwinxref/Makefile

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-10-24 07:35:48 UTC (rev 397)
+++ trunk/Makefile	2008-10-24 14:27:04 UTC (rev 398)
@@ -1,6 +1,15 @@
+Project	= darwinbuild
+SubProjects = darwinbuild \
+	darwintrace \
+	darwinup \
+	darwinxref 
+
+Install_Flags = DESTDIR=$(DSTROOT)
+
 SUBDIRS= \
 	darwinbuild \
 	darwinxref \
+	darwinup \
 	darwintrace
 
 .PHONY: all clean install uninstall
@@ -11,7 +20,7 @@
 		make -C $(DIR) $@) || exit 1; )
 
 installsrc:
-	tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=darwinup
+	tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www
 
 installhdrs:
 	@echo Nothing to be done for $@

Modified: trunk/darwinup/Makefile
===================================================================
--- trunk/darwinup/Makefile	2008-10-24 07:35:48 UTC (rev 397)
+++ trunk/darwinup/Makefile	2008-10-24 14:27:04 UTC (rev 398)
@@ -1,23 +1,29 @@
-all: darwinup
+include ../common.mk
 
 CXXFLAGS=-g
-
-Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h
-Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h
-Digest.o: Digest.cpp Digest.h
-File.o: File.cpp Archive.h Digest.h File.h Utils.h
-Utils.o: Utils.h
-main.o: main.cpp Depot.h Utils.h
-
 # libredo.o is generated from cctools_ofiles
-
 REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \
 		echo /usr/local/lib/libredo_prebinding.a ; else \
 		echo libredo.o ; fi)
 
+
+install: all
+	[ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
+	$(INSTALL) $(INSTALL_EXE_FLAGS) darwinup $(BINDIR)
+
+
+all: darwinup
+
 darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \
 	$(REDO)
 	g++ -lcrypto -lsqlite3 -o $@ $^
 
+Archive.o: Archive.cpp Archive.h Depot.h File.h Utils.h
+Depot.o: Depot.cpp Archive.h Depot.h File.h Utils.h
+Digest.o: Digest.cpp Digest.h
+File.o: File.cpp Archive.h Digest.h File.h Utils.h
+Utils.o: Utils.h
+main.o: main.cpp Depot.h Utils.h
+
 clean:
 	rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o

Modified: trunk/darwinxref/Makefile
===================================================================
--- trunk/darwinxref/Makefile	2008-10-24 07:35:48 UTC (rev 397)
+++ trunk/darwinxref/Makefile	2008-10-24 14:27:04 UTC (rev 398)
@@ -4,7 +4,7 @@
 ### Variables for the 'install' phase
 ###
 DATDIR:=$(DATDIR)/darwinxref
-INCDIR:=$(INCDIR)/DarwinBuild
+INCDIR:=$(INCDIR)/darwinbuild
 
 SOURCES= \
 	DBDataStore.c \
@@ -84,10 +84,10 @@
 		CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \
 		echo $$CMD ; $$CMD || exit 1 ; \
 	done
-	$(CC) $(LDFLAGS) -o $(SYMROOT)/darwinxref \
+	$(CC) $(LDFLAGS) -o $(OBJROOT)/darwinxref \
 		$(SQLITELIB) \
 		$(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE)))
-	$(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true
+	$(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(OBJROOT)/darwinxref || true
 
 plugins/register.so: plugins/register.c DBPlugin.h
 	@mkdir -p $(OBJROOT)/plugins
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20081024/6d7e0604/attachment.html>