[darwinbuild-changes] [332] trunk
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 14 02:43:53 PST 2007
Revision: 332
http://trac.macosforge.org/projects/darwinbuild/changeset/332
Author: kvv at apple.com
Date: 2007-02-14 02:43:52 -0800 (Wed, 14 Feb 2007)
Log Message:
-----------
build changes to support XBS
Modified Paths:
--------------
trunk/Makefile
trunk/common.mk
trunk/darwinbuild/Makefile
trunk/darwintrace/Makefile
trunk/darwinxref/Makefile
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-02-02 02:02:59 UTC (rev 331)
+++ trunk/Makefile 2007-02-14 10:43:52 UTC (rev 332)
@@ -7,5 +7,11 @@
all clean install uninstall:
@$(foreach DIR,$(SUBDIRS), \
- echo "*** Making $@ in $(DIR) ***" ; \
- make -C $(DIR) $@ ;)
+ (echo "*** Making $@ in $(DIR) ***" ; \
+ make -C $(DIR) $@) || exit 1; )
+
+installsrc:
+ tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=darwinup
+
+installhdrs:
+ @echo Nothing to be done for $@
Modified: trunk/common.mk
===================================================================
--- trunk/common.mk 2007-02-02 02:02:59 UTC (rev 331)
+++ trunk/common.mk 2007-02-14 10:43:52 UTC (rev 332)
@@ -4,6 +4,10 @@
PREFIX?=/usr/local
DESTDIR?=$(DSTROOT)
+### makefile variables normally set by XBS
+OBJROOT?=.
+SYMROOT?=.
+
###
###
BINDIR=$(DESTDIR)$(PREFIX)/bin
Modified: trunk/darwinbuild/Makefile
===================================================================
--- trunk/darwinbuild/Makefile 2007-02-02 02:02:59 UTC (rev 331)
+++ trunk/darwinbuild/Makefile 2007-02-14 10:43:52 UTC (rev 332)
@@ -8,7 +8,7 @@
all: manifest
manifest: manifest.c
- cc -o $@ -lcrypto $^
+ cc -o $(OBJROOT)/$@ -lcrypto $^
install: all
[ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
@@ -19,7 +19,7 @@
$(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR)
$(INSTALL) $(INSTALL_EXE_FLAGS) installXcodebuild $(DATDIR)
$(INSTALL) $(INSTALL_EXE_FLAGS) createChroot $(DATDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) manifest $(DATDIR)
+ $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/manifest $(DATDIR)
$(INSTALL) $(INSTALL_EXE_FLAGS) ditto.sh $(DATDIR)/ditto
$(INSTALL) $(INSTALL_EXE_FLAGS) buildlist.sh $(DATDIR)/buildlist
$(INSTALL) $(INSTALL_EXE_FLAGS) buildorder.pl $(DATDIR)/buildorder
Modified: trunk/darwintrace/Makefile
===================================================================
--- trunk/darwintrace/Makefile 2007-02-02 02:02:59 UTC (rev 331)
+++ trunk/darwintrace/Makefile 2007-02-14 10:43:52 UTC (rev 332)
@@ -18,7 +18,7 @@
darwintrace.dylib: darwintrace.c
- cc -o $@ \
+ cc -o $(OBJROOT)/$@ \
-arch i386 -arch ppc -arch ppc64 \
-W -Wall -pedantic -std=c99 \
-flat_namespace \
@@ -33,7 +33,7 @@
install: all
[ -d $(DATDIR) ] || \
$(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)
- $(INSTALL) $(INSTALL_DOC_FLAGS) darwintrace.dylib $(DATDIR)
+ $(INSTALL) $(INSTALL_DOC_FLAGS) $(OBJROOT)/darwintrace.dylib $(DATDIR)
uninstall:
rm -f $(DATDIR)/darwintrace.dylib
Modified: trunk/darwinxref/Makefile
===================================================================
--- trunk/darwinxref/Makefile 2007-02-02 02:02:59 UTC (rev 331)
+++ trunk/darwinxref/Makefile 2007-02-14 10:43:52 UTC (rev 332)
@@ -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 darwinxref
+PLUGIN_LDFLAGS=$(LDFLAGS) -bundle -bundle_loader $(OBJROOT)/darwinxref
VERSION=$(shell uname -r | cut -f1 -d. )
ifeq ($(VERSION), 7)
@@ -48,11 +48,11 @@
install: all install_apple_plugins
[ -d $(BINDIR) ] || \
$(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR)
- $(INSTALL) $(INSTALL_EXE_FLAGS) darwinxref $(BINDIR)
+ $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinxref $(BINDIR)
[ -d $(DATDIR)/plugins ] || \
$(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR)/plugins
- $(INSTALL) $(INSTALL_DOC_FLAGS) $(PLUGIN_OBJECTS) $(DATDIR)/plugins
+ $(INSTALL) $(INSTALL_DOC_FLAGS) $(wildcard $(OBJROOT)/plugins/*.so) $(wildcard $(OBJROOT)/plugins/*.tcl) $(DATDIR)/plugins
[ -d $(INCDIR) ] || \
$(INSTALL) -d $(INSTALL_DIR_FLAGS) $(INCDIR)
@@ -69,20 +69,22 @@
rm -f upgrade_plist
darwinxref: $(SOURCES)
- cc -o $@ \
+ cc -o $(OBJROOT)/$@ \
$(CFLAGS) \
$(LDFLAGS) \
$(SOURCES) \
$(SQLITELIB)
plugins/register.so: plugins/register.c DBPlugin.h
- cc -o $@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $<
+ @mkdir -p $(OBJROOT)/plugins
+ cc -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $(SQLITEINC) $(SQLITELIB) -lcrypto $<
plugins/%.so: plugins/%.c DBPlugin.h
- cc -o $@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
+ @mkdir -p $(OBJROOT)/plugins
+ cc -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h
- cc -o $@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
+ cc -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $<
apple_plugins:
@if [ -d plugins-apple ]; then \
@@ -95,4 +97,4 @@
fi
upgrade_plist: upgrade_plist.c cfutils.c
- cc -o $@ $(CFLAGS) $(LDFLAGS) $^
+ cc -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20070214/90061ea9/attachment-0001.html
More information about the darwinbuild-changes
mailing list