diff options
| author | Dan McDonald <danmcd@mnx.io> | 2022-05-25 15:09:42 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@mnx.io> | 2022-05-25 15:09:42 -0400 |
| commit | 32bcc42cee3ff3f288b99b3be95c437c3f278f6e (patch) | |
| tree | 7ed329fc1548f2dad25b798d0a64870d39de5ffd /usr | |
| parent | 59b138baa75567bf292cecd61679cfd0538e2d0e (diff) | |
| parent | d8e10381a0083d7717710b0db7e64707bc0f3ff8 (diff) | |
| download | illumos-joyent-32bcc42cee3ff3f288b99b3be95c437c3f278f6e.tar.gz | |
[illumos-gate merge]
commit d8e10381a0083d7717710b0db7e64707bc0f3ff8
14683 remove SUNWonld vestiges from sgs
commit e9db39cef1f968a982994f50c05903cc988a3dd3
14682 remove prior-release portability from cmd/sgs
Conflicts:
usr/src/cmd/sgs/elfdump/Makefile.targ
Diffstat (limited to 'usr')
135 files changed, 208 insertions, 663 deletions
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd index 4fcff5f0d7..1cd26a9a31 100644 --- a/usr/src/cmd/Makefile.cmd +++ b/usr/src/cmd/Makefile.cmd @@ -158,10 +158,7 @@ ROOTUSRSBINPROG32= $(PROG:%=$(ROOTUSRSBIN32)/%) ROOTUSRSBINPROG64= $(PROG:%=$(ROOTUSRSBIN64)/%) ROOTLIBSVCBINPROG= $(PROG:%=$(ROOTLIBSVCBIN)/%) -# Symlink rules for /usr/ccs/bin commands. Note, those commands under -# the rule of the linker area, are controlled by a different set of -# rules defined in $(SRC)/cmd/sgs/Makefile.var. - +# Note that commands in usr/src/cmd/sgs have separate targets for this INS.ccsbinlink= \ $(RM) $(ROOTCCSBINPROG); \ $(SYMLINK) ../../bin/$(PROG) $(ROOTCCSBINPROG) diff --git a/usr/src/cmd/sgs/0@0/Makefile.targ b/usr/src/cmd/sgs/0@0/Makefile.targ index 9e9f4a645a..0b2a3acfab 100644 --- a/usr/src/cmd/sgs/0@0/Makefile.targ +++ b/usr/src/cmd/sgs/0@0/Makefile.targ @@ -37,6 +37,3 @@ all: $(DYNLIB) $(DYNLIB): pics .WAIT $(CRTS) include $(SRC)/lib/Makefile.targ - -delete: - $(RM) $(DYNLIB) diff --git a/usr/src/cmd/sgs/0@0/amd64/Makefile b/usr/src/cmd/sgs/0@0/amd64/Makefile index fb7b09985f..ef07bd345f 100644 --- a/usr/src/cmd/sgs/0@0/amd64/Makefile +++ b/usr/src/cmd/sgs/0@0/amd64/Makefile @@ -35,5 +35,5 @@ ASFLAGS += -D__amd64 $(amd64_ASFLAGS) install: all $(ROOTLIBDIR64)/$(DYNLIB) include $(SRC)/cmd/sgs/0@0/Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/0@0/sparcv9/Makefile b/usr/src/cmd/sgs/0@0/sparcv9/Makefile index 1c04727d06..30fabcc560 100644 --- a/usr/src/cmd/sgs/0@0/sparcv9/Makefile +++ b/usr/src/cmd/sgs/0@0/sparcv9/Makefile @@ -32,5 +32,5 @@ include $(SRC)/cmd/sgs/0@0/Makefile.com install: all $(ROOTLIBDIR64)/$(DYNLIB) include $(SRC)/cmd/sgs/0@0/Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/Makefile b/usr/src/cmd/sgs/Makefile index dbe8137b97..3b34e0a882 100644 --- a/usr/src/cmd/sgs/Makefile +++ b/usr/src/cmd/sgs/Makefile @@ -100,13 +100,10 @@ MSGSUBDIRS= ld ldd libld liblddbg \ MSGDIR= messages - all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -delete := TARGET= delete -lint := TARGET= lint _msg := TARGET= catalog _msg_gettext := TARGET= catalog _msg_sgsmsg := TARGET= catalog @@ -148,9 +145,7 @@ install_lib: FRC @ cd lex; pwd; $(MAKE) $@ @ cd yacc; pwd; $(MAKE) $@ -lint: - -delete clean clobber: $(SUBDIRS) $(MSGDIR) +clean clobber: $(SUBDIRS) $(MSGDIR) $(SUBDIRS): FRC @ cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/Makefile.com b/usr/src/cmd/sgs/Makefile.com index f8f102b41b..9f5b28ddfa 100644 --- a/usr/src/cmd/sgs/Makefile.com +++ b/usr/src/cmd/sgs/Makefile.com @@ -29,8 +29,6 @@ .KEEP_STATE_FILE: .make.state.$(MACH) -include $(SRC)/cmd/sgs/Makefile.var - i386_ARCH = intel sparc_ARCH = sparc diff --git a/usr/src/cmd/sgs/Makefile.sub b/usr/src/cmd/sgs/Makefile.sub index 7356ba6653..f127f18287 100644 --- a/usr/src/cmd/sgs/Makefile.sub +++ b/usr/src/cmd/sgs/Makefile.sub @@ -33,16 +33,14 @@ $(BUILD64)SUBDIRS += $(MACH64) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber -delete := TARGET= delete install := TARGET= install catalog := TARGET= catalog -package := TARGET= package chkmsg := TARGET= chkmsg .KEEP_STATE: .KEEP_STATE_FILE: .make.state.$(MACH) -all clean clobber delete install catalog package chkmsg: \ +all clean clobber install catalog chkmsg: \ $(SUBDIRS) $(SUBDIRS): FRC diff --git a/usr/src/cmd/sgs/Makefile.sub.64 b/usr/src/cmd/sgs/Makefile.sub.64 deleted file mode 100644 index 521ef23ca6..0000000000 --- a/usr/src/cmd/sgs/Makefile.sub.64 +++ /dev/null @@ -1,32 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright 2006 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# -# ident "%Z%%M% %I% %E% SMI" -# - -# -# Include overrides for building 64-bit objects -# -include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/Makefile.targ b/usr/src/cmd/sgs/Makefile.targ deleted file mode 100644 index 37064baa75..0000000000 --- a/usr/src/cmd/sgs/Makefile.targ +++ /dev/null @@ -1,42 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2016 RackTop Systems. -# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. -# - -# Standard install rules -# The VAR_SGSBIN and VAR_SGSBIN64 install rules included here are applicable -# to Solaris 10 and earlier releases. For post Solaris 10 releases, the -# standard ROOTBIN and ROOTBIN64 rules defined in ../Makefile.cmd are used. -# The new rules here are included to allow for easier backporting. Making -# the appropriate updates in ./Makefile.var, will allow the SGS components -# to be installed in /usr/ccs/bin rather than the current /usr/bin. -# -$(VAR_SGSBIN)/%: % - $(INS.file) - -$(VAR_SGSBIN64)/%: % - $(INS.file) - -FRC: diff --git a/usr/src/cmd/sgs/Makefile.var b/usr/src/cmd/sgs/Makefile.var deleted file mode 100644 index fa8f897c10..0000000000 --- a/usr/src/cmd/sgs/Makefile.var +++ /dev/null @@ -1,138 +0,0 @@ -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License (the "License"). -# You may not use this file except in compliance with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -# -# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. -# Copyright 2019 OmniOS Community Edition (OmniOSce) Association. -# - -# The link-editor related source files and Makefile files have at times been -# unified across all presently maintained release gates. However, some of the -# compiler pre-processor flags and link-editor flags are different among the -# releases. This file is used to specify such flags. -# -# This file is included by ./Makefile.com, but may also be included directly in -# the case where the utility is relying on the contents of ../../Makefile.com. -# -# This file should be the only file which is different among the presently -# maintained release workspaces, when the sources are unified. -# -# CPPFEATUREMACROS provides for selectively turning on/off features within the -# various link-editor components. Presently, none are set. -# -# Some source files need to use #ifdef to distinguish between the patch release, -# and for the packages targeting to the pre-libc/libthread unified environment. -# These values are available for CPPFLAGS: -# -# SGS_PRE_UNIFIED_PROCESS -# -# is set if the target release is for pre-libc/libthread unified -# environment. This is used for rtld and crle. - -# -# Common Macro definitions -# - -VAR_PLAT_sparc= sparc -VAR_PLAT_i386= intel/ia32 -VAR_PLAT_amd64= intel/amd64 - -# -# VAR_AVLDIR - directory to find avl.c in. -# -# The avl.c file is under usr/src/common/avl in Solaris 10 (and later), -# but in earlier releases it is not present (problem to be solved). -# -# The avl.h and avl_impl.h files are under usr/src/uts/common/sys in -# Solaris 10 (and later). They are under usr/src/cmd/sgs/tools/common/sys -# in Solaris 9 and earlier. -# -# For Solaris 9 and earlier releases, we will have our own copy of the -# files avl.c, avl.h and avl_impl.h until these files are back ported into -# the system. -# -VAR_AVLDIR= $(SRC)/common/avl -VAR_AVLINCDIR= -I $(SRC)/uts/common - -# -# VAR_DTRDIR - directory to find dtrace_data.c in. -# -# In Solaris 10 and earlier releases, dtrace_data.c was maintained as separate -# files under sgs/rtld. This file is now under usr/src/common/dtrace. -# -VAR_DTRDIR= $(SRC)/common/dtrace - -# -# VAR_SGSBINPROG -# -# For Solaris 10 and earlier releases, the SGS components were installed in -# /usr/ccs/bin. These components are now installed in /usr/bin with associated -# symbolic links for compatibility. For previous behavior, set the VAR_SGSBIN* -# variables to the appropriate ROOTCCSBIN* rule and set the VAR_SGSCCSLINK* -# rules to null. -# -VAR_SGSBIN= $(ROOTBIN) -VAR_SGSBINPROG= $(ROOTPROG) -VAR_SGSBIN64= $(ROOTBIN64) -VAR_SGSBINPROG64= $(ROOTPROG64) - -VAR_SGSCCSLINK= $(ROOTCCSBINLINK) -VAR_SGSCCSLINK64= $(ROOTCCSBINLINK64) - -# -# ld -# -VAR_LD_LLDFLAGS= '-R$$ORIGIN/../../lib' -VAR_LD_LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' - -# -# elfdump -# -VAR_ELFDUMP_LLDFLAGS= '-R$$ORIGIN/../../lib' -VAR_ELFDUMP_LLDFLAGS64 ='-R$$ORIGIN/../../../lib/$(MACH64)' - -# -# elfedit -# -VAR_ELFEDIT_LLDFLAGS= '-R$$ORIGIN/../../lib' -VAR_ELFEDIT_LLDFLAGS64 ='-R$$ORIGIN/../../../lib/$(MACH64)' - -# -# lddstub -# -VAR_LDDSTUB_INTERP= -I'$$ORIGIN/ld.so.1' - -# -# libld -# -VAR_LIBLD_CPPFLAGS= $(VAR_AVLINCDIR) -VAR_LIBLD_64_ROOTFS_LIBDIR= $(ROOT)/lib/$(MACH64) - -# -# Tools -# -VAR_TOOLS_CPPFLAGS= $(VAR_AVLINCDIR) - -# -# rtld -# -VAR_RTLD_CPICLIB= -L ../../../../lib/libc/$(MACH) -VAR_RTLD_CPICLIB64= -L ../../../../lib/libc/$(MACH64) diff --git a/usr/src/cmd/sgs/ar/Makefile.targ b/usr/src/cmd/sgs/ar/Makefile.targ index c962a700fc..76d00b2285 100644 --- a/usr/src/cmd/sgs/ar/Makefile.targ +++ b/usr/src/cmd/sgs/ar/Makefile.targ @@ -35,9 +35,6 @@ objs.xpg4/%.o: %.c clean: $(RM) $(OBJS) $(XPG4OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - catalog: $(BLTMESG) $(PROG): $(OBJS) @@ -56,7 +53,6 @@ objs objs.xpg4: -@ mkdir -p $@ include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/ar/amd64/Makefile b/usr/src/cmd/sgs/ar/amd64/Makefile index 4522ff6331..b4140367cd 100644 --- a/usr/src/cmd/sgs/ar/amd64/Makefile +++ b/usr/src/cmd/sgs/ar/amd64/Makefile @@ -37,9 +37,8 @@ ROOTPROG = $(ROOTPROG64) all: $(PROG) -install \ -package: all $(ROOTPROG64) $(ROOTCCSBINLINK64) +install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ar/i386/Makefile b/usr/src/cmd/sgs/ar/i386/Makefile index 65c061d3b8..82f13d7173 100644 --- a/usr/src/cmd/sgs/ar/i386/Makefile +++ b/usr/src/cmd/sgs/ar/i386/Makefile @@ -27,8 +27,7 @@ include ../Makefile.com all: $(PROG) $(XPG4) -install \ -package: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) +install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) diff --git a/usr/src/cmd/sgs/ar/sparc/Makefile b/usr/src/cmd/sgs/ar/sparc/Makefile index eed82bcded..d5379dd355 100644 --- a/usr/src/cmd/sgs/ar/sparc/Makefile +++ b/usr/src/cmd/sgs/ar/sparc/Makefile @@ -27,7 +27,6 @@ include ../Makefile.com all: $(PROG) $(XPG4) -install \ -package: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) +install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ar/sparcv9/Makefile b/usr/src/cmd/sgs/ar/sparcv9/Makefile index d1d43e8fda..ad7849c995 100644 --- a/usr/src/cmd/sgs/ar/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ar/sparcv9/Makefile @@ -36,8 +36,7 @@ ROOTPROG = $(ROOTPROG64) all: $(PROG) -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/crle/Makefile.targ b/usr/src/cmd/sgs/crle/Makefile.targ index 346aec755a..d8833c848b 100644 --- a/usr/src/cmd/sgs/crle/Makefile.targ +++ b/usr/src/cmd/sgs/crle/Makefile.targ @@ -32,8 +32,7 @@ $(COMPILE.c) $< $(POST_PROCESS_O) -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) all: $(PROG) @@ -44,11 +43,7 @@ $(PROG): $(OBJS) $(MAPFILE) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/crle/amd64/Makefile b/usr/src/cmd/sgs/crle/amd64/Makefile index a93a68d57b..c4850094c7 100644 --- a/usr/src/cmd/sgs/crle/amd64/Makefile +++ b/usr/src/cmd/sgs/crle/amd64/Makefile @@ -39,4 +39,4 @@ LDDBGLIBDIR = $(LDDBGLIBDIR64) ROOTPROG = $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/crle/sparcv9/Makefile b/usr/src/cmd/sgs/crle/sparcv9/Makefile index a93a68d57b..c4850094c7 100644 --- a/usr/src/cmd/sgs/crle/sparcv9/Makefile +++ b/usr/src/cmd/sgs/crle/sparcv9/Makefile @@ -39,4 +39,4 @@ LDDBGLIBDIR = $(LDDBGLIBDIR64) ROOTPROG = $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/demo_rdb/Makefile.targ b/usr/src/cmd/sgs/demo_rdb/Makefile.targ index 82de1a0deb..1989512d92 100644 --- a/usr/src/cmd/sgs/demo_rdb/Makefile.targ +++ b/usr/src/cmd/sgs/demo_rdb/Makefile.targ @@ -104,8 +104,3 @@ catalog check chkmsg: # DEMO DELETE END FRC: - -# DEMO DELETE START - -include $(SRC)/cmd/sgs/Makefile.targ -# DEMO DELETE END diff --git a/usr/src/cmd/sgs/dump/Makefile.targ b/usr/src/cmd/sgs/dump/Makefile.targ index a4f899781c..d39bfa75cf 100644 --- a/usr/src/cmd/sgs/dump/Makefile.targ +++ b/usr/src/cmd/sgs/dump/Makefile.targ @@ -22,8 +22,6 @@ # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# %.o: ../common/%.c $(COMPILE.c) $< @@ -35,11 +33,9 @@ $(PROG): $(OBJS) all: $(PROG) -package \ -install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(CLEANFILES) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/dump/amd64/Makefile b/usr/src/cmd/sgs/dump/amd64/Makefile index b6617b6dad..10cef7c92d 100644 --- a/usr/src/cmd/sgs/dump/amd64/Makefile +++ b/usr/src/cmd/sgs/dump/amd64/Makefile @@ -34,11 +34,10 @@ LLDFLAGS = $(LLDFLAGS64) ELFLIBDIR = $(ELFLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) -VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) +ROOTPROG= $(ROOTPROG64) +ROOTCCSBINLINK= $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(VAR_SGSBINPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/dump/sparcv9/Makefile b/usr/src/cmd/sgs/dump/sparcv9/Makefile index c0c824f3f3..5632b0ecf0 100644 --- a/usr/src/cmd/sgs/dump/sparcv9/Makefile +++ b/usr/src/cmd/sgs/dump/sparcv9/Makefile @@ -34,11 +34,10 @@ LLDFLAGS = $(LLDFLAGS64) ELFLIBDIR = $(ELFLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) -VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) +ROOTPROG = $(ROOTPROG64) +ROOTCCSBINLINK = $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(VAR_SGSBINPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfdump/Makefile.com b/usr/src/cmd/sgs/elfdump/Makefile.com index 085591a246..c5190adcd4 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.com +++ b/usr/src/cmd/sgs/elfdump/Makefile.com @@ -51,8 +51,8 @@ MAPOPT= $(MAPFILE:%=-Wl,-M%) CPPFLAGS= -I. -I../common -I../../include -I../../include/$(MACH) \ -I$(SRC)/lib/libc/inc -I$(SRC)/uts/$(ARCH)/sys \ $(CPPFLAGS.master) -I$(ELFCAP) -LLDFLAGS = $(VAR_ELFDUMP_LLDFLAGS) -LLDFLAGS64 = $(VAR_ELFDUMP_LLDFLAGS64) +LLDFLAGS = '-R$$ORIGIN/../../lib' +LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' LDFLAGS += $(VERSREF) $(MAPOPT) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \ $(CONVLIBDIR) -lconv diff --git a/usr/src/cmd/sgs/elfdump/Makefile.targ b/usr/src/cmd/sgs/elfdump/Makefile.targ index 48bbbbbb87..6cdaf43d3f 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.targ +++ b/usr/src/cmd/sgs/elfdump/Makefile.targ @@ -74,16 +74,11 @@ clean: check_struct_layout gen_layout_obj.o \ struct_layout_$(ARCH).tmp -delete: - $(RM) $(PROG) - -package \ install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) -$(RM) $(ROOTPROG) -$(LN) $(ISAEXEC) $(ROOTPROG) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/elfdump/amd64/Makefile b/usr/src/cmd/sgs/elfdump/amd64/Makefile index 7c3f1eb876..b04872649b 100644 --- a/usr/src/cmd/sgs/elfdump/amd64/Makefile +++ b/usr/src/cmd/sgs/elfdump/amd64/Makefile @@ -36,13 +36,12 @@ ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) -VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) +ROOTPROG = $(ROOTPROG64) +ROOTCCSBINLINK = $(ROOTCCSBINLINK64) install: all $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(VAR_SGSBINPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile index 9dd92b9635..f24ce47957 100644 --- a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile @@ -36,12 +36,11 @@ ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) -VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) +ROOTPROG = $(ROOTPROG64) +ROOTCCSBINLINK = $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(VAR_SGSBINPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfedit/Makefile.com b/usr/src/cmd/sgs/elfedit/Makefile.com index 08d00eeaad..e83d552f23 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.com +++ b/usr/src/cmd/sgs/elfedit/Makefile.com @@ -46,8 +46,8 @@ MAPFILE= ../common/mapfile-vers CPPFLAGS= -I. -I../common -I../../include -I../../include/$(MACH) \ -I$(SRC)/lib/libc/inc -I$(SRC)/uts/$(ARCH)/sys \ $(CPPFLAGS.master) -I$(ELFCAP) -LLDFLAGS = $(VAR_ELFEDIT_LLDFLAGS) -LLDFLAGS64 = $(VAR_ELFEDIT_LLDFLAGS64) +LLDFLAGS = '-R$$ORIGIN/../../lib' +LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' LDFLAGS += $(VERSREF) -Wl,-M$(MAPFILE) $(LLDFLAGS) LDLIBS += $(ELFLIBDIR) -lelf $(LDDBGLIBDIR) -llddbg \ $(CONVLIBDIR) -lconv -ltecla diff --git a/usr/src/cmd/sgs/elfedit/Makefile.targ b/usr/src/cmd/sgs/elfedit/Makefile.targ index 9f31a1770a..51fe995726 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.targ +++ b/usr/src/cmd/sgs/elfedit/Makefile.targ @@ -53,14 +53,9 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/elfedit/amd64/Makefile b/usr/src/cmd/sgs/elfedit/amd64/Makefile index 0d3551cdc4..6a2b43ecb9 100644 --- a/usr/src/cmd/sgs/elfedit/amd64/Makefile +++ b/usr/src/cmd/sgs/elfedit/amd64/Makefile @@ -38,7 +38,6 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfedit/modules/Makefile b/usr/src/cmd/sgs/elfedit/modules/Makefile index 8171228077..bfb9923008 100644 --- a/usr/src/cmd/sgs/elfedit/modules/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/Makefile @@ -33,13 +33,12 @@ all:= TARGET= all chkmsg:= TARGET= chkmsg catalog:= TARGET= catalog install:= TARGET= install -package:= TARGET= package clean:= TARGET= clean clobber:= TARGET= clobber .KEEP_STATE: -package all chkmsg catalog clean clobber install: \ +all chkmsg catalog clean clobber install: \ $(SUBDIRS) $(SUBDIRS): FRC diff --git a/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile b/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile index 61caecccdc..4eec2ac865 100644 --- a/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile @@ -41,10 +41,9 @@ LLDFLAGS = $(LLDFLAGS64) all: $(PICDIR) .WAIT $(ELFEDITLIBS) -install \ -package: all .WAIT $(ROOTELFEDITDIR64) .WAIT $(ROOTELFEDITLIBS) +install: all .WAIT $(ROOTELFEDITDIR64) .WAIT $(ROOTELFEDITLIBS) include ../Makefile.targ -include ../../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/elfedit/modules/i386/Makefile b/usr/src/cmd/sgs/elfedit/modules/i386/Makefile index cce4b929ec..3241bf86ce 100644 --- a/usr/src/cmd/sgs/elfedit/modules/i386/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/i386/Makefile @@ -34,7 +34,6 @@ CFLAGS += $(C_PICFLAGS) all: $(OBJDIR) $(PICDIR) .WAIT $(ELFEDITLIBS) -install \ -package: all .WAIT $(ROOTELFEDITDIR) .WAIT $(ROOTELFEDITLIBS) +install: all .WAIT $(ROOTELFEDITDIR) .WAIT $(ROOTELFEDITLIBS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile b/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile index cce4b929ec..3241bf86ce 100644 --- a/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/sparc/Makefile @@ -34,7 +34,6 @@ CFLAGS += $(C_PICFLAGS) all: $(OBJDIR) $(PICDIR) .WAIT $(ELFEDITLIBS) -install \ -package: all .WAIT $(ROOTELFEDITDIR) .WAIT $(ROOTELFEDITLIBS) +install: all .WAIT $(ROOTELFEDITDIR) .WAIT $(ROOTELFEDITLIBS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile b/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile index bae1a3208a..cddb3960ca 100644 --- a/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/sparcv9/Makefile @@ -41,8 +41,7 @@ LLDFLAGS = $(LLDFLAGS64) all: $(PICDIR) .WAIT $(ELFEDITLIBS) -install \ -package: all .WAIT $(ROOTELFEDITDIR64) .WAIT $(ROOTELFEDITLIBS) +install: all .WAIT $(ROOTELFEDITDIR64) .WAIT $(ROOTELFEDITLIBS) include ../Makefile.targ -include ../../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/elfedit/sparcv9/Makefile b/usr/src/cmd/sgs/elfedit/sparcv9/Makefile index 0d3551cdc4..6a2b43ecb9 100644 --- a/usr/src/cmd/sgs/elfedit/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfedit/sparcv9/Makefile @@ -38,7 +38,6 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfwrap/Makefile.targ b/usr/src/cmd/sgs/elfwrap/Makefile.targ index 117cd43f38..908c0d71ef 100644 --- a/usr/src/cmd/sgs/elfwrap/Makefile.targ +++ b/usr/src/cmd/sgs/elfwrap/Makefile.targ @@ -67,14 +67,9 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/elfwrap/amd64/Makefile b/usr/src/cmd/sgs/elfwrap/amd64/Makefile index b3fa261cff..2beea08a8a 100644 --- a/usr/src/cmd/sgs/elfwrap/amd64/Makefile +++ b/usr/src/cmd/sgs/elfwrap/amd64/Makefile @@ -36,7 +36,6 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile b/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile index b3fa261cff..2beea08a8a 100644 --- a/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile @@ -36,7 +36,6 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/gprof/Makefile.targ b/usr/src/cmd/sgs/gprof/Makefile.targ index 0ca19bba36..f53f5f8f58 100644 --- a/usr/src/cmd/sgs/gprof/Makefile.targ +++ b/usr/src/cmd/sgs/gprof/Makefile.targ @@ -19,13 +19,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/gprof/Makefile.targ -# $(PROG): $(OBJS) @@ -36,5 +32,3 @@ clean: $(RM) $(OBJS) $(CLEANFILES) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ - diff --git a/usr/src/cmd/sgs/lari/Makefile b/usr/src/cmd/sgs/lari/Makefile index c9efe63689..0a8bcb8a48 100644 --- a/usr/src/cmd/sgs/lari/Makefile +++ b/usr/src/cmd/sgs/lari/Makefile @@ -42,8 +42,7 @@ $(PROG): $(PSRC) $(SED) -e "s@TEXT_DOMAIN@\"SUNW_OST_SGS\"@" $(PSRC) > $@ $(CHMOD) +x $@ -install \ -package: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(PROG) diff --git a/usr/src/cmd/sgs/ld/Makefile.com b/usr/src/cmd/sgs/ld/Makefile.com index 5861455302..32d435cc67 100644 --- a/usr/src/cmd/sgs/ld/Makefile.com +++ b/usr/src/cmd/sgs/ld/Makefile.com @@ -41,7 +41,10 @@ SRCDIR = $(SGSHOME)/ld MAPFILES = $(SRCDIR)/common/mapfile-intf $(MAPFILE.NGB) MAPOPTS = $(MAPFILES:%=-Wl,-M%) -LDFLAGS += $(VERSREF) $(MAPOPTS) $(VAR_LD_LLDFLAGS) +RPATH = '-R$$ORIGIN/../../lib' +RPATH64 = '-R$$ORIGIN/../../../lib/$(MACH64)' + +LDFLAGS += $(VERSREF) $(MAPOPTS) $(RPATH) LDLIBS += -lumem $(LDLIBDIR) -lld $(ELFLIBDIR) -lelf \ $(LDDBGLIBDIR) -llddbg $(CONVLIBDIR) -lconv diff --git a/usr/src/cmd/sgs/ld/Makefile.targ b/usr/src/cmd/sgs/ld/Makefile.targ index 075e67d8f3..195e56b770 100644 --- a/usr/src/cmd/sgs/ld/Makefile.targ +++ b/usr/src/cmd/sgs/ld/Makefile.targ @@ -40,11 +40,7 @@ $(PROG): $(OBJS) $(MAPFILES) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). @@ -57,4 +53,3 @@ $(BLTDEFS) + \ $(BLTDATA) + \ $(BLTMESG): $(SGSMSGALL) $(SGSMSG) $(SGSMSGFLAGS) $(SGSMSGALL) - diff --git a/usr/src/cmd/sgs/ld/amd64/Makefile b/usr/src/cmd/sgs/ld/amd64/Makefile index 8e329ec823..1315c657ff 100644 --- a/usr/src/cmd/sgs/ld/amd64/Makefile +++ b/usr/src/cmd/sgs/ld/amd64/Makefile @@ -32,12 +32,11 @@ ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_LD_LLDFLAGS = \ - $(VAR_LD_LLDFLAGS64) +RPATH = $(RPATH64) -package install: all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64) +install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) .KEEP_STATE: include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ld/i386/Makefile b/usr/src/cmd/sgs/ld/i386/Makefile index b8adbefe49..c9a167d407 100644 --- a/usr/src/cmd/sgs/ld/i386/Makefile +++ b/usr/src/cmd/sgs/ld/i386/Makefile @@ -26,6 +26,6 @@ include ../Makefile.com .KEEP_STATE: -package install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTCCSBINLINK) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ld/sparc/Makefile b/usr/src/cmd/sgs/ld/sparc/Makefile index b8adbefe49..999606887c 100644 --- a/usr/src/cmd/sgs/ld/sparc/Makefile +++ b/usr/src/cmd/sgs/ld/sparc/Makefile @@ -26,6 +26,6 @@ include ../Makefile.com .KEEP_STATE: -package install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) +install: all $(ROOTBIN) $(ROOTCCSBINLINK) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ld/sparcv9/Makefile b/usr/src/cmd/sgs/ld/sparcv9/Makefile index 64a2db892f..8cc2aab477 100644 --- a/usr/src/cmd/sgs/ld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ld/sparcv9/Makefile @@ -31,12 +31,11 @@ ELFLIBDIR = $(ELFLIBDIR64) LDDBGLIBDIR = $(LDDBGLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_LD_LLDFLAGS = \ - $(VAR_LD_LLDFLAGS64) +RPATH = $(RPATH64) .KEEP_STATE: -package install: all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64) +install: all $(ROOTBIN64) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ldd/Makefile.targ b/usr/src/cmd/sgs/ldd/Makefile.targ index 12c24ab1bb..97de6f7268 100644 --- a/usr/src/cmd/sgs/ldd/Makefile.targ +++ b/usr/src/cmd/sgs/ldd/Makefile.targ @@ -35,18 +35,13 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) $(PROG): $(OBJS) $(MAPFILE) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). catalog: $(BLTMESG) diff --git a/usr/src/cmd/sgs/ldd/amd64/Makefile b/usr/src/cmd/sgs/ldd/amd64/Makefile index 1819ad03dc..4950df4904 100644 --- a/usr/src/cmd/sgs/ldd/amd64/Makefile +++ b/usr/src/cmd/sgs/ldd/amd64/Makefile @@ -34,4 +34,4 @@ LLDFLAGS = $(LLDFLAGS64) ROOTPROG = $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ldd/i386/Makefile b/usr/src/cmd/sgs/ldd/i386/Makefile index c604f5274a..ddafdb6d57 100644 --- a/usr/src/cmd/sgs/ldd/i386/Makefile +++ b/usr/src/cmd/sgs/ldd/i386/Makefile @@ -28,7 +28,6 @@ include ../Makefile.com .KEEP_STATE: -install \ -package: $(ROOTPROG) +install: $(ROOTPROG) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldd/sparc/Makefile b/usr/src/cmd/sgs/ldd/sparc/Makefile index c604f5274a..ddafdb6d57 100644 --- a/usr/src/cmd/sgs/ldd/sparc/Makefile +++ b/usr/src/cmd/sgs/ldd/sparc/Makefile @@ -28,7 +28,6 @@ include ../Makefile.com .KEEP_STATE: -install \ -package: $(ROOTPROG) +install: $(ROOTPROG) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldd/sparcv9/Makefile b/usr/src/cmd/sgs/ldd/sparcv9/Makefile index 1819ad03dc..4950df4904 100644 --- a/usr/src/cmd/sgs/ldd/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ldd/sparcv9/Makefile @@ -34,4 +34,4 @@ LLDFLAGS = $(LLDFLAGS64) ROOTPROG = $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/lddstub/Makefile.com b/usr/src/cmd/sgs/lddstub/Makefile.com index 8139c90c96..12ffa69c19 100644 --- a/usr/src/cmd/sgs/lddstub/Makefile.com +++ b/usr/src/cmd/sgs/lddstub/Makefile.com @@ -23,8 +23,6 @@ # Copyright 1994-2003 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# PROG= lddstub SRCS= lddstub.s @@ -33,9 +31,7 @@ OBJS= $(SRCS:%.s=%.o) include ../../../Makefile.cmd include ../../Makefile.com -# As of Solaris 9 the kernel accepts $ORIGIN within the interpreter field. - -INTERP= $(VAR_LDDSTUB_INTERP) +INTERP= -I'$$ORIGIN/ld.so.1' ASFLAGS= -P -D_ASM LDFLAGS= $(VERSREF) $(INTERP) $(CONVLIBDIR) -lconv -e stub \ diff --git a/usr/src/cmd/sgs/lddstub/Makefile.targ b/usr/src/cmd/sgs/lddstub/Makefile.targ index 9575c44150..a1640efc48 100644 --- a/usr/src/cmd/sgs/lddstub/Makefile.targ +++ b/usr/src/cmd/sgs/lddstub/Makefile.targ @@ -37,9 +37,6 @@ $(PROG): $(OBJS) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - install: all include ../../../Makefile.targ diff --git a/usr/src/cmd/sgs/lddstub/amd64/Makefile b/usr/src/cmd/sgs/lddstub/amd64/Makefile index 275f137d6c..b4bbdb3263 100644 --- a/usr/src/cmd/sgs/lddstub/amd64/Makefile +++ b/usr/src/cmd/sgs/lddstub/amd64/Makefile @@ -23,8 +23,6 @@ # Copyright 2004 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -37,4 +35,4 @@ ASFLAGS += -D__amd64 $(amd64_AS_XARCH) install: all $(ROOTLIB64)/$(PROG) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ldprof/Makefile.targ b/usr/src/cmd/sgs/ldprof/Makefile.targ index abbea3f2cf..604c8d8bce 100644 --- a/usr/src/cmd/sgs/ldprof/Makefile.targ +++ b/usr/src/cmd/sgs/ldprof/Makefile.targ @@ -33,11 +33,7 @@ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - include ../../../../lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging) diff --git a/usr/src/cmd/sgs/ldprof/amd64/Makefile b/usr/src/cmd/sgs/ldprof/amd64/Makefile index 5dff83cc9b..fc65f60598 100644 --- a/usr/src/cmd/sgs/ldprof/amd64/Makefile +++ b/usr/src/cmd/sgs/ldprof/amd64/Makefile @@ -36,8 +36,8 @@ CFLAGS64 += $(C_PICFLAGS64) -D_ELF64 .KEEP_STATE: all: $(BLTDEFS) .WAIT $(DYNLIB) -install package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) @echo doing make install $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ldprof/i386/Makefile b/usr/src/cmd/sgs/ldprof/i386/Makefile index 2e70fda0be..46354d4a16 100644 --- a/usr/src/cmd/sgs/ldprof/i386/Makefile +++ b/usr/src/cmd/sgs/ldprof/i386/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com .KEEP_STATE: all: $(BLTDEFS) .WAIT $(DYNLIB) -install package: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldprof/sparc/Makefile b/usr/src/cmd/sgs/ldprof/sparc/Makefile index 2e70fda0be..46354d4a16 100644 --- a/usr/src/cmd/sgs/ldprof/sparc/Makefile +++ b/usr/src/cmd/sgs/ldprof/sparc/Makefile @@ -30,6 +30,6 @@ include ../Makefile.com .KEEP_STATE: all: $(BLTDEFS) .WAIT $(DYNLIB) -install package: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/ldprof/sparcv9/Makefile b/usr/src/cmd/sgs/ldprof/sparcv9/Makefile index 5dff83cc9b..fc65f60598 100644 --- a/usr/src/cmd/sgs/ldprof/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ldprof/sparcv9/Makefile @@ -36,8 +36,8 @@ CFLAGS64 += $(C_PICFLAGS64) -D_ELF64 .KEEP_STATE: all: $(BLTDEFS) .WAIT $(DYNLIB) -install package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) @echo doing make install $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libconv/Makefile.targ b/usr/src/cmd/sgs/libconv/Makefile.targ index edb023a4a9..0ed959038c 100644 --- a/usr/src/cmd/sgs/libconv/Makefile.targ +++ b/usr/src/cmd/sgs/libconv/Makefile.targ @@ -92,7 +92,3 @@ clobber: clean clean: -$(RM) $(PICS) $(CLEANFILES) - -delete: - -include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/libconv/amd64/Makefile b/usr/src/cmd/sgs/libconv/amd64/Makefile index 74c6c24d25..88386d1961 100644 --- a/usr/src/cmd/sgs/libconv/amd64/Makefile +++ b/usr/src/cmd/sgs/libconv/amd64/Makefile @@ -23,15 +23,13 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../Makefile.com +include ../Makefile.com .PARALLEL: $(PICS) .KEEP_STATE: install all: $(LIBRARY) .WAIT -include ../Makefile.targ -include ../../Makefile.sub.64 +include ../Makefile.targ +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libconv/sparcv9/Makefile b/usr/src/cmd/sgs/libconv/sparcv9/Makefile index 74c6c24d25..88386d1961 100644 --- a/usr/src/cmd/sgs/libconv/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libconv/sparcv9/Makefile @@ -23,15 +23,13 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# -include ../Makefile.com +include ../Makefile.com .PARALLEL: $(PICS) .KEEP_STATE: install all: $(LIBRARY) .WAIT -include ../Makefile.targ -include ../../Makefile.sub.64 +include ../Makefile.targ +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libcrle/Makefile.targ b/usr/src/cmd/sgs/libcrle/Makefile.targ index c92cabe859..103325d79b 100644 --- a/usr/src/cmd/sgs/libcrle/Makefile.targ +++ b/usr/src/cmd/sgs/libcrle/Makefile.targ @@ -22,8 +22,6 @@ # Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# pics64/%.o: ../common/%.c $(COMPILE.c) -o $@ -D_ELF64 $< @@ -36,12 +34,7 @@ pics/%.o: ../common/%.c $(LIBLINKS): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - - include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/libcrle/amd64/Makefile b/usr/src/cmd/sgs/libcrle/amd64/Makefile index bdabb4e0f7..939c58bfda 100644 --- a/usr/src/cmd/sgs/libcrle/amd64/Makefile +++ b/usr/src/cmd/sgs/libcrle/amd64/Makefile @@ -37,8 +37,7 @@ CPPFLAGS += -D_ELF64 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libcrle/i386/Makefile b/usr/src/cmd/sgs/libcrle/i386/Makefile index 683ffc3a05..6781a091f9 100644 --- a/usr/src/cmd/sgs/libcrle/i386/Makefile +++ b/usr/src/cmd/sgs/libcrle/i386/Makefile @@ -32,7 +32,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libcrle/sparc/Makefile b/usr/src/cmd/sgs/libcrle/sparc/Makefile index 683ffc3a05..6781a091f9 100644 --- a/usr/src/cmd/sgs/libcrle/sparc/Makefile +++ b/usr/src/cmd/sgs/libcrle/sparc/Makefile @@ -32,7 +32,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTDYNLIB) +install: all $(ROOTDYNLIB) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libcrle/sparcv9/Makefile b/usr/src/cmd/sgs/libcrle/sparcv9/Makefile index bdabb4e0f7..939c58bfda 100644 --- a/usr/src/cmd/sgs/libcrle/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libcrle/sparcv9/Makefile @@ -37,8 +37,7 @@ CPPFLAGS += -D_ELF64 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ b/usr/src/cmd/sgs/libelf/Makefile.targ index 3db0b17918..f52b5b6877 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.targ +++ b/usr/src/cmd/sgs/libelf/Makefile.targ @@ -46,9 +46,6 @@ pics/%.o: $(SRCDIR)/common/%.c all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS) -delete: - $(RM) $(DYNLIB) - $(LIBLINKS): $(RM) $(LIBLINKS) $(SYMLINK) $(DYNLIB) $(LIBLINKS) @@ -58,7 +55,6 @@ CLOBBERFILES += $(LIBLINKS) # include common library targets # include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ xlate.c: $(SRCDIR)/common/xlate.m4 $(M4) < $(SRCDIR)/common/xlate.m4 > xlate.c diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ.64 b/usr/src/cmd/sgs/libelf/Makefile.targ.64 index 7cc82d9fa9..268ef3c67d 100644 --- a/usr/src/cmd/sgs/libelf/Makefile.targ.64 +++ b/usr/src/cmd/sgs/libelf/Makefile.targ.64 @@ -45,9 +45,6 @@ pics/%.o: ../common/%.c all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS) -delete: - $(RM) $(DYNLIB) - $(LIBLINKS): $(RM) $(LIBLINKS) $(SYMLINK) $(DYNLIB) $(LIBLINKS) @@ -57,7 +54,6 @@ CLOBBERFILES += $(LIBLINKS) # include common library targets # include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ xlate.c: ../common/xlate.m4 $(M4) < ../common/xlate.m4 > xlate.c @@ -96,6 +92,6 @@ $(BLTMESG): $(SGSMSGALL) xlate.c xlate64.c # # 64-bit overrides # -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 FRC: diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com index 19c4f9caf2..0253d3a9f6 100644 --- a/usr/src/cmd/sgs/libld/Makefile.com +++ b/usr/src/cmd/sgs/libld/Makefile.com @@ -99,14 +99,14 @@ SMOFF += no_if_block # Location of the shared relocation engines maintained under usr/src/uts. # -KRTLD_I386 = $(SRC)/uts/$(VAR_PLAT_i386)/krtld -KRTLD_AMD64 = $(SRC)/uts/$(VAR_PLAT_amd64)/krtld -KRTLD_SPARC = $(SRC)/uts/$(VAR_PLAT_sparc)/krtld +KRTLD_I386 = $(SRC)/uts/intel/ia32/krtld +KRTLD_AMD64 = $(SRC)/uts/intel/amd64/krtld +KRTLD_SPARC = $(SRC)/uts/sparc/krtld CPPFLAGS += -DUSE_LIBLD_MALLOC -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/uts/sparc \ - $(VAR_LIBLD_CPPFLAGS) + -I $(SRC)/uts/common LDLIBS += $(CONVLIBDIR) -lconv $(LDDBGLIBDIR) -llddbg \ $(ELFLIBDIR) -lelf $(DLLIB) -lc @@ -153,7 +153,7 @@ CHKSRCS = $(SRC)/uts/common/krtld/reloc.h \ LIBSRCS = $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) \ $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) \ $(COMOBJS:%.o=$(SRCDIR)/common/%.c) \ - $(AVLOBJS:%.o=$(VAR_AVLDIR)/%.c) \ + $(AVLOBJS:%.o=$(SRC)/common/avl/%.c) \ $(BLTDATA) CLEANFILES += $(BLTFILES) diff --git a/usr/src/cmd/sgs/libld/Makefile.targ b/usr/src/cmd/sgs/libld/Makefile.targ index 69e53f79c9..34660f5c30 100644 --- a/usr/src/cmd/sgs/libld/Makefile.targ +++ b/usr/src/cmd/sgs/libld/Makefile.targ @@ -50,7 +50,7 @@ pics/%.o: $(SGSCOMMON)/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -pics/%.o: $(VAR_AVLDIR)/%.c +pics/%.o: $(SRC)/common/avl/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -91,13 +91,9 @@ pics/%_sparc_64.o: \ $(LIBLINKS): $(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/libld/amd64/Makefile b/usr/src/cmd/sgs/libld/amd64/Makefile index f7dee2a935..2fba0f1b6f 100644 --- a/usr/src/cmd/sgs/libld/amd64/Makefile +++ b/usr/src/cmd/sgs/libld/amd64/Makefile @@ -23,15 +23,13 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: ROOTFS_LIBDIR64 = \ - $(VAR_LIBLD_64_ROOTFS_LIBDIR) + $(ROOT)/lib/$(MACH64) ROOTFS_DYNLIB64 = \ $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) @@ -44,8 +42,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTFS_DYNLIB64) +install: all $(ROOTFS_DYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libld/i386/Makefile b/usr/src/cmd/sgs/libld/i386/Makefile index b1a5996627..b2b10af87e 100644 --- a/usr/src/cmd/sgs/libld/i386/Makefile +++ b/usr/src/cmd/sgs/libld/i386/Makefile @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,7 +30,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTFS_DYNLIB) +install: all $(ROOTFS_DYNLIB) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libld/sparc/Makefile b/usr/src/cmd/sgs/libld/sparc/Makefile index b1a5996627..b2b10af87e 100644 --- a/usr/src/cmd/sgs/libld/sparc/Makefile +++ b/usr/src/cmd/sgs/libld/sparc/Makefile @@ -23,8 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com @@ -32,7 +30,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTFS_DYNLIB) +install: all $(ROOTFS_DYNLIB) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/libld/sparcv9/Makefile b/usr/src/cmd/sgs/libld/sparcv9/Makefile index 1a1257fd74..f05d8c97c0 100644 --- a/usr/src/cmd/sgs/libld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libld/sparcv9/Makefile @@ -23,15 +23,13 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# include ../Makefile.com .KEEP_STATE: ROOTFS_LIBDIR64 = \ - $(VAR_LIBLD_64_ROOTFS_LIBDIR) + $(ROOT)/lib/$(MACH64) ROOTFS_DYNLIB64 = \ $(DYNLIB:%=$(ROOTFS_LIBDIR64)/%) @@ -43,8 +41,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTFS_DYNLIB64) +install: all $(ROOTFS_DYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.targ b/usr/src/cmd/sgs/liblddbg/Makefile.targ index 7eb4895306..04306cd11d 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.targ +++ b/usr/src/cmd/sgs/liblddbg/Makefile.targ @@ -45,13 +45,9 @@ pics/%64.o: $(SRCDIR)/common/%.c $(LIBLINKS): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index 9783a0d400..6dfa944dd3 100644 --- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile +++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -34,8 +34,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/liblddbg/i386/Makefile b/usr/src/cmd/sgs/liblddbg/i386/Makefile index 4345c2ca64..271b0c3a00 100644 --- a/usr/src/cmd/sgs/liblddbg/i386/Makefile +++ b/usr/src/cmd/sgs/liblddbg/i386/Makefile @@ -30,7 +30,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparc/Makefile b/usr/src/cmd/sgs/liblddbg/sparc/Makefile index 4345c2ca64..271b0c3a00 100644 --- a/usr/src/cmd/sgs/liblddbg/sparc/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparc/Makefile @@ -30,7 +30,6 @@ include ../Makefile.com all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTLIBS) $(ROOTCOMPATLINKS) +install: all $(ROOTLIBS) $(ROOTCOMPATLINKS) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile index 8bc19f5ce4..ccf3bfd50b 100644 --- a/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile +++ b/usr/src/cmd/sgs/liblddbg/sparcv9/Makefile @@ -32,8 +32,7 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) +install: all $(ROOTLIBS64) $(ROOTCOMPATLINKS64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libldmake/Makefile.targ b/usr/src/cmd/sgs/libldmake/Makefile.targ index 72ed530854..bc9233d85e 100644 --- a/usr/src/cmd/sgs/libldmake/Makefile.targ +++ b/usr/src/cmd/sgs/libldmake/Makefile.targ @@ -33,8 +33,4 @@ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/libldmake/amd64/Makefile b/usr/src/cmd/sgs/libldmake/amd64/Makefile index c702bfff21..ed461460c5 100644 --- a/usr/src/cmd/sgs/libldmake/amd64/Makefile +++ b/usr/src/cmd/sgs/libldmake/amd64/Makefile @@ -34,4 +34,4 @@ all: $(DYNLIB) install: all $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libldmake/sparcv9/Makefile b/usr/src/cmd/sgs/libldmake/sparcv9/Makefile index 18ab13446e..a765f97ad5 100644 --- a/usr/src/cmd/sgs/libldmake/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libldmake/sparcv9/Makefile @@ -34,4 +34,4 @@ all: $(DYNLIB) install: all $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libldstab/Makefile.targ b/usr/src/cmd/sgs/libldstab/Makefile.targ index 6fc36576c9..ec8095d69f 100644 --- a/usr/src/cmd/sgs/libldstab/Makefile.targ +++ b/usr/src/cmd/sgs/libldstab/Makefile.targ @@ -34,18 +34,12 @@ pics/%64.o: ../common/%.c $(COMPILE.c) -o $@ -D_ELF64 $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). catalog: chkmsg: - -package: diff --git a/usr/src/cmd/sgs/libldstab/amd64/Makefile b/usr/src/cmd/sgs/libldstab/amd64/Makefile index 0d461c46b3..d5cecd1d63 100644 --- a/usr/src/cmd/sgs/libldstab/amd64/Makefile +++ b/usr/src/cmd/sgs/libldstab/amd64/Makefile @@ -36,9 +36,8 @@ CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) all: $(DYNLIB) -install \ -package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile index 93fef3421f..28137bc002 100644 --- a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile @@ -36,9 +36,8 @@ CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) all: $(DYNLIB) -install \ -package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/librtld/Makefile.targ b/usr/src/cmd/sgs/librtld/Makefile.targ index 9b56ae1ab7..d76653370f 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.targ +++ b/usr/src/cmd/sgs/librtld/Makefile.targ @@ -33,15 +33,10 @@ pics/%.o: ../common/%.c $(LIBLINKS): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ - # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/librtld/amd64/Makefile b/usr/src/cmd/sgs/librtld/amd64/Makefile index 481b1c0a22..4892a1de61 100644 --- a/usr/src/cmd/sgs/librtld/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld/amd64/Makefile @@ -38,7 +38,7 @@ CPPFLAGS += -D_ELF64 include $(SRC)/cmd/sgs/librtld/Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) diff --git a/usr/src/cmd/sgs/librtld/sparcv9/Makefile b/usr/src/cmd/sgs/librtld/sparcv9/Makefile index fd02c33926..ba3ef29e57 100644 --- a/usr/src/cmd/sgs/librtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld/sparcv9/Makefile @@ -38,7 +38,7 @@ CPPFLAGS += -D_ELF64 include $(SRC)/cmd/sgs/librtld/Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 CONVLIBDIR = $(CONVLIBDIR64) ELFLIBDIR = $(ELFLIBDIR64) diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.targ b/usr/src/cmd/sgs/librtld_db/Makefile.targ index ca9d16cb03..5cfb3a7d57 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.targ +++ b/usr/src/cmd/sgs/librtld_db/Makefile.targ @@ -37,11 +37,7 @@ pics/%64.o: ../common/%.c $(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/librtld_db/amd64/Makefile b/usr/src/cmd/sgs/librtld_db/amd64/Makefile index e4454c5ef2..7ae502dcdb 100644 --- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile +++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile @@ -47,4 +47,4 @@ pics/plt32_resolution.o: ../i386/plt32_resolution.c $(POST_PROCESS_O) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile index c150914bc7..9d541b991b 100644 --- a/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile +++ b/usr/src/cmd/sgs/librtld_db/sparcv9/Makefile @@ -47,4 +47,4 @@ pics/plt32_resolution.o: ../sparc/plt32_resolution.c $(POST_PROCESS_O) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/link_audit/Makefile b/usr/src/cmd/sgs/link_audit/Makefile index 6001b17733..5108663260 100644 --- a/usr/src/cmd/sgs/link_audit/Makefile +++ b/usr/src/cmd/sgs/link_audit/Makefile @@ -66,7 +66,6 @@ SUBDIRS= $(MACH) all:= TARGET= all install:= TARGET= install -package:= TARGET= package clean:= TARGET= clean clobber:= TARGET= clobber @@ -74,11 +73,9 @@ clobber:= TARGET= clobber .KEEP_STATE: -all clean clobber: \ - $(SUBDIRS) +all clean clobber: $(SUBDIRS) -package install : \ - $(ROOTDEMODIRS) .WAIT $(SUBDIRS) $(ROOTDEMOFILES) +install: $(ROOTDEMODIRS) .WAIT $(SUBDIRS) $(ROOTDEMOFILES) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/link_audit/amd64/Makefile b/usr/src/cmd/sgs/link_audit/amd64/Makefile index 0a44e691e5..640bab6daf 100644 --- a/usr/src/cmd/sgs/link_audit/amd64/Makefile +++ b/usr/src/cmd/sgs/link_audit/amd64/Makefile @@ -42,4 +42,4 @@ all: $(PICDIR) .WAIT $(CCSLIBS) $(CCSSCRIPTS) \ install: all $(ROOTCCSLIB64) .WAIT $(ROOTCCSLIBS64) .WAIT $(ROOTONLDLIBS64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/link_audit/sparcv9/Makefile b/usr/src/cmd/sgs/link_audit/sparcv9/Makefile index 63bed7ff25..0c863a2e77 100644 --- a/usr/src/cmd/sgs/link_audit/sparcv9/Makefile +++ b/usr/src/cmd/sgs/link_audit/sparcv9/Makefile @@ -43,4 +43,4 @@ install: all $(ROOTCCSLIB64) .WAIT $(ROOTCCSLIBS64) \ .WAIT $(ROOTONLDLIBS64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/lorder/Makefile b/usr/src/cmd/sgs/lorder/Makefile index e239506614..f76f752382 100644 --- a/usr/src/cmd/sgs/lorder/Makefile +++ b/usr/src/cmd/sgs/lorder/Makefile @@ -36,7 +36,7 @@ include $(SRC)/cmd/sgs/Makefile.com all: $(PROG) -install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: diff --git a/usr/src/cmd/sgs/m4/i386/Makefile b/usr/src/cmd/sgs/m4/i386/Makefile index 6d12f01c06..6946c9619e 100644 --- a/usr/src/cmd/sgs/m4/i386/Makefile +++ b/usr/src/cmd/sgs/m4/i386/Makefile @@ -29,7 +29,6 @@ PROG= m4 XPG4PROG= m4 include ../../../Makefile.cmd -include ../../../sgs/Makefile.var COBJS= m4.o m4ext.o m4macs.o @@ -84,7 +83,7 @@ $(XPG4OBJS): m4objs.xpg4 m4objs m4objs.xpg4: -@mkdir -p $@ -install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) clean: $(RM) $(ALLOBJS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/m4/sparc/Makefile b/usr/src/cmd/sgs/m4/sparc/Makefile index 3847891929..ddfb7608da 100644 --- a/usr/src/cmd/sgs/m4/sparc/Makefile +++ b/usr/src/cmd/sgs/m4/sparc/Makefile @@ -29,7 +29,6 @@ PROG= m4 XPG4PROG= m4 include ../../../Makefile.cmd -include ../../../sgs/Makefile.var COBJS= m4.o m4ext.o m4macs.o @@ -83,7 +82,7 @@ $(XPG4OBJS): m4objs.xpg4 m4objs m4objs.xpg4: -@mkdir -p $@ -install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) clean: $(RM) $(ALLOBJS) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/mcs/Makefile.com b/usr/src/cmd/sgs/mcs/Makefile.com index d826fa5a1f..934e355dca 100644 --- a/usr/src/cmd/sgs/mcs/Makefile.com +++ b/usr/src/cmd/sgs/mcs/Makefile.com @@ -28,8 +28,10 @@ PROG= mcs STRIPFILE= strip +ROOTLINKS= $(ROOTBIN)/$(STRIPFILE) -ROOTLINKS= $(VAR_SGSBIN)/$(STRIPFILE) +ROOTSTRIPFILEPROG= $(STRIPFILE:%=$(ROOTCCSBIN)/%) +ROOTSTRIPFILEPROG64= $(STRIPFILE:%=$(ROOTCCSBIN64)/%) include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/sgs/Makefile.com diff --git a/usr/src/cmd/sgs/mcs/Makefile.targ b/usr/src/cmd/sgs/mcs/Makefile.targ index 7dead9dcc6..2e711928c5 100644 --- a/usr/src/cmd/sgs/mcs/Makefile.targ +++ b/usr/src/cmd/sgs/mcs/Makefile.targ @@ -26,43 +26,38 @@ # Copyright 2019 OmniOS Community Edition (OmniOSce) Association. # -ROOTSTRIPFILEPROG= $(STRIPFILE:%=$(ROOTCCSBIN)/%) -ROOTSTRIPFILEPROG64= $(STRIPFILE:%=$(ROOTCCSBIN64)/%) - %.o: ../common/%.c - $(COMPILE.c) $< - $(POST_PROCESS_O) + $(COMPILE.c) $< + $(POST_PROCESS_O) %.o: $(SGSCOMMON)/%.c - $(COMPILE.c) $< - $(POST_PROCESS_O) + $(COMPILE.c) $< + $(POST_PROCESS_O) all: $(PROG) $(STRIPFILE) clean: - $(RM) $(CLEANFILES) - -delete: - $(RM) $(PROG) + $(RM) $(CLEANFILES) $(PROG): $(OBJS) - $(LINK.c) -o $@ $(OBJS) $(LDLIBS) - $(POST_PROCESS) + $(LINK.c) -o $@ $(OBJS) $(LDLIBS) + $(POST_PROCESS) $(STRIPFILE): -$(ROOTLINKS): $(VAR_SGSBINPROG) - $(RM) $@ - $(LN) $(VAR_SGSBINPROG) $@ +$(ROOTLINKS): $(ROOTPROG) + $(RM) $@ + $(LN) $(ROOTPROG) $@ -$(STRIPSYMLINK): $(RM) $(ROOTSTRIPFILEPROG) - $(SYMLINK) ../../bin/$(STRIPFILE) $(ROOTSTRIPFILEPROG) +$(ROOTBIN64)/%: % + $(INS.file) -$(STRIPSYMLINK64): $(RM) $(ROOTSTRIPFILEPROG64) - $(SYMLINK) ../../bin/$(MACH)/$(STRIPFILE) $(ROOTSTRIPFILEPROG64) +$(ROOTSTRIPFILEPROG): + $(RM) $@ + $(SYMLINK) ../../bin/$(STRIPFILE) $@ -$(ROOTBIN64)/%: % - $(INS.file) +$(ROOTSTRIPFILEPROG64): + $(RM) $@ + $(SYMLINK) ../../../bin/$(MACH64)/$(STRIPFILE) $@ include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/mcs/amd64/Makefile b/usr/src/cmd/sgs/mcs/amd64/Makefile index 9b126f24b4..5508c4f133 100644 --- a/usr/src/cmd/sgs/mcs/amd64/Makefile +++ b/usr/src/cmd/sgs/mcs/amd64/Makefile @@ -34,13 +34,11 @@ LLDFLAGS= $(LLDFLAGS64) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -ROOTLINKS= $(VAR_SGSBIN64)/$(STRIPFILE) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) +ROOTLINKS= $(ROOTBIN64)/$(STRIPFILE) +ROOTPROG= $(ROOTPROG64) -install \ -package: all $(VAR_SGSBINPROG64) $(ROOTLINKS) $(VAR_SGSCCSLINK64) - $(RM) $(ROOTSTRIPFILEPROG64) - $(SYMLINK) ../../../bin/$(MACH64)/$(STRIPFILE) $(ROOTSTRIPFILEPROG64) +install: all $(ROOTPROG64) $(ROOTSTRIPFILEPROG64) \ + $(ROOTLINKS) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/mcs/i386/Makefile b/usr/src/cmd/sgs/mcs/i386/Makefile index 139cc7b7fa..d0e925f701 100644 --- a/usr/src/cmd/sgs/mcs/i386/Makefile +++ b/usr/src/cmd/sgs/mcs/i386/Makefile @@ -19,7 +19,6 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" # # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -30,7 +29,5 @@ include ../Makefile.com include ../Makefile.targ -install \ -package: all $(VAR_SGSBINPROG) $(ROOTLINKS) $(VAR_SGSCCSLINK) - $(RM) $(ROOTSTRIPFILEPROG) - $(SYMLINK) ../../bin/$(STRIPFILE) $(ROOTSTRIPFILEPROG) +install: all $(ROOTPROG) $(ROOTSTRIPFILEPROG) \ + $(ROOTLINKS) $(ROOTCCSBINLINK) diff --git a/usr/src/cmd/sgs/mcs/sparc/Makefile b/usr/src/cmd/sgs/mcs/sparc/Makefile index 9ace90197f..5972df244e 100644 --- a/usr/src/cmd/sgs/mcs/sparc/Makefile +++ b/usr/src/cmd/sgs/mcs/sparc/Makefile @@ -19,10 +19,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2007 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. +# include ../Makefile.com @@ -30,8 +29,5 @@ include ../Makefile.com include ../Makefile.targ -install \ -package: all $(VAR_SGSBINPROG) $(ROOTLINKS) $(VAR_SGSCCSLINK) - $(RM) $(ROOTSTRIPFILEPROG) - $(SYMLINK) ../../bin/$(STRIPFILE) $(ROOTSTRIPFILEPROG) - +install: all $(ROOTPROG) $(ROOTSTRIPFILEPROG) \ + $(ROOTLINKS) $(ROOTCCSBINLINK) diff --git a/usr/src/cmd/sgs/mcs/sparcv9/Makefile b/usr/src/cmd/sgs/mcs/sparcv9/Makefile index da83cb1b5a..aa088097d6 100644 --- a/usr/src/cmd/sgs/mcs/sparcv9/Makefile +++ b/usr/src/cmd/sgs/mcs/sparcv9/Makefile @@ -34,13 +34,11 @@ LLDFLAGS= $(LLDFLAGS64) CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) -ROOTLINKS= $(VAR_SGSBIN64)/$(STRIPFILE) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) +ROOTLINKS= $(ROOTBIN64)/$(STRIPFILE) +ROOTPROG= $(ROOTPROG64) -install \ -package: all $(VAR_SGSBINPROG64) $(ROOTLINKS) $(VAR_SGSCCSLINK64) - $(RM) $(ROOTSTRIPFILEPROG64) - $(SYMLINK) ../../../bin/$(MACH64)/$(STRIPFILE) $(ROOTSTRIPFILEPROG64) +install: all $(ROOTPROG64) $(ROOTSTRIPFILEPROG64) \ + $(ROOTLINKS) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/messages/Makefile b/usr/src/cmd/sgs/messages/Makefile index 515d509227..4e1be2fe58 100644 --- a/usr/src/cmd/sgs/messages/Makefile +++ b/usr/src/cmd/sgs/messages/Makefile @@ -31,16 +31,14 @@ SUBDIRS= $(MACH) all := TARGET= all clean := TARGET= clean clobber := TARGET= clobber -delete := TARGET= delete install := TARGET= install catalog := TARGET= catalog -package := TARGET= package chkmsg := TARGET= chkmsg .KEEP_STATE: .KEEP_STATE_FILE: .make.state.$(MACH) -all clean clobber delete install catalog package chkmsg: $(SUBDIRS) +all clean clobber install catalog chkmsg: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/messages/Makefile.targ b/usr/src/cmd/sgs/messages/Makefile.targ index a2633771ba..af175c3b00 100644 --- a/usr/src/cmd/sgs/messages/Makefile.targ +++ b/usr/src/cmd/sgs/messages/Makefile.targ @@ -37,8 +37,6 @@ $(MSGDOMAIN)/$(POFILE): \ $(RM) $(MSGDOMAIN)/$(POFILE) cp $(POFILE) $(MSGDOMAIN) -delete: - clean: $(RM) $(CLEANFILES) diff --git a/usr/src/cmd/sgs/moe/Makefile.targ b/usr/src/cmd/sgs/moe/Makefile.targ index 8bb3f79da5..a3e6e6ea57 100644 --- a/usr/src/cmd/sgs/moe/Makefile.targ +++ b/usr/src/cmd/sgs/moe/Makefile.targ @@ -42,14 +42,9 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/moe/amd64/Makefile b/usr/src/cmd/sgs/moe/amd64/Makefile index e82f40a747..7476f7b860 100644 --- a/usr/src/cmd/sgs/moe/amd64/Makefile +++ b/usr/src/cmd/sgs/moe/amd64/Makefile @@ -36,8 +36,7 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/moe/sparcv9/Makefile b/usr/src/cmd/sgs/moe/sparcv9/Makefile index e82f40a747..7476f7b860 100644 --- a/usr/src/cmd/sgs/moe/sparcv9/Makefile +++ b/usr/src/cmd/sgs/moe/sparcv9/Makefile @@ -36,8 +36,7 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/nm/Makefile b/usr/src/cmd/sgs/nm/Makefile index 2421e3cb80..f5803740ce 100644 --- a/usr/src/cmd/sgs/nm/Makefile +++ b/usr/src/cmd/sgs/nm/Makefile @@ -35,7 +35,6 @@ all := TARGET= all install := TARGET= install clean := TARGET= clean clobber := TARGET= clobber -package := TARGET= package # for messaging catalog # @@ -43,7 +42,7 @@ POFILE= nm.po .KEEP_STATE: -all clean clobber install package: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) catalog: $(POFILE) diff --git a/usr/src/cmd/sgs/nm/amd64/Makefile b/usr/src/cmd/sgs/nm/amd64/Makefile index c086b64dc3..0045c7dd63 100644 --- a/usr/src/cmd/sgs/nm/amd64/Makefile +++ b/usr/src/cmd/sgs/nm/amd64/Makefile @@ -60,12 +60,10 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) -package \ -install: all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64) +install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) clean: $(RM) $(OBJS) $(CLEANFILES) -include ../../Makefile.targ include ../../../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/nm/i386/Makefile b/usr/src/cmd/sgs/nm/i386/Makefile index 3d8ecf845d..59f302d0fd 100644 --- a/usr/src/cmd/sgs/nm/i386/Makefile +++ b/usr/src/cmd/sgs/nm/i386/Makefile @@ -74,11 +74,9 @@ $(XPG4OBJS): objs.xpg4 objs.xpg4: -@mkdir -p $@ -package \ -install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(XPG4OBJS) $(CLEANFILES) include ../../../Makefile.targ -include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/nm/sparc/Makefile b/usr/src/cmd/sgs/nm/sparc/Makefile index ceb5646968..66a2a3eca8 100644 --- a/usr/src/cmd/sgs/nm/sparc/Makefile +++ b/usr/src/cmd/sgs/nm/sparc/Makefile @@ -46,15 +46,8 @@ INCLIST= -I../../include -I../../include/sparc \ DEFLIST= -DTARGET=SPARC -DSPARC=1 -D$(ARFORMAT) -DELF CPPFLAGS= $(INCLIST) $(DEFLIST) $(CPPFLAGS.master) -I$(ELFCAP) LDLIBS += $(CONVLIBDIR) -lconv $(ELFLIBDIR) -lelf -objs.xpg4/%.o := CPPFLAGS += -DXPG4 - - -# Building SUNWonld results in a call to the `package' target. Requirements -# needed to run this application on older releases are established: -# i18n support requires libintl.so.1 prior to 2.6 - -package := LDLIBS += /usr/lib/libintl.so.1 +objs.xpg4/%.o := CPPFLAGS += -DXPG4 objs.xpg4/%.o: ../common/%.c $(COMPILE.c) -o $@ $< @@ -79,11 +72,9 @@ $(XPG4OBJS): objs.xpg4 objs.xpg4: -@mkdir -p $@ -package \ -install: all $(VAR_SGSBINPROG) $(ROOTXPG4PROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) clean: $(RM) $(OBJS) $(XPG4OBJS) $(CLEANFILES) include ../../../Makefile.targ -include ../../Makefile.targ diff --git a/usr/src/cmd/sgs/nm/sparcv9/Makefile b/usr/src/cmd/sgs/nm/sparcv9/Makefile index 6fb95ac24f..4879ba0698 100644 --- a/usr/src/cmd/sgs/nm/sparcv9/Makefile +++ b/usr/src/cmd/sgs/nm/sparcv9/Makefile @@ -60,12 +60,10 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) -package \ -install: all $(VAR_SGSBINPROG64) $(VAR_SGSCCSLINK64) +install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) clean: $(RM) $(OBJS) $(CLEANFILES) -include ../../Makefile.targ include ../../../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/prof/Makefile.targ b/usr/src/cmd/sgs/prof/Makefile.targ index 9337bf00b3..51bcd1d40b 100644 --- a/usr/src/cmd/sgs/prof/Makefile.targ +++ b/usr/src/cmd/sgs/prof/Makefile.targ @@ -19,14 +19,9 @@ # CDDL HEADER END # # -#ident "%Z%%M% %I% %E% SMI" -# # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# cmd/sgs/prof/Makefile.targ -# - $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) @@ -36,5 +31,3 @@ clean: $(RM) $(OBJS) $(CLEANFILES) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ - diff --git a/usr/src/cmd/sgs/pvs/Makefile.targ b/usr/src/cmd/sgs/pvs/Makefile.targ index 2069a4615c..2ae435d8d1 100644 --- a/usr/src/cmd/sgs/pvs/Makefile.targ +++ b/usr/src/cmd/sgs/pvs/Makefile.targ @@ -38,18 +38,13 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) $(PROG): $(OBJS) $(MAPFILE) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/pvs/amd64/Makefile b/usr/src/cmd/sgs/pvs/amd64/Makefile index 16e97878bc..5589534272 100644 --- a/usr/src/cmd/sgs/pvs/amd64/Makefile +++ b/usr/src/cmd/sgs/pvs/amd64/Makefile @@ -38,4 +38,4 @@ LDDBGLIBDIR = $(LDDBGLIBDIR64) ROOTPROG = $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/pvs/sparcv9/Makefile b/usr/src/cmd/sgs/pvs/sparcv9/Makefile index 0d2163fefd..15a4a6972d 100644 --- a/usr/src/cmd/sgs/pvs/sparcv9/Makefile +++ b/usr/src/cmd/sgs/pvs/sparcv9/Makefile @@ -37,4 +37,4 @@ LDDBGLIBDIR = $(LDDBGLIBDIR64) ROOTPROG = $(ROOTPROG64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com index 4b1a9a328d..273081c28d 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.com +++ b/usr/src/cmd/sgs/rtld/Makefile.com @@ -50,7 +50,11 @@ include $(SRC)/cmd/sgs/Makefile.com SRCDIR = ../common ELFCAP = $(SRC)/common/elfcap -PLAT = $(VAR_PLAT_$(BASEPLAT)) + +PLAT_i386 = intel/ia32 +PLAT_amd64 = intel/amd64 +PLAT_sparc = sparc +PLAT = $(PLAT_$(BASEPLAT)) # DTrace needs an executable data segment. MAPFILE.NED= @@ -105,8 +109,8 @@ SMATCH=off # These definitions require that libc be built in the same workspace # as the run-time linker and before the run-time linker is built. # This is required for the system's self-consistency in any case. -CPICLIB = $(VAR_RTLD_CPICLIB) -CPICLIB64 = $(VAR_RTLD_CPICLIB64) +CPICLIB = -L $(SRC)/lib/libc/$(MACH) +CPICLIB64 = -L $(SRC)/lib/libc/$(MACH64) CLIB = -lc_pic LDLIBS += $(CONVLIBDIR) -lconv \ @@ -144,8 +148,8 @@ SGSMSGALL= $(SGSMSGCOM) $(SGSMSG32) $(SGSMSG64) \ SGSMSGFLAGS1= $(SGSMSGFLAGS) -m $(BLTMESG) SGSMSGFLAGS2= $(SGSMSGFLAGS) -h $(BLTDEFS) -d $(BLTDATA) -n rtld_msg -SRCS= $(AVLOBJ:%.o=$(VAR_AVLDIR)/%.c) \ - $(DTROBJ:%.o=$(VAR_DTRDIR)/%.c) \ +SRCS= $(AVLOBJ:%.o=$(SRC)/common/avl/%.c) \ + $(DTROBJ:%.o=$(SRC)/common/dtrace/%.c) \ $(SGSCOMMONOBJ:%.o=$(SGSCOMMON)/%.c) \ $(COMOBJS:%.o=../common/%.c) $(MACHOBJS:%.o=%.c) $(BLTDATA) \ $(G_MACHOBJS:%.o=$(SRC)/uts/$(PLAT)/krtld/%.c) \ diff --git a/usr/src/cmd/sgs/rtld/Makefile.targ b/usr/src/cmd/sgs/rtld/Makefile.targ index 3ceacd78a6..bfef661cfd 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/Makefile.targ @@ -50,11 +50,11 @@ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -pics/%.o: $(VAR_AVLDIR)/%.c +pics/%.o: $(SRC)/common/avl/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -pics/%.o: $(VAR_DTRDIR)/%.c +pics/%.o: $(SRC)/common/dtrace/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) @@ -75,9 +75,6 @@ $(RTLD): pics $(PICS) $(CRTS) $(LDLIBS) $(CRTN) $(POST_PROCESS_SO) -delete: - -$(RM) $(RTLD) - $(ROOTFS_LIBDIR)/%: % $(INS.file) @@ -85,7 +82,6 @@ $(ETCLIBDIR)/%: % $(INS.file) include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/rtld/amd64/Makefile b/usr/src/cmd/sgs/rtld/amd64/Makefile index d73dbaaa6b..244cb6ca0f 100644 --- a/usr/src/cmd/sgs/rtld/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/amd64/Makefile @@ -91,4 +91,4 @@ adbmacros: adb .WAIT $(ADBSCRIPTS) adbinstall: adbmacros .WAIT $(ROOTADB64) include $(SRC)/cmd/sgs/rtld/Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ index 70eed23464..16acec6b16 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ @@ -32,7 +32,6 @@ pics/%.o: ../common/%.c $(POST_PROCESS_O) include $(SRC)/lib/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ chkmsg: $(MSGSRCS) sh $(CHKMSG) $(CHKMSGFLAGS) $(MSGSRCS) diff --git a/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile b/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile index 6672d516b6..31ca1d5a42 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile +++ b/usr/src/cmd/sgs/rtld/mdbmod/amd64/Makefile @@ -39,4 +39,4 @@ all: $(BLTDEFS) .WAIT $(DYNLIB) install: all .WAIT $(ROOTMDBLIBS) include ../Makefile.targ -include ../../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile index e5e9248e88..271db4ea47 100644 --- a/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/mdbmod/sparcv9/Makefile @@ -39,4 +39,4 @@ all: $(BLTDEFS) .WAIT $(DYNLIB) install: all .WAIT $(ROOTMDBLIBS) include ../Makefile.targ -include ../../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/rtld/sparcv9/Makefile b/usr/src/cmd/sgs/rtld/sparcv9/Makefile index fb1c3da820..32cdec91fa 100644 --- a/usr/src/cmd/sgs/rtld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/rtld/sparcv9/Makefile @@ -101,4 +101,4 @@ pics/%.o: ../sparc/%.c $(POST_PROCESS_O) include $(SRC)/cmd/sgs/rtld/Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/size/Makefile b/usr/src/cmd/sgs/size/Makefile index b376fcb68c..f6491d3afd 100644 --- a/usr/src/cmd/sgs/size/Makefile +++ b/usr/src/cmd/sgs/size/Makefile @@ -33,11 +33,10 @@ all:= TARGET= all install:= TARGET= install clean:= TARGET= clean clobber:= TARGET= clobber -package:= TARGET= package .KEEP_STATE: -all clean clobber install package: $(SUBDIRS) +all clean clobber install: $(SUBDIRS) $(MACH) $(MACH64): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/size/Makefile.targ b/usr/src/cmd/sgs/size/Makefile.targ index 0e21458b68..f30bdb707d 100644 --- a/usr/src/cmd/sgs/size/Makefile.targ +++ b/usr/src/cmd/sgs/size/Makefile.targ @@ -22,8 +22,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" -# %.o: ../common/%.c $(COMPILE.c) $< @@ -35,14 +33,9 @@ $(PROG): $(OBJS) all: $(PROG) -package \ -install: all $(VAR_SGSBINPROG) $(VAR_SGSCCSLINK) +install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(CLEANFILES) -delete: - $(RM) $(PROG) - include $(SRC)/cmd/Makefile.targ -include $(SRC)/cmd/sgs/Makefile.targ diff --git a/usr/src/cmd/sgs/size/amd64/Makefile b/usr/src/cmd/sgs/size/amd64/Makefile index 7452446d28..980afd1aa5 100644 --- a/usr/src/cmd/sgs/size/amd64/Makefile +++ b/usr/src/cmd/sgs/size/amd64/Makefile @@ -35,12 +35,10 @@ LLDFLAGS = $(LLDFLAGS64) ELFLIBDIR = $(ELFLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) -VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) +ROOTPROG= $(ROOTPROG64) +ROOTCCSBINLINK= $(ROOTCCSBINLINK64) - -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/size/i386/Makefile b/usr/src/cmd/sgs/size/i386/Makefile index dbf6d06985..47229f38be 100644 --- a/usr/src/cmd/sgs/size/i386/Makefile +++ b/usr/src/cmd/sgs/size/i386/Makefile @@ -30,7 +30,6 @@ DEFLIST= -DI386 -DELF .KEEP_STATE: -package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/size/sparc/Makefile b/usr/src/cmd/sgs/size/sparc/Makefile index 9972514380..35bbbb1554 100644 --- a/usr/src/cmd/sgs/size/sparc/Makefile +++ b/usr/src/cmd/sgs/size/sparc/Makefile @@ -30,7 +30,6 @@ DEFLIST= -DSPARC -DELF .KEEP_STATE: -package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/size/sparcv9/Makefile b/usr/src/cmd/sgs/size/sparcv9/Makefile index acd8b8a55f..14095c03c1 100644 --- a/usr/src/cmd/sgs/size/sparcv9/Makefile +++ b/usr/src/cmd/sgs/size/sparcv9/Makefile @@ -35,11 +35,10 @@ LLDFLAGS = $(LLDFLAGS64) ELFLIBDIR = $(ELFLIBDIR64) CONVLIBDIR = $(CONVLIBDIR64) -VAR_SGSBINPROG= $(VAR_SGSBINPROG64) -VAR_SGSCCSLINK= $(VAR_SGSCCSLINK64) +ROOTPROG= $(ROOTPROG64) +ROOTCCSBINLINK= $(ROOTCCSBINLINK64) -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ -include ../../Makefile.sub.64 +include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/tools/Makefile b/usr/src/cmd/sgs/tools/Makefile index 0d65dff41f..bac715b33e 100644 --- a/usr/src/cmd/sgs/tools/Makefile +++ b/usr/src/cmd/sgs/tools/Makefile @@ -23,7 +23,7 @@ # Use is subject to license terms. # # Makefile to support tools used for linker development. GEXECS are those -# tools that the installed for distribution in the SUNWonld package. +# tools that are installed in /opt/SUNWonld in the proto area. # # o `c' programs are built from the $(MACH)/Makefile # @@ -48,9 +48,7 @@ clobber:= TARGET= clobber .KEEP_STATE: -all install clean clobberall: $(SUBDIRS) - -delete: +all install clean clobber: $(SUBDIRS) $(SUBDIRS): FRC @cd $@; pwd; $(MAKE) $(TARGET) diff --git a/usr/src/cmd/sgs/tools/Makefile.com b/usr/src/cmd/sgs/tools/Makefile.com index 9d1c34949c..7059d2d452 100644 --- a/usr/src/cmd/sgs/tools/Makefile.com +++ b/usr/src/cmd/sgs/tools/Makefile.com @@ -47,7 +47,7 @@ NATIVE_LDFLAGS = $(LDASSERTS) $(BDIRECT) NATIVE= $(OBJECTS:%.o=%) SRCS= $(OBJECTS:%.o=../common/%.c) -CPPFLAGS += $(VAR_TOOLS_CPPFLAGS) +CPPFLAGS += -I$(SRC)/uts/common ROOTDIR= $(ROOT)/opt/SUNWonld ROOTPROGS= $(PROGS:%=$(ROOTDIR)/bin/%) diff --git a/usr/src/tools/sgs/ld/Makefile b/usr/src/tools/sgs/ld/Makefile index 18b4659d59..05ce16f7a6 100644 --- a/usr/src/tools/sgs/ld/Makefile +++ b/usr/src/tools/sgs/ld/Makefile @@ -31,9 +31,8 @@ NATIVE_LIBS += libc.so libumem.so CPPFLAGS = $(NATIVE_CPPFLAGS) CFLAGS = $(NATIVE_CFLAGS) MAPFILES = $(SRCDIR)/common/mapfile-intf +RPATH = '-R$$ORIGIN/../../lib/$(MACH)' CW_LINKER = -VAR_LD_LLDFLAGS= '-R$$ORIGIN/../../lib/$(MACH)' -VAR_LD_LLDFLAGS64 = '-R$$ORIGIN/../../../lib/$(MACH64)' install: $(ROOTONBLDMACHPROG) diff --git a/usr/src/tools/sgs/libld/Makefile b/usr/src/tools/sgs/libld/Makefile index 6897a0b18d..956a85c482 100644 --- a/usr/src/tools/sgs/libld/Makefile +++ b/usr/src/tools/sgs/libld/Makefile @@ -42,7 +42,7 @@ CW_LINKER = CPPFLAGS = $(NATIVE_CPPFLAGS) -DUSE_LIBLD_MALLOC -I$(SRC)/lib/libc/inc \ -I$(SRC)/uts/common/krtld -I$(SRC)/uts/sparc \ - $(VAR_LIBLD_CPPFLAGS) + -I$(SRC)/uts/common LDLIBS += -L../libconv -lconv -L$(ROOTONBLDLIBMACH) -llddbg -lelf -lc NATIVE_LIBS += libc.so |