CoreOSMakefiles-21.tar.gz

diff --git a/README b/README
index ccfa4a4f6e078824c28a4de14195ff2ec50edb5e..ba8e4815c26a4bf653c6ae13ba189fa494af5c10 100644 (file)
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 Core OS Common Makefiles
 
-  These are some makefiles which are required to build some Rhapsody
+  These are some makefiles which are required to build some Darwin
 Core OS projects. Please note that these are not supported in any way
-outside of Core OS; they are subject to change without notice.
+outside of Darwin; they are subject to change without notice.
 
        -Wilfredo Sanchez
-        wsanchez@apple.com
+        wsanchez@opensource.apple.com

diff --git a/ReleaseControl/BSD.make b/ReleaseControl/BSD.make
index 71cfd5e801c8c11abab1d6634a6e8a5dcede5b68..16bd3b201110d48a7ffb20fe93fbd97cf2f78ecf 100644 (file)
--- a/ReleaseControl/BSD.make
+++ b/ReleaseControl/BSD.make
@@ -37,7 +37,7 @@ include $(CoreOSMakefiles)/ReleaseControl/Common.make
 
 CC_Debug += -Wall -Werror
 
-Extra_CC_Flags += -traditional-cpp
+Extra_CC_Flags += -no-cpp-precomp
 
 Environment = ARCH_FLAGS="$(CC_Archs)" \
                   COPTS="$(CFLAGS)"    \

diff --git a/ReleaseControl/Common.make b/ReleaseControl/Common.make
index 25d16a8cdd36e098a9e614c94a1cd8c81a1fba22..df5161b5bfae330a2a999ced5ee4de9e77510576 100644 (file)
--- a/ReleaseControl/Common.make
+++ b/ReleaseControl/Common.make
@@ -45,19 +45,19 @@ include $(CoreOSMakefiles)/Standard/Standard.make
 # Some reasonable defaults for RC variables
 ##
 
-RC_ARCHS   = ppc i386
+RC_ARCHS   = $(shell file /usr/lib/libSystem.B.dylib | grep 'shared library ' | sed 's|.*shared library ||')
 RC_RELEASE = unknown
 RC_VERSION = unknown
 
 ifeq ($(COPY_SOURCES),YES)
-SRCROOT = /tmp/$(Project)/Sources
+SRCROOT = /tmp/$(ProjectName)/Sources
 else
 SRCROOT = $(shell pwd)
 endif
 
-OBJROOT = /tmp/$(Project)/Build
-SYMROOT = /tmp/$(Project)/Debug
-DSTROOT = /tmp/$(Project)/Release
+OBJROOT = /tmp/$(ProjectName)/Build
+SYMROOT = /tmp/$(ProjectName)/Debug
+DSTROOT = /tmp/$(ProjectName)/Release
 
 ##
 # My variables

diff --git a/ReleaseControl/GNUSource.make b/ReleaseControl/GNUSource.make
index c52a2e623fdbe8c5a483d9ba0a1e221391d36450..d287a658f6cc6130c07bc3359a93b520c9202cb7 100644 (file)
--- a/ReleaseControl/GNUSource.make
+++ b/ReleaseControl/GNUSource.make
@@ -65,7 +65,7 @@ Install_Info = $(SHAREDIR)/info
 endif
 ifndef Install_HTML
 ifeq "$(UserType)" "Developer"
-Install_HTML = $(NSDEVELOPERDIR)/Documentation/$(ToolType)/$(ProjectName)
+Install_HTML = $(NSDEVELOPERDIR)/Documentation/DeveloperTools/$(ProjectName)
 else
 Install_HTML = $(NSDOCUMENTATIONDIR)/$(ToolType)/$(ProjectName)
 endif

diff --git a/ReleaseControl/README b/ReleaseControl/README
index e761539b6b7ce9b0a7c12ed71330951981ecfbae..02b67f355cccc946a9ceaf9daeb5efa8adbb0406 100644 (file)
--- a/ReleaseControl/README
+++ b/ReleaseControl/README
@@ -12,3 +12,6 @@ and install.
 
   GNUSource.make implements the build and install targets for sources
 which use GNU autoconf's configure script to build.
+
+  BSDSource.make implements the build and install targets for sources
+which use BSD makefiles to build.

diff --git a/Standard/Implicit.make b/Standard/Implicit.make
index db18ae5f15cb8257680bbc6959d0f18156b383b1..c89ad0514415ad0cdb6526633613d492ba72109d 100644 (file)
--- a/Standard/Implicit.make
+++ b/Standard/Implicit.make
@@ -36,7 +36,7 @@ ifeq ($(DEBUG),YES)
 CC_Optimize = 
 LD_Prebind  = 
 else
-CC_Optimize = -O3
+CC_Optimize = -Os
 endif
 CC_Other    = -pipe