Haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2024-11-23 07:18:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "jam: Fix build/run on Windows."

Browse Source 
This reverts commit 148cc99040.
It broke the build on Linux.
This commit is contained in:
Jérôme Duval 2015-08-07 17:22:32 +02:00
parent 7c3622a5de
commit f625dd9f94
4 changed files with 138 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
jam/Jambase
View File

@ -26,7 +26,7 @@
# 01/08/95 (seiwald) - Shell now handled with awk, not sed # 01/08/95 (seiwald) - Shell now handled with awk, not sed
# 01/09/95 (seiwald) - Install* now take dest directory as target # 01/09/95 (seiwald) - Install* now take dest directory as target
# 01/10/95 (seiwald) - All entries sorted. # 01/10/95 (seiwald) - All entries sorted.
# 01/10/95 (seiwald) - NT support moved in, with LauraW's help. # 01/10/95 (seiwald) - NT support moved in, with LauraW's help.
# 01/10/95 (seiwald) - VMS support moved in. # 01/10/95 (seiwald) - VMS support moved in.
# 02/06/95 (seiwald) - ObjectC++Flags and SubDirC++Flags added. # 02/06/95 (seiwald) - ObjectC++Flags and SubDirC++Flags added.
# 02/07/95 (seiwald) - Iron out when HDRSEARCH uses "" or SEARCH_SOURCE. # 02/07/95 (seiwald) - Iron out when HDRSEARCH uses "" or SEARCH_SOURCE.
@ -42,14 +42,14 @@
# #
# all - parent of first, shell, files, lib, exe # all - parent of first, shell, files, lib, exe
# first - first dependent of 'all', for potential initialization # first - first dependent of 'all', for potential initialization
# shell - parent of all Shell targets # shell - parent of all Shell targets
# files - parent of all File targets # files - parent of all File targets
# lib - parent of all Library targets # lib - parent of all Library targets
# exe - parent of all Main targets # exe - parent of all Main targets
# dirs - parent of all MkDir targets # dirs - parent of all MkDir targets
# clean - removes all Shell, File, Library, and Main targets # clean - removes all Shell, File, Library, and Main targets
# uninstall - removes all Install targets # uninstall - removes all Install targets
# #
# Rules defined by this file: # Rules defined by this file:
# #
@ -105,7 +105,7 @@
# FGristSourceFiles value ; return $(value:G=$(SOURCE_GRIST)) # FGristSourceFiles value ; return $(value:G=$(SOURCE_GRIST))
# FIsPrefix a : b ; return whether or not a is a prefix of b # FIsPrefix a : b ; return whether or not a is a prefix of b
# FStripCommon v1 : v2 ; strip common initial parts of v1 v2 # FStripCommon v1 : v2 ; strip common initial parts of v1 v2
# FReverse a1 a2 ... ; return ... a2 a1 # FReverse a1 a2 ... ; return ... a2 a1
# FRelPath d1 : d2 ; return rel path from d1 to d2 # FRelPath d1 : d2 ; return rel path from d1 to d2
# FSubDir d1 d2 ... ; return path to root # FSubDir d1 d2 ... ; return path to root
# #
@ -134,7 +134,7 @@
# Exit - blurt out targets and exit # Exit - blurt out targets and exit
# Includes - marks sources as headers for target (a codependency) # Includes - marks sources as headers for target (a codependency)
# NoCare - don't panic if the target can't be built # NoCare - don't panic if the target can't be built
# NoUpdate - create the target if needed but never update it # NoUpdate - create the target if needed but never update it
# NotFile - ignore the timestamp of the target (it's not a file) # NotFile - ignore the timestamp of the target (it's not a file)
# Temporary - target need not be present if sources haven't changed # Temporary - target need not be present if sources haven't changed
# #
@ -176,7 +176,7 @@ if $(NT)
SUFLIB ?= .lib ; SUFLIB ?= .lib ;
SUFOBJ ?= .obj ; SUFOBJ ?= .obj ;
SUFEXE ?= .exe ; SUFEXE ?= .exe ;
if $(BCCROOT) if $(BCCROOT)
{ {
AR ?= tlib /C /P64 ; AR ?= tlib /C /P64 ;
@ -197,9 +197,12 @@ if $(NT)
CCFLAGS ?= /D \"WIN\" ; CCFLAGS ?= /D \"WIN\" ;
C++ ?= $(CC) ; C++ ?= $(CC) ;
C++FLAGS ?= $(CCFLAGS) ; C++FLAGS ?= $(CCFLAGS) ;
LINK ?= link /nologo ; LINK ?= $(CC) ;
LINKFLAGS ?= ; LINKFLAGS ?= $(CCFLAGS) ;
LINKLIBS ?= ; LINKLIBS ?=
$(MSVC)\\lib\\mlibce.lib
$(MSVC)\\lib\\oldnames.lib
;
LINKLIBS ?= ; LINKLIBS ?= ;
NOARSCAN ?= true ; NOARSCAN ?= true ;
OPTIM ?= ; OPTIM ?= ;
@ -210,7 +213,7 @@ if $(NT)
{ {
# Visual C++ 6.0 uses MSVCDIR # Visual C++ 6.0 uses MSVCDIR
MSVCNT ?= $(MSVCDIR) ; MSVCNT ?= $(MSVCDIR) ;
# bury IA64 in the path for the SDK # bury IA64 in the path for the SDK
@ -224,8 +227,9 @@ if $(NT)
C++FLAGS ?= $(CCFLAGS) ; C++FLAGS ?= $(CCFLAGS) ;
LINK ?= link /nologo ; LINK ?= link /nologo ;
LINKFLAGS ?= "" ; LINKFLAGS ?= "" ;
LINKLIBS ?= LINKLIBS ?=
$(MSVCNT)\\lib\\$(I)libc.lib $(MSVCNT)\\lib\\$(I)libc.lib
$(MSVCNT)\\lib\\$(I)oldnames.lib
$(MSVCNT)\\lib\\$(I)kernel32.lib ; $(MSVCNT)\\lib\\$(I)kernel32.lib ;
OPTIM ?= "" ; OPTIM ?= "" ;
STDHDRS ?= $(MSVCNT)\\include ; STDHDRS ?= $(MSVCNT)\\include ;
@ -251,7 +255,7 @@ else if $(MINGW)
else if $(OS2) else if $(OS2)
{ {
WATCOM ?= $(watcom) ; WATCOM ?= $(watcom) ;
if ! $(WATCOM) if ! $(WATCOM)
{ {
Exit On OS2, set WATCOM to the root of the Watcom directory. ; Exit On OS2, set WATCOM to the root of the Watcom directory. ;
@ -310,7 +314,7 @@ else if $(VMS)
SUFLIB ?= .olb ; SUFLIB ?= .olb ;
SUFOBJ ?= .obj ; SUFOBJ ?= .obj ;
switch $(OS) switch $(OS)
{ {
case OPENVMS : CCFLAGS ?= /stand=vaxc ; case OPENVMS : CCFLAGS ?= /stand=vaxc ;
case VMS : LINKLIBS ?= sys$library:vaxcrtl.olb/lib ; case VMS : LINKLIBS ?= sys$library:vaxcrtl.olb/lib ;
@ -319,7 +323,7 @@ else if $(VMS)
else if $(MAC) else if $(MAC)
{ {
local OPT ; local OPT ;
CW ?= "{CW}" ; CW ?= "{CW}" ;
MACHDRS ?= MACHDRS ?=
@ -331,19 +335,19 @@ else if $(MAC)
"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Interfacelib" "$(CW):MacOS Support:Universal:Libraries:StubLibraries:Interfacelib"
"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Mathlib" ; "$(CW):MacOS Support:Universal:Libraries:StubLibraries:Mathlib" ;
MPWLIBS ?= MPWLIBS ?=
"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib" "$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib"
"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW.Lib" ; "$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW.Lib" ;
MPWNLLIBS ?= MPWNLLIBS ?=
"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib" "$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib"
"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW(NL).Lib" ; "$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW(NL).Lib" ;
SIOUXHDRS ?= ; SIOUXHDRS ?= ;
SIOUXLIBS ?= SIOUXLIBS ?=
"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_Runtime_PPC.lib" "$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_Runtime_PPC.lib"
"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_SIOUX_PPC.Lib" "$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_SIOUX_PPC.Lib"
"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib" ; "$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib" ;
C++ ?= mwcppc ; C++ ?= mwcppc ;
@ -355,15 +359,15 @@ else if $(MAC)
DOTDOT ?= "::" ; DOTDOT ?= "::" ;
HDRS ?= $(MACHDRS) $(MPWHDRS) ; HDRS ?= $(MACHDRS) $(MPWHDRS) ;
LINK ?= mwlinkppc ; LINK ?= mwlinkppc ;
LINKFLAGS ?= -mpwtool -warn ; LINKFLAGS ?= -mpwtool -warn ;
LINKLIBS ?= $(MACLIBS) $(MPWLIBS) ; LINKLIBS ?= $(MACLIBS) $(MPWLIBS) ;
MKDIR ?= newfolder ; MKDIR ?= newfolder ;
MV ?= rename -y ; MV ?= rename -y ;
NOARSCAN ?= true ; NOARSCAN ?= true ;
OPTIM ?= ; OPTIM ?= ;
RM ?= delete -y ; RM ?= delete -y ;
SLASH ?= ":" ; SLASH ?= ":" ;
STDHDRS ?= ; STDHDRS ?= ;
SUFLIB ?= .lib ; SUFLIB ?= .lib ;
SUFOBJ ?= .o ; SUFOBJ ?= .o ;
} }
@ -445,7 +449,7 @@ else if $(UNIX)
CC ?= gcc ; CC ?= gcc ;
YACC ?= bison -y ; YACC ?= bison -y ;
case CYGWIN : case CYGWIN :
CC ?= gcc ; CC ?= gcc ;
CCFLAGS += -D__cygwin__ ; CCFLAGS += -D__cygwin__ ;
LEX ?= flex ; LEX ?= flex ;
@ -474,12 +478,12 @@ else if $(UNIX)
C++ ?= gcc ; C++ ?= gcc ;
CCFLAGS += -D_POSIX_SOURCE ; CCFLAGS += -D_POSIX_SOURCE ;
HDRS += /usr/include ; HDRS += /usr/include ;
RANLIB ?= "" ; RANLIB ?= "" ;
NOARSCAN ?= true ; NOARSCAN ?= true ;
NOARUPDATE ?= true ; NOARUPDATE ?= true ;
case MVS : case MVS :
RANLIB ?= "" ; RANLIB ?= "" ;
case NEXT : case NEXT :
AR ?= libtool -o ; AR ?= libtool -o ;
@ -599,7 +603,7 @@ else if $(UNIX)
YACCFILES ?= ; YACCFILES ?= ;
YACCFLAGS ?= ; YACCFLAGS ?= ;
HDRPATTERN = HDRPATTERN =
"^[ ]*#[ ]*include[ ]*[<\"]([^\">]*)[\">].*$" ; "^[ ]*#[ ]*include[ ]*[<\"]([^\">]*)[\">].*$" ;
OSFULL = $(OS)$(OSVER)$(OSPLAT) $(OS)$(OSPLAT) $(OS)$(OSVER) $(OS) ; OSFULL = $(OS)$(OSVER)$(OSPLAT) $(OS)$(OSPLAT) $(OS)$(OSVER) $(OS) ;
@ -691,7 +695,7 @@ rule Fortran
Depends $(<) : $(>) ; Depends $(<) : $(>) ;
} }
rule GenFile rule GenFile
{ {
local _t = [ FGristSourceFiles $(<) ] ; local _t = [ FGristSourceFiles $(<) ] ;
local _s = [ FAppendSuffix $(>[1]) : $(SUFEXE) ] ; local _s = [ FAppendSuffix $(>[1]) : $(SUFEXE) ] ;
@ -770,14 +774,14 @@ rule InstallInto
Install $(tt) : $(i) ; Install $(tt) : $(i) ;
Chmod $(tt) ; Chmod $(tt) ;
if $(OWNER) && $(CHOWN) if $(OWNER) && $(CHOWN)
{ {
Chown $(tt) ; Chown $(tt) ;
OWNER on $(tt) = $(OWNER) ; OWNER on $(tt) = $(OWNER) ;
} }
if $(GROUP) && $(CHGRP) if $(GROUP) && $(CHGRP)
{ {
Chgrp $(tt) ; Chgrp $(tt) ;
GROUP on $(tt) = $(GROUP) ; GROUP on $(tt) = $(GROUP) ;
} }
@ -878,11 +882,11 @@ rule LibraryFromObjects
MakeLocate $(_l) $(_l)($(_s:BS)) : $(LOCATE_TARGET) ; MakeLocate $(_l) $(_l)($(_s:BS)) : $(LOCATE_TARGET) ;
} }
if $(NOARSCAN) if $(NOARSCAN)
{ {
# If we can't scan the library to timestamp its contents, # If we can't scan the library to timestamp its contents,
# we have to just make the library depend directly on the # we have to just make the library depend directly on the
# on-disk object files. # on-disk object files.
Depends $(_l) : $(_s) ; Depends $(_l) : $(_s) ;
} }
@ -1012,18 +1016,18 @@ rule MkDir
# Make a directory and all its parent directories. # Make a directory and all its parent directories.
# Ignore timestamps on directories: we only care if they # Ignore timestamps on directories: we only care if they
# exist. # exist.
NoUpdate $(<) ; NoUpdate $(<) ;
# Don't create . or any directory already created. # Don't create . or any directory already created.
if $(<:G=) != $(DOT) && ! $($(<)-mkdir) if $(<:G=) != $(DOT) && ! $($(<)-mkdir)
{ {
# Cheesy gate to prevent multiple invocations on same dir # Cheesy gate to prevent multiple invocations on same dir
# Arrange for jam dirs # Arrange for jam dirs
# MkDir1 has the actions # MkDir1 has the actions
$(<)-mkdir = true ; $(<)-mkdir = true ;
LocalDepends dirs : $(<) ; LocalDepends dirs : $(<) ;
@ -1084,17 +1088,17 @@ rule Object
# the regexp pattern $(HDRSCAN) and then invokes $(HDRRULE) # the regexp pattern $(HDRSCAN) and then invokes $(HDRRULE)
# with the scanned file as the target and the found headers # with the scanned file as the target and the found headers
# as the sources. HDRSEARCH is the value of SEARCH used for # as the sources. HDRSEARCH is the value of SEARCH used for
# the found header files. Finally, if jam must deal with # the found header files. Finally, if jam must deal with
# header files of the same name in different directories, # header files of the same name in different directories,
# they can be distinguished with HDRGRIST. # they can be distinguished with HDRGRIST.
# $(SEARCH_SOURCE:E) is where cc first looks for #include # $(SEARCH_SOURCE:E) is where cc first looks for #include
# "foo.h" files. If the source file is in a distant directory, # "foo.h" files. If the source file is in a distant directory,
# look there. Else, look in "" (the current directory). # look there. Else, look in "" (the current directory).
HDRRULE on $(>) = HdrRule ; HDRRULE on $(>) = HdrRule ;
HDRSCAN on $(>) = $(HDRPATTERN) ; HDRSCAN on $(>) = $(HDRPATTERN) ;
HDRSEARCH on $(>) = HDRSEARCH on $(>) =
$(SEARCH_SOURCE:E) $(SUBDIRHDRS) $(HDRS) $(STDHDRS) ; $(SEARCH_SOURCE:E) $(SUBDIRHDRS) $(HDRS) $(STDHDRS) ;
HDRGRIST on $(>) = $(HDRGRIST) ; HDRGRIST on $(>) = $(HDRGRIST) ;
@ -1211,7 +1215,7 @@ rule SubDir
# computes TOP as the path up from the current directory; the # computes TOP as the path up from the current directory; the
# path contains one ../ for each of d1 d2 ... # path contains one ../ for each of d1 d2 ...
# #
# SubDir reads once the project-specific rules file Jamrules # SubDir reads once the project-specific rules file Jamrules
# in the TOP directory, if present. This can be overridden # in the TOP directory, if present. This can be overridden
# with the variable TOPRULES. # with the variable TOPRULES.
# #
@ -1228,7 +1232,7 @@ rule SubDir
# $(SEARCH_SOURCE) = $(SUBDIR) # $(SEARCH_SOURCE) = $(SUBDIR)
# $(LOCATE_SOURCE) = $(ALL_LOCATE_TARGET) $(SUBDIR) # $(LOCATE_SOURCE) = $(ALL_LOCATE_TARGET) $(SUBDIR)
# $(LOCATE_TARGET) = $(ALL_LOCATE_TARGET) $(SUBDIR) # $(LOCATE_TARGET) = $(ALL_LOCATE_TARGET) $(SUBDIR)
# $(SOURCE_GRIST) = $(SUBDIR_TOKENS) with !'s # $(SOURCE_GRIST) = $(SUBDIR_TOKENS) with !'s
# #
local _top = $(<[1]) ; local _top = $(<[1]) ;
@ -1288,11 +1292,11 @@ rule SubDir
# merely a certain number of directories down from # merely a certain number of directories down from
# the current directory, and FSubDirPath will set # the current directory, and FSubDirPath will set
# TOP to a path consisting of ../ for each of the # TOP to a path consisting of ../ for each of the
# elements of _tokens, because that represents how # elements of _tokens, because that represents how
# far below TOP the current directory sits. # far below TOP the current directory sits.
# #
# In the more complicated case, the starting directory # In the more complicated case, the starting directory
# isn't the directory of jam's invocation but an # isn't the directory of jam's invocation but an
# location established by previous SubDir call. The # location established by previous SubDir call. The
# starting directory is SUBDIR_UP directories up from # starting directory is SUBDIR_UP directories up from
# SUBDIR_ROOT, and then SUBDIR_DOWN directories down # SUBDIR_ROOT, and then SUBDIR_DOWN directories down
@ -1300,7 +1304,7 @@ rule SubDir
# SUBDIR_DOWN and SUBDIR_UP represent the path from # SUBDIR_DOWN and SUBDIR_UP represent the path from
# the directory of jam's invocation. # the directory of jam's invocation.
# #
# In the most complicated case, the _tokens also # In the most complicated case, the _tokens also
# represents directories down, because TOP is being # represents directories down, because TOP is being
# estalished in a directory other than TOP's root. # estalished in a directory other than TOP's root.
# Hopefully, _tokens and SUBDIR_DOWN represent the # Hopefully, _tokens and SUBDIR_DOWN represent the
@ -1326,9 +1330,9 @@ rule SubDir
SUBDIR_DOWN = [ FReverse $(SUBDIR_DOWN) ] ; SUBDIR_DOWN = [ FReverse $(SUBDIR_DOWN) ] ;
_tokens = [ FReverse $(_tokens) ] ; _tokens = [ FReverse $(_tokens) ] ;
if $(SUBDIR_DOWN) && $(_tokens) if $(SUBDIR_DOWN) && $(_tokens)
{ {
Echo Warning: SubDir $(<) misplaced! ; Echo Warning: SubDir $(<) misplaced! ;
} }
# We'll remember the relative (UP/DOWN) path that # We'll remember the relative (UP/DOWN) path that
@ -1383,9 +1387,9 @@ rule SubDir
# Include $(TOPRULES) if set. # Include $(TOPRULES) if set.
# Otherwise include $(TOP)/Jamrules if present. # Otherwise include $(TOP)/Jamrules if present.
if $($(_top)RULES) { if $($(_top)RULES) {
include $($(_top)RULES) ; include $($(_top)RULES) ;
} else { } else {
NoCare $(JAMRULES:R=$($(_top)):G=$(_top)) ; NoCare $(JAMRULES:R=$($(_top)):G=$(_top)) ;
include $(JAMRULES:R=$($(_top)):G=$(_top)) ; include $(JAMRULES:R=$($(_top)):G=$(_top)) ;
} }
@ -1440,9 +1444,9 @@ rule FSubDirPath
# If jam is invoked in a subdirectory of the TOP, then we # If jam is invoked in a subdirectory of the TOP, then we
# need to prepend a ../ for every level we must climb up # need to prepend a ../ for every level we must climb up
# (TOP-UP), and then append the directory names we must # (TOP-UP), and then append the directory names we must
# climb down (TOP-DOWN), plus the named directories d1 ... # climb down (TOP-DOWN), plus the named directories d1 ...
# If TOP was set externally, or computed from another TOP # If TOP was set externally, or computed from another TOP
# that was, we'll have to reroot the whole thing at TOP-ROOT. # that was, we'll have to reroot the whole thing at TOP-ROOT.
local _r = [ FRelPath $($(<[1])-UP) : $($(<[1])-DOWN) $(<[2-]) ] ; local _r = [ FRelPath $($(<[1])-UP) : $($(<[1])-DOWN) $(<[2-]) ] ;
@ -1545,7 +1549,7 @@ rule FGrist
} }
rule FGristFiles rule FGristFiles
{ {
return $(<:G=$(SOURCE_GRIST:E)) ; return $(<:G=$(SOURCE_GRIST:E)) ;
} }
@ -1558,7 +1562,7 @@ rule FGristSourceFiles
# files have global visibility. # files have global visibility.
# #
# Here we comment out the old version and replace it with the new. # Here we comment out the old version and replace it with the new.
# # Produce source file name name with grist in it, # # Produce source file name name with grist in it,
# # if SOURCE_GRIST is set. # # if SOURCE_GRIST is set.
# #
# # Leave header files alone, because they have a global # # Leave header files alone, because they have a global
@ -1568,7 +1572,7 @@ rule FGristSourceFiles
# { # {
# return $(<) ; # return $(<) ;
# } # }
# else # else
# { # {
# local _i _o ; # local _i _o ;
# #
@ -1607,7 +1611,7 @@ rule FIsPrefix
} }
} }
rule FReverse rule FReverse
{ {
# FReverse a1 a2 a3 ... ; # FReverse a1 a2 a3 ... ;
# return ... a3 a2 a1 ; # return ... a3 a2 a1 ;
@ -1621,10 +1625,10 @@ rule FSubDir
# path (using ../../ etc) back to that root directory. # path (using ../../ etc) back to that root directory.
# Sets result in $(<) # Sets result in $(<)
if ! $(<[1]) if ! $(<[1])
{ {
return $(DOT) ; return $(DOT) ;
} }
else else
{ {
local _i _d ; local _i _d ;
@ -1685,7 +1689,7 @@ rule FRelPath
rule FAppendSuffix rule FAppendSuffix
{ {
# E.g., "FAppendSuffix yacc lex foo.bat : $(SUFEXE) ;" # E.g., "FAppendSuffix yacc lex foo.bat : $(SUFEXE) ;"
# returns (yacc,lex,foo.bat) on Unix and # returns (yacc,lex,foo.bat) on Unix and
# (yacc.exe,lex.exe,foo.bat) on NT. # (yacc.exe,lex.exe,foo.bat) on NT.
if $(>) if $(>)
@ -1770,7 +1774,7 @@ else if $(VMS)
{ {
_s = $(DOT) ; _s = $(DOT) ;
} }
else else
{ {
# This handles the following cases: # This handles the following cases:
# a -> [.a] # a -> [.a]
@ -1866,7 +1870,7 @@ actions HardLink
actions Install actions Install
{ {
$(CP) $(>) $(<) $(CP) $(>) $(<)
} }
actions Lex actions Lex
@ -1881,7 +1885,7 @@ actions LexMv
actions Link bind NEEDLIBS actions Link bind NEEDLIBS
{ {
$(LINK) $(LINKFLAGS) -o $(<) $(UNDEFS) $(>) $(NEEDLIBS) $(LINKLIBS) $(LINK) $(LINKFLAGS) -o $(<) $(UNDEFS) $(>) $(NEEDLIBS) $(LINKLIBS)
} }
actions MkDir1 actions MkDir1
@ -2008,7 +2012,7 @@ else if $(NT) && $(MSVC)
{ {
actions updated together piecemeal Archive actions updated together piecemeal Archive
{ {
$(AR) $(<) $(>) $(AR) $(<) -+$(>)
} }
actions Cc actions Cc
@ -2057,7 +2061,7 @@ else if $(OS2) && $(WATCOM)
{ {
actions together piecemeal Archive actions together piecemeal Archive
{ {
$(AR) $(<) +-$(>) $(AR) $(<) +-$(>)
} }
actions Cc actions Cc
@ -2087,19 +2091,19 @@ else if $(OS2) && $(WATCOM)
else if $(VMS) else if $(VMS)
{ {
actions updated together piecemeal Archive actions updated together piecemeal Archive
{ {
lib/replace $(<) $(>[1]) ,$(>[2-]) lib/replace $(<) $(>[1]) ,$(>[2-])
} }
actions Cc actions Cc
{ {
$(CC)/obj=$(<) $(CCFLAGS) $(CCDEFS) $(CCHDRS) $(>) $(CC)/obj=$(<) $(CCFLAGS) $(CCDEFS) $(CCHDRS) $(>)
} }
actions C++ actions C++
{ {
$(C++)/obj=$(<) $(C++FLAGS) $(CCDEFS) $(CCHDRS) $(>) $(C++)/obj=$(<) $(C++FLAGS) $(CCDEFS) $(CCHDRS) $(>)
} }
actions piecemeal together existing Clean actions piecemeal together existing Clean
@ -2139,7 +2143,7 @@ else if $(VMS)
else if $(MAC) else if $(MAC)
{ {
actions together Archive actions together Archive
{ {
$(LINK) -library -o $(<) $(>) $(LINK) -library -o $(<) $(>)
} }
@ -2147,13 +2151,13 @@ else if $(MAC)
actions Cc actions Cc
{ {
set -e MWCincludes $(CCHDRS) set -e MWCincludes $(CCHDRS)
$(CC) -o $(<) $(CCFLAGS) $(CCDEFS) $(>) $(CC) -o $(<) $(CCFLAGS) $(CCDEFS) $(>)
} }
actions C++ actions C++
{ {
set -e MWCincludes $(CCHDRS) set -e MWCincludes $(CCHDRS)
$(CC) -o $(<) $(C++FLAGS) $(CCDEFS) $(>) $(CC) -o $(<) $(C++FLAGS) $(CCDEFS) $(>)
} }
actions Link bind NEEDLIBS actions Link bind NEEDLIBS

5
jam/Makefile
View File

@ -21,7 +21,7 @@ HOST_SYSTEM=$(shell uname)
#Lib = $(MSVCNT)/lib #Lib = $(MSVCNT)/lib
#Include = $(MSVCNT)/include #Include = $(MSVCNT)/include
#CC = cl /nologo #CC = cl /nologo
#CFLAGS = -I $(Include) -DNT #CFLAGS = -I $(Include) -DNT
#TARGET = /Fejam0 #TARGET = /Fejam0
#LINKLIBS = $(Lib)/oldnames.lib $(Lib)/kernel32.lib $(Lib)/libc.lib #LINKLIBS = $(Lib)/oldnames.lib $(Lib)/kernel32.lib $(Lib)/libc.lib
#EXENAME = .\jam0.exe #EXENAME = .\jam0.exe
@ -29,7 +29,7 @@ HOST_SYSTEM=$(shell uname)
# NT (with Microsoft compiler) # NT (with Microsoft compiler)
# People with DevStudio settings already in shell environment. # People with DevStudio settings already in shell environment.
#CC = cl /nologo #CC = cl /nologo
#CFLAGS = -DNT -D_CRT_SECURE_NO_WARNINGS -DWIN32_LEAN_AND_MEAN #CFLAGS = -DNT
#TARGET = /Fejam0 #TARGET = /Fejam0
#EXENAME = .\jam0.exe #EXENAME = .\jam0.exe
@ -67,6 +67,7 @@ SOURCES = \
rules.c scan.c search.c timestamp.c variable.c rules.c scan.c search.c timestamp.c variable.c
all: $(EXENAME) all: $(EXENAME)
LINKLIBS=$(LINKLIBS) $(EXENAME)
$(EXENAME): $(EXENAME):
$(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS) $(CC) $(TARGET) $(CFLAGS) $(SOURCES) $(LINKLIBS)

9
jam/jam.h
View File

@ -69,7 +69,7 @@
/* Do any of these work? */ /* Do any of these work? */
# if defined( VAX ) || defined( __VAX ) || defined( vax ) # if defined( VAX ) || defined( __VAX ) || defined( vax )
# define OSPLAT "OSPLAT=VAX" # define OSPLAT "OSPLAT=VAX"
# endif # endif
# endif # endif
@ -94,7 +94,6 @@
# define OS_NT # define OS_NT
# define SPLITPATH ';' # define SPLITPATH ';'
# define MAXLINE 996 /* longest 'together' actions */ # define MAXLINE 996 /* longest 'together' actions */
# define PATH_MAX _MAX_PATH
# define USE_EXECUNIX # define USE_EXECUNIX
# define USE_PATHUNIX # define USE_PATHUNIX
# define PATH_DELIM '\\' # define PATH_DELIM '\\'
@ -400,9 +399,9 @@
# include <malloc.h> # include <malloc.h>
# endif # endif
# endif # endif
/* /*
* OSPLAT definitions - suppressed when it's a one-of-a-kind * OSPLAT definitions - suppressed when it's a one-of-a-kind
*/ */
@ -428,7 +427,7 @@
!defined( OS_AS400 ) !defined( OS_AS400 )
# define OSPLAT "OSPLAT=X86" # define OSPLAT "OSPLAT=X86"
# endif # endif
# endif # endif
# ifdef __sparc__ # ifdef __sparc__
# if !defined( OS_SUNOS ) # if !defined( OS_SUNOS )

102
jam/jambase.c
View File

@ -32,9 +32,12 @@ const char *jambase[] = {
"CCFLAGS ?= /D \\\"WIN\\\" ;\n", "CCFLAGS ?= /D \\\"WIN\\\" ;\n",
"C++ ?= $(CC) ;\n", "C++ ?= $(CC) ;\n",
"C++FLAGS ?= $(CCFLAGS) ;\n", "C++FLAGS ?= $(CCFLAGS) ;\n",
"LINK ?= link /nologo ;\n", "LINK ?= $(CC) ;\n",
"LINKFLAGS ?= ;\n", "LINKFLAGS ?= $(CCFLAGS) ;\n",
"LINKLIBS ?= ;\n", "LINKLIBS ?= \n",
"$(MSVC)\\\\lib\\\\mlibce.lib\n",
"$(MSVC)\\\\lib\\\\oldnames.lib\n",
";\n",
"LINKLIBS ?= ;\n", "LINKLIBS ?= ;\n",
"NOARSCAN ?= true ;\n", "NOARSCAN ?= true ;\n",
"OPTIM ?= ;\n", "OPTIM ?= ;\n",
@ -43,7 +46,7 @@ const char *jambase[] = {
"}\n", "}\n",
"else if $(MSVCNT) || $(MSVCDIR)\n", "else if $(MSVCNT) || $(MSVCDIR)\n",
"{\n", "{\n",
"MSVCNT ?= $(MSVCDIR) ;\n", "MSVCNT ?= $(MSVCDIR) ; \n",
"local I ; if $(OSPLAT) = IA64 { I = ia64\\\\ ; } else { I = \"\" ; }\n", "local I ; if $(OSPLAT) = IA64 { I = ia64\\\\ ; } else { I = \"\" ; }\n",
"AR ?= lib ;\n", "AR ?= lib ;\n",
"AS ?= masm386 ;\n", "AS ?= masm386 ;\n",
@ -53,8 +56,9 @@ const char *jambase[] = {
"C++FLAGS ?= $(CCFLAGS) ;\n", "C++FLAGS ?= $(CCFLAGS) ;\n",
"LINK ?= link /nologo ;\n", "LINK ?= link /nologo ;\n",
"LINKFLAGS ?= \"\" ;\n", "LINKFLAGS ?= \"\" ;\n",
"LINKLIBS ?=\n", "LINKLIBS ?= \n",
"$(MSVCNT)\\\\lib\\\\$(I)libc.lib\n", "$(MSVCNT)\\\\lib\\\\$(I)libc.lib\n",
"$(MSVCNT)\\\\lib\\\\$(I)oldnames.lib\n",
"$(MSVCNT)\\\\lib\\\\$(I)kernel32.lib ;\n", "$(MSVCNT)\\\\lib\\\\$(I)kernel32.lib ;\n",
"OPTIM ?= \"\" ;\n", "OPTIM ?= \"\" ;\n",
"STDHDRS ?= $(MSVCNT)\\\\include ;\n", "STDHDRS ?= $(MSVCNT)\\\\include ;\n",
@ -133,7 +137,7 @@ const char *jambase[] = {
"SUFEXE ?= .exe ;\n", "SUFEXE ?= .exe ;\n",
"SUFLIB ?= .olb ;\n", "SUFLIB ?= .olb ;\n",
"SUFOBJ ?= .obj ;\n", "SUFOBJ ?= .obj ;\n",
"switch $(OS)\n", "switch $(OS) \n",
"{\n", "{\n",
"case OPENVMS : CCFLAGS ?= /stand=vaxc ;\n", "case OPENVMS : CCFLAGS ?= /stand=vaxc ;\n",
"case VMS : LINKLIBS ?= sys$library:vaxcrtl.olb/lib ;\n", "case VMS : LINKLIBS ?= sys$library:vaxcrtl.olb/lib ;\n",
@ -150,16 +154,16 @@ const char *jambase[] = {
"MACLIBS ?=\n", "MACLIBS ?=\n",
"\"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Interfacelib\"\n", "\"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Interfacelib\"\n",
"\"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Mathlib\" ;\n", "\"$(CW):MacOS Support:Universal:Libraries:StubLibraries:Mathlib\" ;\n",
"MPWLIBS ?=\n", "MPWLIBS ?= \n",
"\"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib\"\n", "\"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib\"\n",
"\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW.Lib\" ;\n", "\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW.Lib\" ;\n",
"MPWNLLIBS ?=\n", "MPWNLLIBS ?= \n",
"\"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib\"\n", "\"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_MPWCRuntime_PPC.lib\"\n",
"\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW(NL).Lib\" ;\n", "\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC_MPW(NL).Lib\" ;\n",
"SIOUXHDRS ?= ;\n", "SIOUXHDRS ?= ;\n",
"SIOUXLIBS ?=\n", "SIOUXLIBS ?= \n",
"\"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_Runtime_PPC.lib\"\n", "\"$(CW):MacOS Support:Libraries:Runtime:Libs:MSL_Runtime_PPC.lib\"\n",
"\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_SIOUX_PPC.Lib\"\n", "\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_SIOUX_PPC.Lib\" \n",
"\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib\" ;\n", "\"$(CW):MSL:MSL_C:MSL_MacOS:Lib:PPC:MSL_C_PPC.Lib\" ;\n",
"C++ ?= mwcppc ;\n", "C++ ?= mwcppc ;\n",
"C++FLAGS ?= -w off ;\n", "C++FLAGS ?= -w off ;\n",
@ -170,15 +174,15 @@ const char *jambase[] = {
"DOTDOT ?= \"::\" ;\n", "DOTDOT ?= \"::\" ;\n",
"HDRS ?= $(MACHDRS) $(MPWHDRS) ;\n", "HDRS ?= $(MACHDRS) $(MPWHDRS) ;\n",
"LINK ?= mwlinkppc ;\n", "LINK ?= mwlinkppc ;\n",
"LINKFLAGS ?= -mpwtool -warn ;\n", "LINKFLAGS ?= -mpwtool -warn ; \n",
"LINKLIBS ?= $(MACLIBS) $(MPWLIBS) ;\n", "LINKLIBS ?= $(MACLIBS) $(MPWLIBS) ; \n",
"MKDIR ?= newfolder ;\n", "MKDIR ?= newfolder ;\n",
"MV ?= rename -y ;\n", "MV ?= rename -y ;\n",
"NOARSCAN ?= true ;\n", "NOARSCAN ?= true ;\n",
"OPTIM ?= ;\n", "OPTIM ?= ;\n",
"RM ?= delete -y ;\n", "RM ?= delete -y ;\n",
"SLASH ?= \":\" ;\n", "SLASH ?= \":\" ;\n",
"STDHDRS ?= ;\n", "STDHDRS ?= ; \n",
"SUFLIB ?= .lib ;\n", "SUFLIB ?= .lib ;\n",
"SUFOBJ ?= .o ;\n", "SUFOBJ ?= .o ;\n",
"}\n", "}\n",
@ -258,7 +262,7 @@ const char *jambase[] = {
"case AMIGA :\n", "case AMIGA :\n",
"CC ?= gcc ;\n", "CC ?= gcc ;\n",
"YACC ?= bison -y ;\n", "YACC ?= bison -y ;\n",
"case CYGWIN :\n", "case CYGWIN : \n",
"CC ?= gcc ;\n", "CC ?= gcc ;\n",
"CCFLAGS += -D__cygwin__ ;\n", "CCFLAGS += -D__cygwin__ ;\n",
"LEX ?= flex ;\n", "LEX ?= flex ;\n",
@ -282,11 +286,11 @@ const char *jambase[] = {
"C++ ?= gcc ;\n", "C++ ?= gcc ;\n",
"CCFLAGS += -D_POSIX_SOURCE ;\n", "CCFLAGS += -D_POSIX_SOURCE ;\n",
"HDRS += /usr/include ;\n", "HDRS += /usr/include ;\n",
"RANLIB ?= \"\" ;\n", "RANLIB ?= \"\" ; \n",
"NOARSCAN ?= true ;\n", "NOARSCAN ?= true ;\n",
"NOARUPDATE ?= true ;\n", "NOARUPDATE ?= true ;\n",
"case MVS :\n", "case MVS :\n",
"RANLIB ?= \"\" ;\n", "RANLIB ?= \"\" ; \n",
"case NEXT :\n", "case NEXT :\n",
"AR ?= libtool -o ;\n", "AR ?= libtool -o ;\n",
"RANLIB ?= \"\" ;\n", "RANLIB ?= \"\" ;\n",
@ -330,7 +334,7 @@ const char *jambase[] = {
"LEX ?= lex ;\n", "LEX ?= lex ;\n",
"LINKFLAGS ?= $(CCFLAGS) ;\n", "LINKFLAGS ?= $(CCFLAGS) ;\n",
"LINKLIBS ?= ;\n", "LINKLIBS ?= ;\n",
"OPTIM ?= ;\n", "OPTIM ?= -O ;\n",
"RANLIB ?= ranlib ;\n", "RANLIB ?= ranlib ;\n",
"YACC ?= yacc ;\n", "YACC ?= yacc ;\n",
"YACCGEN ?= .c ;\n", "YACCGEN ?= .c ;\n",
@ -387,7 +391,7 @@ const char *jambase[] = {
"YACCGEN ?= ;\n", "YACCGEN ?= ;\n",
"YACCFILES ?= ;\n", "YACCFILES ?= ;\n",
"YACCFLAGS ?= ;\n", "YACCFLAGS ?= ;\n",
"HDRPATTERN =\n", "HDRPATTERN = \n",
"\"^[ ]*#[ ]*include[ ]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n", "\"^[ ]*#[ ]*include[ ]*[<\\\"]([^\\\">]*)[\\\">].*$\" ;\n",
"OSFULL = $(OS)$(OSVER)$(OSPLAT) $(OS)$(OSPLAT) $(OS)$(OSVER) $(OS) ;\n", "OSFULL = $(OS)$(OSVER)$(OSPLAT) $(OS)$(OSPLAT) $(OS)$(OSVER) $(OS) ;\n",
"Depends all : shell files lib exe obj ;\n", "Depends all : shell files lib exe obj ;\n",
@ -446,7 +450,7 @@ const char *jambase[] = {
"{\n", "{\n",
"Depends $(<) : $(>) ;\n", "Depends $(<) : $(>) ;\n",
"}\n", "}\n",
"rule GenFile\n", "rule GenFile \n",
"{\n", "{\n",
"local _t = [ FGristSourceFiles $(<) ] ;\n", "local _t = [ FGristSourceFiles $(<) ] ;\n",
"local _s = [ FAppendSuffix $(>[1]) : $(SUFEXE) ] ;\n", "local _s = [ FAppendSuffix $(>[1]) : $(SUFEXE) ] ;\n",
@ -490,13 +494,13 @@ const char *jambase[] = {
"Depends $(tt) : $(i) ;\n", "Depends $(tt) : $(i) ;\n",
"Install $(tt) : $(i) ;\n", "Install $(tt) : $(i) ;\n",
"Chmod $(tt) ;\n", "Chmod $(tt) ;\n",
"if $(OWNER) && $(CHOWN)\n", "if $(OWNER) && $(CHOWN) \n",
"{\n", "{ \n",
"Chown $(tt) ;\n", "Chown $(tt) ;\n",
"OWNER on $(tt) = $(OWNER) ;\n", "OWNER on $(tt) = $(OWNER) ;\n",
"}\n", "}\n",
"if $(GROUP) && $(CHGRP)\n", "if $(GROUP) && $(CHGRP) \n",
"{\n", "{ \n",
"Chgrp $(tt) ;\n", "Chgrp $(tt) ;\n",
"GROUP on $(tt) = $(GROUP) ;\n", "GROUP on $(tt) = $(GROUP) ;\n",
"}\n", "}\n",
@ -569,8 +573,8 @@ const char *jambase[] = {
"{\n", "{\n",
"MakeLocate $(_l) $(_l)($(_s:BS)) : $(LOCATE_TARGET) ;\n", "MakeLocate $(_l) $(_l)($(_s:BS)) : $(LOCATE_TARGET) ;\n",
"}\n", "}\n",
"if $(NOARSCAN)\n", "if $(NOARSCAN) \n",
"{\n", "{ \n",
"Depends $(_l) : $(_s) ;\n", "Depends $(_l) : $(_s) ;\n",
"}\n", "}\n",
"else\n", "else\n",
@ -643,7 +647,7 @@ const char *jambase[] = {
"rule MkDir\n", "rule MkDir\n",
"{\n", "{\n",
"NoUpdate $(<) ;\n", "NoUpdate $(<) ;\n",
"if $(<:G=) != $(DOT) && ! $($(<)-mkdir)\n", "if $(<:G=) != $(DOT) && ! $($(<)-mkdir) \n",
"{\n", "{\n",
"$(<)-mkdir = true ;\n", "$(<)-mkdir = true ;\n",
"LocalDepends dirs : $(<) ;\n", "LocalDepends dirs : $(<) ;\n",
@ -676,7 +680,7 @@ const char *jambase[] = {
"HDRS on $(<) = $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ;\n", "HDRS on $(<) = $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ;\n",
"HDRRULE on $(>) = HdrRule ;\n", "HDRRULE on $(>) = HdrRule ;\n",
"HDRSCAN on $(>) = $(HDRPATTERN) ;\n", "HDRSCAN on $(>) = $(HDRPATTERN) ;\n",
"HDRSEARCH on $(>) =\n", "HDRSEARCH on $(>) = \n",
"$(SEARCH_SOURCE:E) $(SUBDIRHDRS) $(HDRS) $(STDHDRS) ;\n", "$(SEARCH_SOURCE:E) $(SUBDIRHDRS) $(HDRS) $(STDHDRS) ;\n",
"HDRGRIST on $(>) = $(HDRGRIST) ;\n", "HDRGRIST on $(>) = $(HDRGRIST) ;\n",
"DEFINES on $(<) += $(DEFINES) ;\n", "DEFINES on $(<) += $(DEFINES) ;\n",
@ -774,9 +778,9 @@ const char *jambase[] = {
"FStripCommon _tokens : SUBDIR_DOWN ;\n", "FStripCommon _tokens : SUBDIR_DOWN ;\n",
"SUBDIR_DOWN = [ FReverse $(SUBDIR_DOWN) ] ;\n", "SUBDIR_DOWN = [ FReverse $(SUBDIR_DOWN) ] ;\n",
"_tokens = [ FReverse $(_tokens) ] ;\n", "_tokens = [ FReverse $(_tokens) ] ;\n",
"if $(SUBDIR_DOWN) && $(_tokens)\n", "if $(SUBDIR_DOWN) && $(_tokens) \n",
"{\n", "{ \n",
"Echo Warning: SubDir $(<) misplaced! ;\n", "Echo Warning: SubDir $(<) misplaced! ; \n",
"}\n", "}\n",
"$(_top)-UP = $(SUBDIR_UP) $(_tokens) ;\n", "$(_top)-UP = $(SUBDIR_UP) $(_tokens) ;\n",
"$(_top)-DOWN = $(SUBDIR_DOWN) ;\n", "$(_top)-DOWN = $(SUBDIR_DOWN) ;\n",
@ -799,9 +803,9 @@ const char *jambase[] = {
"jumptoeof ;\n", "jumptoeof ;\n",
"}\n", "}\n",
"}\n", "}\n",
"if $($(_top)RULES) {\n", "if $($(_top)RULES) { \n",
"include $($(_top)RULES) ;\n", "include $($(_top)RULES) ;\n",
"} else {\n", "} else { \n",
"NoCare $(JAMRULES:R=$($(_top)):G=$(_top)) ;\n", "NoCare $(JAMRULES:R=$($(_top)):G=$(_top)) ;\n",
"include $(JAMRULES:R=$($(_top)):G=$(_top)) ;\n", "include $(JAMRULES:R=$($(_top)):G=$(_top)) ;\n",
"}\n", "}\n",
@ -880,7 +884,7 @@ const char *jambase[] = {
"{\n", "{\n",
"return $(<:J=!) ;\n", "return $(<:J=!) ;\n",
"}\n", "}\n",
"rule FGristFiles\n", "rule FGristFiles \n",
"{\n", "{\n",
"return $(<:G=$(SOURCE_GRIST:E)) ;\n", "return $(<:G=$(SOURCE_GRIST:E)) ;\n",
"}\n", "}\n",
@ -902,16 +906,16 @@ const char *jambase[] = {
"return true ;\n", "return true ;\n",
"}\n", "}\n",
"}\n", "}\n",
"rule FReverse\n", "rule FReverse \n",
"{\n", "{\n",
"if $(1) { return [ FReverse $(1[2-]) ] $(1[1]) ; }\n", "if $(1) { return [ FReverse $(1[2-]) ] $(1[1]) ; }\n",
"}\n", "}\n",
"rule FSubDir\n", "rule FSubDir\n",
"{\n", "{\n",
"if ! $(<[1])\n", "if ! $(<[1]) \n",
"{\n", "{\n",
"return $(DOT) ;\n", "return $(DOT) ;\n",
"}\n", "} \n",
"else\n", "else\n",
"{\n", "{\n",
"local _i _d ;\n", "local _i _d ;\n",
@ -1010,7 +1014,7 @@ const char *jambase[] = {
"{\n", "{\n",
"_s = $(DOT) ;\n", "_s = $(DOT) ;\n",
"}\n", "}\n",
"else\n", "else \n",
"{\n", "{\n",
"switch $(<[1])\n", "switch $(<[1])\n",
"{\n", "{\n",
@ -1076,7 +1080,7 @@ const char *jambase[] = {
"}\n", "}\n",
"actions Install\n", "actions Install\n",
"{\n", "{\n",
"$(CP) $(>) $(<)\n", "$(CP) $(>) $(<) \n",
"}\n", "}\n",
"actions Lex\n", "actions Lex\n",
"{\n", "{\n",
@ -1088,7 +1092,7 @@ const char *jambase[] = {
"}\n", "}\n",
"actions Link bind NEEDLIBS\n", "actions Link bind NEEDLIBS\n",
"{\n", "{\n",
"$(LINK) $(LINKFLAGS) -o $(<) $(UNDEFS) $(>) $(NEEDLIBS) $(LINKLIBS)\n", "$(LINK) $(LINKFLAGS) -o $(<) $(UNDEFS) $(>) $(NEEDLIBS) $(LINKLIBS) \n",
"}\n", "}\n",
"actions MkDir1\n", "actions MkDir1\n",
"{\n", "{\n",
@ -1182,7 +1186,7 @@ const char *jambase[] = {
"{\n", "{\n",
"actions updated together piecemeal Archive\n", "actions updated together piecemeal Archive\n",
"{\n", "{\n",
"$(AR) $(<) $(>)\n", "$(AR) $(<) -+$(>)\n",
"}\n", "}\n",
"actions Cc\n", "actions Cc\n",
"{\n", "{\n",
@ -1220,7 +1224,7 @@ const char *jambase[] = {
"{\n", "{\n",
"actions together piecemeal Archive\n", "actions together piecemeal Archive\n",
"{\n", "{\n",
"$(AR) $(<) +-$(>)\n", "$(AR) $(<) +-$(>) \n",
"}\n", "}\n",
"actions Cc\n", "actions Cc\n",
"{\n", "{\n",
@ -1241,17 +1245,17 @@ const char *jambase[] = {
"}\n", "}\n",
"else if $(VMS)\n", "else if $(VMS)\n",
"{\n", "{\n",
"actions updated together piecemeal Archive\n", "actions updated together piecemeal Archive \n",
"{\n", "{\n",
"lib/replace $(<) $(>[1]) ,$(>[2-])\n", "lib/replace $(<) $(>[1]) ,$(>[2-])\n",
"}\n", "}\n",
"actions Cc\n", "actions Cc\n",
"{\n", "{ \n",
"$(CC)/obj=$(<) $(CCFLAGS) $(CCDEFS) $(CCHDRS) $(>)\n", "$(CC)/obj=$(<) $(CCFLAGS) $(CCDEFS) $(CCHDRS) $(>) \n",
"}\n", "}\n",
"actions C++\n", "actions C++\n",
"{\n", "{ \n",
"$(C++)/obj=$(<) $(C++FLAGS) $(CCDEFS) $(CCHDRS) $(>)\n", "$(C++)/obj=$(<) $(C++FLAGS) $(CCDEFS) $(CCHDRS) $(>) \n",
"}\n", "}\n",
"actions piecemeal together existing Clean\n", "actions piecemeal together existing Clean\n",
"{\n", "{\n",
@ -1280,19 +1284,19 @@ const char *jambase[] = {
"}\n", "}\n",
"else if $(MAC)\n", "else if $(MAC)\n",
"{\n", "{\n",
"actions together Archive\n", "actions together Archive \n",
"{\n", "{\n",
"$(LINK) -library -o $(<) $(>)\n", "$(LINK) -library -o $(<) $(>)\n",
"}\n", "}\n",
"actions Cc\n", "actions Cc\n",
"{\n", "{\n",
"set -e MWCincludes $(CCHDRS)\n", "set -e MWCincludes $(CCHDRS)\n",
"$(CC) -o $(<) $(CCFLAGS) $(CCDEFS) $(>)\n", "$(CC) -o $(<) $(CCFLAGS) $(CCDEFS) $(>) \n",
"}\n", "}\n",
"actions C++\n", "actions C++\n",
"{\n", "{\n",
"set -e MWCincludes $(CCHDRS)\n", "set -e MWCincludes $(CCHDRS)\n",
"$(CC) -o $(<) $(C++FLAGS) $(CCDEFS) $(>)\n", "$(CC) -o $(<) $(C++FLAGS) $(CCDEFS) $(>) \n",
"}\n", "}\n",
"actions Link bind NEEDLIBS\n", "actions Link bind NEEDLIBS\n",
"{\n", "{\n",