Revision: 420 http://trac.macosforge.org/projects/darwinbuild/changeset/420 Author: wsiegrist@apple.com Date: 2008-11-18 15:22:17 -0800 (Tue, 18 Nov 2008) Log Message: ----------- Merging PR-4841388 Modified Paths: -------------- trunk/Makefile trunk/darwinxref/Makefile Property Changed: ---------------- trunk/ Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2008-11-13 03:28:20 UTC (rev 419) +++ trunk/Makefile 2008-11-18 23:22:17 UTC (rev 420) @@ -20,7 +20,7 @@ make -C $(DIR) $@) || exit 1; ) installsrc: - tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www + tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www --exclude=darwinup/libredo.o installhdrs: @echo Nothing to be done for $@ Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2008-11-13 03:28:20 UTC (rev 419) +++ trunk/darwinxref/Makefile 2008-11-18 23:22:17 UTC (rev 420) @@ -28,7 +28,7 @@ CFLAGS+=-g $(TCL_CFLAGS) -DVERSION=\"$(shell cat ../VERSION)\" $(SQLITEINC) LDFLAGS+=-framework CoreFoundation $(TCL_LDFLAGS) PLUGIN_CFLAGS=$(CFLAGS) -I. -PLUGIN_LDFLAGS=$(LDFLAGS) -bundle -bundle_loader $(OBJROOT)/darwinxref +PLUGIN_LDFLAGS=$(LDFLAGS) -bundle -bundle_loader $(SYMROOT)/darwinxref VERSION=$(shell uname -r | cut -f1 -d. ) ifeq ($(VERSION),7) @@ -54,11 +54,11 @@ install: all install_apple_plugins [ -d $(BINDIR) ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinxref $(BINDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) $(SYMROOT)/darwinxref $(BINDIR) [ -d $(DATDIR)/plugins ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)/plugins - $(INSTALL) $(INSTALL_DOC_FLAGS) $(wildcard $(OBJROOT)/plugins/*.so) $(wildcard $(OBJROOT)/plugins/*.tcl) $(DATDIR)/plugins + $(INSTALL) $(INSTALL_DOC_FLAGS) $(wildcard $(OBJROOT)/plugins/*.so) $(wildcard plugins/*.tcl) $(DATDIR)/plugins [ -d $(INCDIR) ] || \ $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(INCDIR) @@ -84,10 +84,10 @@ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ echo $$CMD ; $$CMD || exit 1 ; \ done - $(CC) $(LDFLAGS) -o $(OBJROOT)/darwinxref \ + $(CC) $(LDFLAGS) -o $(SYMROOT)/darwinxref \ $(SQLITELIB) \ $(foreach OFILE, $(SOURCES:.c=.o), $(OBJROOT)/$(notdir $(OFILE))) - $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(OBJROOT)/darwinxref || true + $(DSYMUTIL) --out $(SYMROOT)/darwinxref.dSYM $(SYMROOT)/darwinxref || true plugins/register.so: plugins/register.c DBPlugin.h @mkdir -p $(OBJROOT)/plugins