From 51ef2a1e790cc14c89bcf8bf0ec351e89096f437 Mon Sep 17 00:00:00 2001 From: Apple Date: Thu, 2 Apr 2009 20:51:23 +0000 Subject: [PATCH] CoreOSMakefiles-61.tar.gz --- Makefile | 36 ++- ReleaseControl/BSDCommon.make | 3 +- ReleaseControl/Common.make | 7 - ReleaseControl/GNUSource.make | 18 +- Standard/Commands.in | 331 ++++++++++++++++++++++ Standard/Commands.make | 159 ----------- Standard/{Variables.make => Variables.in} | 71 ++++- 7 files changed, 447 insertions(+), 178 deletions(-) create mode 100644 Standard/Commands.in delete mode 100644 Standard/Commands.make rename Standard/{Variables.make => Variables.in} (80%) diff --git a/Makefile b/Makefile index 55bc272..35ecb3b 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,34 @@ Project=CoreOSMakefiles -CoreOSMakefiles = . +Destination = $(MAKEFILEPATH)/CoreOS +BSDMAKEDIR = /usr/share/mk/CoreOS +BSDSUFFIX = .mk +BSDDEFINE = BSDMAKESTYLE +GNUSUFFIX = .make +INBASENAMES = Commands Variables +INSUFFIX = .in +STANDARD = Standard -include $(CoreOSMakefiles)/ReleaseControl/Common.make +install: + @$(MAKE) installsrc SRCROOT=$(DSTROOT)$(Destination) + rm -f $(DSTROOT)$(Destination)/Makefile + mv -f $(DSTROOT)$(Destination)/bin $(DSTROOT)$(MAKEFILEPATH) + install -d $(DSTROOT)$(BSDMAKEDIR)/$(STANDARD) + @set -x && \ + for i in $(INBASENAMES); do \ + unifdef -U$(BSDDEFINE) -t $(DSTROOT)$(Destination)/$(STANDARD)/$$i$(INSUFFIX) > $(DSTROOT)$(Destination)/$(STANDARD)/$$i$(GNUSUFFIX); \ + [ $$? -eq 1 ] || exit 1; \ + unifdef -D$(BSDDEFINE) -t $(DSTROOT)$(Destination)/$(STANDARD)/$$i$(INSUFFIX) > $(DSTROOT)$(BSDMAKEDIR)/$(STANDARD)/$$i$(BSDSUFFIX); \ + [ $$? -eq 1 ] || exit 1; \ + $(RM) -f $(DSTROOT)$(Destination)/$(STANDARD)/$$i$(INSUFFIX) || exit 1; \ + done -Destination = $(MAKEFILEPATH)/CoreOS +installhdrs: + $(_v) echo No headers to install + +installsrc: + install -d "$(SRCROOT)" + rsync -a --exclude=.svn ./ "$(SRCROOT)" -install_headers:: - @$(MAKE) install_source SRCROOT=$(DSTROOT)$(Destination) - $(_v) $(RM) -f $(DSTROOT)$(Destination)/Makefile - $(_v) $(MV) -f $(DSTROOT)$(Destination)/bin $(DSTROOT)$(MAKEFILEPATH) +clean: + $(_v) echo Nothing to clean diff --git a/ReleaseControl/BSDCommon.make b/ReleaseControl/BSDCommon.make index af2989a..6c546d1 100644 --- a/ReleaseControl/BSDCommon.make +++ b/ReleaseControl/BSDCommon.make @@ -120,6 +120,7 @@ endif ifneq ($(SDKROOT),) Extra_CC_Flags += -isysroot $(SDKROOT) Extra_LD_Flags += -Wl,-syslibroot,$(SDKROOT) +export MIGCC = $(shell xcrun -find -sdk $(SDKROOT) cc) endif ## Dylib Support ## @@ -138,7 +139,7 @@ PROFILE_OFILE_SUFFIX=_profile.o RELEASE_ALL_OFILES = $(foreach OFILE, \ $(CFILES:.c=.o) \ $(MFILES:.m=.o) \ - $(CXXFILES:.%=.o) \ + $(CXXFILES:.cc=.o) \ $(OTHER_OFILES), \ $(OBJROOT)/$(Project)/$(notdir $(OFILE))) DEBUG_ALL_OFILES = $(RELEASE_ALL_OFILES:.o=$(DEBUG_OFILE_SUFFIX)) diff --git a/ReleaseControl/Common.make b/ReleaseControl/Common.make index 5d849a3..0c5fda2 100644 --- a/ReleaseControl/Common.make +++ b/ReleaseControl/Common.make @@ -49,12 +49,7 @@ RC_ARCHS = $(shell for i in `file /usr/lib/libSystem.B.dylib | grep 'shared li RC_RELEASE = unknown RC_VERSION = unknown -ifeq ($(COPY_SOURCES),YES) SRCROOT = /tmp/$(ProjectName)/Sources -else -SRCROOT = $(shell pwd) -endif - OBJROOT = /tmp/$(ProjectName)/Build SYMROOT = /tmp/$(ProjectName)/Debug DSTROOT = /tmp/$(ProjectName)/Release @@ -87,8 +82,6 @@ BuildDirectory = $(OBJROOT) CC_Archs = $(RC_ARCHS:%=-arch %) #CPP_Defines += -DPROJECT_VERSION=\"$(Project)-$(Version)\" -Extra_CC_Flags += $(RC_CFLAGS) - ifneq "$(strip $(CFLAGS))" "" Environment += CFLAGS="$(CFLAGS)" endif diff --git a/ReleaseControl/GNUSource.make b/ReleaseControl/GNUSource.make index dd89bae..2154089 100644 --- a/ReleaseControl/GNUSource.make +++ b/ReleaseControl/GNUSource.make @@ -97,6 +97,15 @@ Configure_Flags = --prefix="$(Install_Prefix)" \ --disable-dependency-tracking \ $(Extra_Configure_Flags) +ifndef Configure_Products +Configure_Products = config.h config.log +endif + +# for backwards compatibility; many projects will probably want to override this +Extra_Make_Flags ?= $(Environment) + +Make_Flags = $(Extra_Make_Flags) + Install_Flags = prefix="$(RC_Install_Prefix)" \ mandir="$(RC_Install_Man)" \ infodir="$(RC_Install_Info)" \ @@ -114,7 +123,7 @@ Install_Target = install-strip install:: build ifneq ($(GnuNoInstall),YES) @echo "Installing $(Project)..." - $(_v) umask $(Install_Mask) ; $(MAKE) -C $(BuildDirectory) $(Environment) $(Install_Flags) $(Install_Target) + $(_v) umask $(Install_Mask) ; $(MAKE) -C $(BuildDirectory) $(Make_Flags) $(Install_Flags) $(Install_Target) $(_v) $(FIND) $(DSTROOT) $(Find_Cruft) -depth -exec $(RMDIR) "{}" \; $(_v) $(FIND) $(SYMROOT) $(Find_Cruft) -depth -exec $(RMDIR) "{}" \; ifneq ($(GnuNoChown),YES) @@ -129,7 +138,7 @@ endif build:: configure ifneq ($(GnuNoBuild),YES) @echo "Building $(Project)..." - $(_v) $(MAKE) -C $(BuildDirectory) $(Environment) + $(_v) $(MAKE) -C $(BuildDirectory) $(Make_Flags) endif configure:: lazy_install_source $(ConfigStamp) @@ -143,7 +152,10 @@ ifneq ($(GnuNoConfigure),YES) @echo "Configuring $(Project)..." $(_v) $(MKDIR) $(BuildDirectory) # Disable LD_TRACE_FILE during configure - $(_v) cd $(BuildDirectory) && $(Environment) LD_TRACE_FILE=/dev/null $(Configure) $(Configure_Flags) + $(_v) cd $(BuildDirectory) && $(Environment) $(Extra_Configure_Environment) LD_TRACE_FILE=/dev/null $(Configure) $(Configure_Flags) +ifneq ($(Configure_Products),) + $(_v) - $(CP) $(foreach PRODUCT,$(Configure_Products),$(BuildDirectory)/$(PRODUCT)) $(SYMROOT) +endif endif $(_v) touch $@ diff --git a/Standard/Commands.in b/Standard/Commands.in new file mode 100644 index 0000000..7ea2bec --- /dev/null +++ b/Standard/Commands.in @@ -0,0 +1,331 @@ +## +# Standard Commands +#ifdef BSDMAKESTYLE +# +# (Created from /Developer/Makefiles/CoreOS/Standard/Commands.make) +#endif +# +# Wilfredo Sanchez | wsanchez@apple.com +# Copyright (c) 1997-1999 Apple Computer, Inc. +# +# @APPLE_LICENSE_HEADER_START@ +# +# Portions Copyright (c) 1999-2009 Apple Inc. All Rights +# Reserved. This file contains Original Code and/or Modifications of +# Original Code as defined in and that are subject to the Apple Public +# Source License Version 1.1 (the "License"). You may not use this file +# except in compliance with the License. Please obtain a copy of the +# License at http://www.apple.com/publicsource and read it before using +# this file. +# +# The Original Code and all software distributed under the License are +# distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER +# EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, +# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT. Please see the +# License for the specific language governing rights and limitations +# under the License. +# +# @APPLE_LICENSE_HEADER_END@ +## + +## +# Make sure that we're using sh +## +SHELL=/bin/sh + +## +# Archiving Commands +## +COMPRESS = /usr/bin/compress +GUNZIP = /usr/bin/gzip -d +GZCAT = /usr/bin/gzip -d -c +GZIP = /usr/bin/gzip -9 +PAX = /bin/pax +TAR = /usr/bin/tar +UNCOMPRESS = $(GUNZIP) +ZCAT = $(GZCAT) + +## +# How to find certain commands +## +PATH_OF_COMMAND = xcrun -find + +## +# Compilers and Binary Tools +## +#ifdef BSDMAKESTYLE +AR != $(PATH_OF_COMMAND) ar +#else +AR = $(shell $(PATH_OF_COMMAND) ar) +#endif +#ifdef BSDMAKESTYLE +AS != $(PATH_OF_COMMAND) as +#else +AS = $(shell $(PATH_OF_COMMAND) as) +#endif +ARSH = $(MAKEFILEPATH)/bin/ar.sh +#ifdef BSDMAKESTYLE +BISON != $(PATH_OF_COMMAND) bison +#else +BISON = $(shell $(PATH_OF_COMMAND) bison) +#endif +#ifdef BSDMAKESTYLE +BSDMAKE != $(PATH_OF_COMMAND) bsdmake +#else +BSDMAKE = $(shell $(PATH_OF_COMMAND) bsdmake) +#endif +#ifdef BSDMAKESTYLE +CC != $(PATH_OF_COMMAND) cc +#else +CC = $(shell $(PATH_OF_COMMAND) cc) +#endif +#ifdef BSDMAKESTYLE +C89 != $(PATH_OF_COMMAND) c89 +#else +C89 = $(shell $(PATH_OF_COMMAND) c89) +#endif +#ifdef BSDMAKESTYLE +C99 != $(PATH_OF_COMMAND) c99 +#else +C99 = $(shell $(PATH_OF_COMMAND) c99) +#endif +#ifdef BSDMAKESTYLE +CPP != $(PATH_OF_COMMAND) cpp +#else +CPP = $(shell $(PATH_OF_COMMAND) cpp) +#endif +#ifdef BSDMAKESTYLE +CTAGS != $(PATH_OF_COMMAND) ctags +#else +CTAGS = $(shell $(PATH_OF_COMMAND) ctags) +#endif +#ifdef BSDMAKESTYLE +Cxx != $(PATH_OF_COMMAND) c++ +#else +Cxx = $(shell $(PATH_OF_COMMAND) c++) +#endif +CXX = $(Cxx) +#ifdef BSDMAKESTYLE +DSYMUTIL != $(PATH_OF_COMMAND) dsymutil +#else +DSYMUTIL = $(shell $(PATH_OF_COMMAND) dsymutil) +#endif +#ifdef BSDMAKESTYLE +DTRACE != $(PATH_OF_COMMAND) dtrace +#else +DTRACE = $(shell $(PATH_OF_COMMAND) dtrace) +#endif +#ifdef BSDMAKESTYLE +ETAGS != $(PATH_OF_COMMAND) etags +#else +ETAGS = $(shell $(PATH_OF_COMMAND) etags) +#endif +#ifdef BSDMAKESTYLE +FILE != $(PATH_OF_COMMAND) file +#else +FILE = $(shell $(PATH_OF_COMMAND) file) +#endif +#ifdef BSDMAKESTYLE +FLEX != $(PATH_OF_COMMAND) flex +#else +FLEX = $(shell $(PATH_OF_COMMAND) flex) +#endif +#ifdef BSDMAKESTYLE +GM4 != $(PATH_OF_COMMAND) gm4 +#else +GM4 = $(shell $(PATH_OF_COMMAND) gm4) +#endif +#ifdef BSDMAKESTYLE +GNUMAKE != $(PATH_OF_COMMAND) gnumake +#else +GNUMAKE = $(shell $(PATH_OF_COMMAND) gnumake) +#endif +#ifdef BSDMAKESTYLE +LD != $(PATH_OF_COMMAND) ld +#else +LD = $(shell $(PATH_OF_COMMAND) ld) +#endif +LEX = $(FLEX) +#ifdef BSDMAKESTYLE +LIBTOOL != $(PATH_OF_COMMAND) libtool +#else +LIBTOOL = $(shell $(PATH_OF_COMMAND) libtool) +#endif +#ifdef BSDMAKESTYLE +LIPO != $(PATH_OF_COMMAND) lipo +#else +LIPO = $(shell $(PATH_OF_COMMAND) lipo) +#endif +#ifdef BSDMAKESTYLE +LORDER != $(PATH_OF_COMMAND) lorder +#else +LORDER = $(shell $(PATH_OF_COMMAND) lorder) +#endif +#ifdef BSDMAKESTYLE +M4 != $(PATH_OF_COMMAND) m4 +#else +M4 = $(shell $(PATH_OF_COMMAND) m4) +#endif +#ifdef BSDMAKESTYLE +MIG != $(PATH_OF_COMMAND) mig +#else +MIG = $(shell $(PATH_OF_COMMAND) mig) +#endif +#ifdef BSDMAKESTYLE +NM != $(PATH_OF_COMMAND) nm +#else +NM = $(shell $(PATH_OF_COMMAND) nm) +#endif +#ifdef BSDMAKESTYLE +OTOOL != $(PATH_OF_COMMAND) otool +#else +OTOOL = $(shell $(PATH_OF_COMMAND) otool) +#endif +#ifdef BSDMAKESTYLE +RANLIB != $(PATH_OF_COMMAND) ranlib +#else +RANLIB = $(shell $(PATH_OF_COMMAND) ranlib) +#endif +#ifdef BSDMAKESTYLE +RPCGEN != $(PATH_OF_COMMAND) rpcgen +#else +RPCGEN = $(shell $(PATH_OF_COMMAND) rpcgen) +#endif +#ifdef BSDMAKESTYLE +SIZE != $(PATH_OF_COMMAND) size +#else +SIZE = $(shell $(PATH_OF_COMMAND) size) +#endif +#ifdef BSDMAKESTYLE +STRINGS != $(PATH_OF_COMMAND) strings +#else +STRINGS = $(shell $(PATH_OF_COMMAND) strings) +#endif +#ifdef BSDMAKESTYLE +STRIP != $(PATH_OF_COMMAND) strip +#else +STRIP = $(shell $(PATH_OF_COMMAND) strip) +#endif +#ifdef BSDMAKESTYLE +TCONF != $(PATH_OF_COMMAND) tconf +#else +TCONF = $(shell $(PATH_OF_COMMAND) tconf) +#endif +#ifdef BSDMAKESTYLE +UNIFDEF != $(PATH_OF_COMMAND) unifdef +#else +UNIFDEF = $(shell $(PATH_OF_COMMAND) unifdef) +#endif +#ifdef BSDMAKESTYLE +YACC != $(PATH_OF_COMMAND) yacc +#else +YACC = $(shell $(PATH_OF_COMMAND) yacc) +#endif + +## +# File Commands +## +CHFLAGS = /usr/bin/chflags +CHGRP = /usr/bin/chgrp +CHMOD = /bin/chmod +CHOWN = /usr/sbin/chown +CP = /bin/cp -pfR +DU = /usr/bin/du +INSTALL = /usr/bin/install +INSTALL_DIRECTORY = $(INSTALL) -m $(Install_Directory_Mode) -o $(Install_Directory_User) -g $(Install_Directory_Group) -d +INSTALL_DYLIB = $(INSTALL) -m $(Install_Program_Mode) -o $(Install_Program_User) -g $(Install_Program_Group) -S "-S" +INSTALL_FILE = $(INSTALL) -m $(Install_File_Mode) -o $(Install_File_User) -g $(Install_File_Group) +INSTALL_LIBRARY = $(INSTALL) -m $(Install_File_Mode) -o $(Install_File_User) -g $(Install_File_Group) -S "-S" +INSTALL_PROGRAM = $(INSTALL) -m $(Install_Program_Mode) -o $(Install_Program_User) -g $(Install_Program_Group) -s +INSTALL_SCRIPT = $(INSTALL) -m $(Install_Program_Mode) -o $(Install_Program_User) -g $(Install_Program_Group) +LN = /bin/ln +LS = /bin/ls +MKDIR = /bin/mkdir -p -m $(Install_Directory_Mode) +MV = /bin/mv +RM = /bin/rm -f +RMDIR = /bin/rm -fr +TOUCH = /usr/bin/touch + +# If you're not root, you can't change file ownership +#ifdef BSDMAKESTYLE +.if defined(USER) && $(USER) != root +#else +ifneq ($(USER),root) +#endif +INSTALL_DIRECTORY = $(INSTALL) -m $(Install_Directory_Mode) -d +INSTALL_FILE = $(INSTALL) -m $(Install_File_Mode) +INSTALL_PROGRAM = $(INSTALL) -m $(Install_Program_Mode) -s +INSTALL_DYLIB = $(INSTALL) -m $(Install_Program_Mode) -S "-S" +INSTALL_LIBRARY = $(INSTALL) -m $(Install_File_Mode) -S "-S" +INSTALL_SCRIPT = $(INSTALL) -m $(Install_Program_Mode) +#ifdef BSDMAKESTYLE +.endif +#else +endif +#endif + +## +# Find Commands +## +FIND = /usr/bin/find +XARGS = /usr/bin/xargs + +## +# Installer +## +INSTALLER = /usr/bin/installer.sh +LSBOM = /usr/bin/lsbom +MKBOM = /usr/bin/mkbom +PACKAGE = /usr/bin/package + +## +# Miscellaneous +## +ARCH = /usr/bin/arch +COMPRESSMANPAGES = $(MAKEFILEPATH)/bin/compress-man-pages.pl -d $(DSTROOT) +ECHO = echo +FALSE = /usr/bin/false +PLUTIL = /usr/bin/plutil +PWD = /bin/pwd +SLEEP = /bin/sleep +SYSCTL = /usr/sbin/sysctl +TEST = /bin/test +TEXI2HTML = /usr/bin/texi2html +TRUE = /usr/bin/true +UNAME = /usr/bin/uname +VERS_STRING = /usr/bin/vers_string +WHICH = /usr/bin/which +WHOAMI = /usr/bin/whoami +YES = /usr/bin/yes + +## +# Shells +## +SH = /bin/sh +CSH = /bin/csh + +## +# Text Commands +## +AWK = /usr/bin/gawk +BASENAME = /usr/bin/basename +CAT = /bin/cat +CMP = /usr/bin/cmp +CUT = /usr/bin/cut +DIRNAME = /usr/bin/dirname +ED = /bin/ed +EGREP = /usr/bin/egrep +FGREP = /usr/bin/fgrep +FMT = /usr/bin/fmt +GREP = /usr/bin/grep +HEAD = /usr/bin/head +PATCH = /usr/bin/patch +PERL = /usr/bin/perl +PRINTF = /usr/bin/printf +SED = /usr/bin/sed +SORT = /usr/bin/sort +TAIL = /usr/bin/tail +TEE = /usr/bin/tee +TSORT = /usr/bin/tsort +WC = /usr/bin/wc diff --git a/Standard/Commands.make b/Standard/Commands.make deleted file mode 100644 index 3251e26..0000000 --- a/Standard/Commands.make +++ /dev/null @@ -1,159 +0,0 @@ -## -# Standard Commands -# -# Wilfredo Sanchez | wsanchez@apple.com -# Copyright (c) 1997-1999 Apple Computer, Inc. -# -# @APPLE_LICENSE_HEADER_START@ -# -# Portions Copyright (c) 1999 Apple Computer, Inc. All Rights -# Reserved. This file contains Original Code and/or Modifications of -# Original Code as defined in and that are subject to the Apple Public -# Source License Version 1.1 (the "License"). You may not use this file -# except in compliance with the License. Please obtain a copy of the -# License at http://www.apple.com/publicsource and read it before using -# this file. -# -# The Original Code and all software distributed under the License are -# distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER -# EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, -# INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT. Please see the -# License for the specific language governing rights and limitations -# under the License. -# -# @APPLE_LICENSE_HEADER_END@ -## - -## -# Make sure that we're using sh -## -SHELL=/bin/sh - -## -# Archiving Commands -## -COMPRESS = /usr/bin/compress -GUNZIP = /usr/bin/gzip -d -GZCAT = /usr/bin/gzip -d -c -GZIP = /usr/bin/gzip -9 -PAX = /bin/pax -TAR = /usr/bin/tar -UNCOMPRESS = $(GUNZIP) -ZCAT = $(GZCAT) - -## -# Compilers and Binary Tools -## -AR = /usr/bin/ar -ARSH = $(MAKEFILEPATH)/bin/ar.sh -BISON = /usr/bin/bison -BSDMAKE = /usr/bin/bsdmake -CC = /usr/bin/cc -CPP = /usr/bin/cpp -CTAGS = /usr/bin/ctags -Cxx = /usr/bin/cc -CXX = $(Cxx) -ETAGS = /usr/bin/etags -FILE = /usr/bin/file -FLEX = /usr/bin/flex -GM4 = /usr/bin/gm4 -GNUMAKE = /usr/bin/gnumake -LEX = $(FLEX) -LIPO = /usr/bin/lipo -LIBTOOL = /usr/bin/libtool -M4 = /usr/bin/m4 -MIG = /usr/bin/mig -OTOOL = /usr/bin/otool -RPCGEN = /usr/bin/rpcgen -STRIP = /usr/bin/strip -YACC = /usr/bin/yacc - -## -# File Commands -## -CHFLAGS = /usr/bin/chflags -CHGRP = /usr/bin/chgrp -CHMOD = /bin/chmod -CHOWN = /usr/sbin/chown -CP = /bin/cp -pfR -DU = /usr/bin/du -INSTALL = /usr/bin/install -INSTALL_DIRECTORY = $(INSTALL) -m $(Install_Directory_Mode) -o $(Install_Directory_User) -g $(Install_Directory_Group) -d -INSTALL_DYLIB = $(INSTALL) -m $(Install_Program_Mode) -o $(Install_Program_User) -g $(Install_Program_Group) -S "-S" -INSTALL_FILE = $(INSTALL) -m $(Install_File_Mode) -o $(Install_File_User) -g $(Install_File_Group) -INSTALL_LIBRARY = $(INSTALL) -m $(Install_File_Mode) -o $(Install_File_User) -g $(Install_File_Group) -S "-S" -INSTALL_PROGRAM = $(INSTALL) -m $(Install_Program_Mode) -o $(Install_Program_User) -g $(Install_Program_Group) -s -INSTALL_SCRIPT = $(INSTALL) -m $(Install_Program_Mode) -o $(Install_Program_User) -g $(Install_Program_Group) -LN = /bin/ln -LS = /bin/ls -MKDIR = /bin/mkdir -p -m $(Install_Directory_Mode) -MV = /bin/mv -RM = /bin/rm -f -RMDIR = /bin/rm -fr -TOUCH = /usr/bin/touch - -# If you're not root, you can't change file ownership -ifneq ($(USER),root) -INSTALL_DIRECTORY = $(INSTALL) -m $(Install_Directory_Mode) -d -INSTALL_FILE = $(INSTALL) -m $(Install_File_Mode) -INSTALL_PROGRAM = $(INSTALL) -m $(Install_Program_Mode) -s -INSTALL_DYLIB = $(INSTALL) -m $(Install_Program_Mode) -S "-S" -INSTALL_LIBRARY = $(INSTALL) -m $(Install_File_Mode) -S "-S" -INSTALL_SCRIPT = $(INSTALL) -m $(Install_Program_Mode) -endif - -## -# Find Commands -## -FIND = /usr/bin/find -XARGS = /usr/bin/xargs - -## -# Installer -## -INSTALLER = /usr/bin/installer.sh -LSBOM = /usr/bin/lsbom -MKBOM = /usr/bin/mkbom -PACKAGE = /usr/bin/package - -## -# Miscellaneous -## -ARCH = /usr/bin/arch -COMPRESSMANPAGES = $(MAKEFILEPATH)/bin/compress-man-pages.pl -d $(DSTROOT) -FALSE = /usr/bin/false -PWD = /bin/pwd -SLEEP = /bin/sleep -TEST = /bin/test -TEXI2HTML = /usr/bin/texi2html -TRUE = /usr/bin/true -UNAME = /usr/bin/uname -VERS_STRING = /usr/bin/vers_string -WHICH = /usr/bin/which -WHOAMI = /usr/bin/whoami -YES = /usr/bin/yes - -## -# Shells -## -SH = /bin/sh -CSH = /bin/csh - -## -# Text Commands -## -AWK = /usr/bin/gawk -CAT = /bin/cat -CMP = /usr/bin/cmp -CUT = /usr/bin/cut -EGREP = /usr/bin/egrep -FGREP = /usr/bin/fgrep -FMT = /usr/bin/fmt -GREP = /usr/bin/grep -HEAD = /usr/bin/head -PERL = /usr/bin/perl -SED = /usr/bin/sed -TAIL = /usr/bin/tail -TEE = /usr/bin/tee -WC = /usr/bin/wc diff --git a/Standard/Variables.make b/Standard/Variables.in similarity index 80% rename from Standard/Variables.make rename to Standard/Variables.in index da21b77..1bad305 100644 --- a/Standard/Variables.make +++ b/Standard/Variables.in @@ -1,12 +1,16 @@ ## # Standard Variables +#ifdef BSDMAKESTYLE +# +# (Created from /Developer/Makefiles/CoreOS/Standard/Variables.make) +#endif # # Wilfredo Sanchez | wsanchez@apple.com # Copyright (c) 1997-1999 Apple Computer, Inc. # # @APPLE_LICENSE_HEADER_START@ # -# Portions Copyright (c) 1999 Apple Computer, Inc. All Rights +# Portions Copyright (c) 1999-2009 Apple Inc. All Rights # Reserved. This file contains Original Code and/or Modifications of # Original Code as defined in and that are subject to the Apple Public # Source License Version 1.1 (the "License"). You may not use this file @@ -28,44 +32,109 @@ ## # Where to find Makefiles ## +#ifdef BSDMAKESTYLE +MAKEFILEPATH = /usr/share/mk +.ifndef CoreOSMakefiles +#else ifndef CoreOSMakefiles +#endif CoreOSMakefiles = $(MAKEFILEPATH)/CoreOS +#ifdef BSDMAKESTYLE +.else +#else else +#endif +#ifdef BSDMAKESTYLE +CoreOSMakefiles != cd $(CoreOSMakefiles) && pwd +#else CoreOSMakefiles := $(shell cd $(CoreOSMakefiles) && pwd) +#endif +#ifdef BSDMAKESTYLE +.endif +#else endif +#endif ## # Verbosity ## +#ifdef BSDMAKESTYLE +.if defined(RC_JASPER) && $(RC_JASPER) == YES +#else ifeq ($(RC_JASPER),YES) +#endif VERBOSE = YES +#ifdef BSDMAKESTYLE +.else +#else else +#endif VERBOSE = NO +#ifdef BSDMAKESTYLE +.endif +#else endif +#endif +#ifdef BSDMAKESTYLE +_v = $(VERBOSE:S/YES//:S/NO/@/) +#else _v = $(subst NO,@,$(subst YES,,$(VERBOSE))) +#endif +#ifdef BSDMAKESTYLE +_q = $(VERBOSE:S/NO//:S/YES/@/) +#else _q = $(subst YES,@,$(subst NO,,$(VERBOSE))) +#endif ## # Working Directory ## +#ifdef BSDMAKESTYLE +WD != pwd +#else WD := $(shell pwd) +#endif ## # User ## +#ifdef BSDMAKESTYLE +USER != whoami +#else USER = $(shell whoami) +#endif ## # Host Platform ## +#ifdef BSDMAKESTYLE +.if !exists($(UNAME)) +#else ifeq ($(wildcard $(UNAME)),) +#endif OSName := unknown OSVersion := unknown +#ifdef BSDMAKESTYLE +.else +#else else +#endif +#ifdef BSDMAKESTYLE +OSName != $(UNAME) -s +#else OSName := $(shell $(UNAME) -s) +#endif +#ifdef BSDMAKESTYLE +OSVersion != $(UNAME) -r +#else OSVersion := $(shell $(UNAME) -r) +#endif +#ifdef BSDMAKESTYLE +.endif +#else endif +#endif ## # Find Garbage -- 2.50.0