diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2022-04-09 17:48:25 -0500 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2022-05-24 16:06:17 -0500 |
| commit | d8e10381a0083d7717710b0db7e64707bc0f3ff8 (patch) | |
| tree | 345e25cf92019dda747d0040515ec5a9f952112a /usr/src/cmd | |
| parent | e9db39cef1f968a982994f50c05903cc988a3dd3 (diff) | |
| download | illumos-joyent-d8e10381a0083d7717710b0db7e64707bc0f3ff8.tar.gz | |
14683 remove SUNWonld vestiges from sgs
Reviewed by: Gordon Ross <Gordon.W.Ross@gmail.com>
Reviewed by: Yuri Pankov <ypankov@tintri.com>
Approved by: Dan McDonald <danmcd@mnx.io>
Diffstat (limited to 'usr/src/cmd')
90 files changed, 63 insertions, 227 deletions
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/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.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/ar/Makefile.targ b/usr/src/cmd/sgs/ar/Makefile.targ index 3743da31f3..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) diff --git a/usr/src/cmd/sgs/ar/amd64/Makefile b/usr/src/cmd/sgs/ar/amd64/Makefile index 2e2df1d2b2..b4140367cd 100644 --- a/usr/src/cmd/sgs/ar/amd64/Makefile +++ b/usr/src/cmd/sgs/ar/amd64/Makefile @@ -37,8 +37,7 @@ ROOTPROG = $(ROOTPROG64) all: $(PROG) -install \ -package: all $(ROOTPROG64) $(ROOTCCSBINLINK64) +install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ 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 836c8c010c..ad7849c995 100644 --- a/usr/src/cmd/sgs/ar/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ar/sparcv9/Makefile @@ -36,7 +36,6 @@ ROOTPROG = $(ROOTPROG64) all: $(PROG) -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/crle/Makefile.targ b/usr/src/cmd/sgs/crle/Makefile.targ index 261767917b..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,9 +43,6 @@ $(PROG): $(OBJS) $(MAPFILE) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - include $(SRC)/cmd/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/dump/Makefile.targ b/usr/src/cmd/sgs/dump/Makefile.targ index dc1126a44a..d39bfa75cf 100644 --- a/usr/src/cmd/sgs/dump/Makefile.targ +++ b/usr/src/cmd/sgs/dump/Makefile.targ @@ -33,7 +33,6 @@ $(PROG): $(OBJS) all: $(PROG) -package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: diff --git a/usr/src/cmd/sgs/dump/amd64/Makefile b/usr/src/cmd/sgs/dump/amd64/Makefile index 82dca7e08b..10cef7c92d 100644 --- a/usr/src/cmd/sgs/dump/amd64/Makefile +++ b/usr/src/cmd/sgs/dump/amd64/Makefile @@ -40,5 +40,4 @@ ROOTCCSBINLINK= $(ROOTCCSBINLINK64) include ../Makefile.targ include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/dump/sparcv9/Makefile b/usr/src/cmd/sgs/dump/sparcv9/Makefile index 124caa43da..5632b0ecf0 100644 --- a/usr/src/cmd/sgs/dump/sparcv9/Makefile +++ b/usr/src/cmd/sgs/dump/sparcv9/Makefile @@ -40,5 +40,4 @@ ROOTCCSBINLINK = $(ROOTCCSBINLINK64) include ../Makefile.targ include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfdump/Makefile.targ b/usr/src/cmd/sgs/elfdump/Makefile.targ index 2f64ad9768..c9e191d3f1 100644 --- a/usr/src/cmd/sgs/elfdump/Makefile.targ +++ b/usr/src/cmd/sgs/elfdump/Makefile.targ @@ -74,10 +74,6 @@ clean: check_struct_layout gen_layout_obj.o \ struct_layout_$(ARCH).tmp -delete: - $(RM) $(PROG) - -package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/sgs/elfdump/amd64/Makefile b/usr/src/cmd/sgs/elfdump/amd64/Makefile index 8b26717b51..f410303040 100644 --- a/usr/src/cmd/sgs/elfdump/amd64/Makefile +++ b/usr/src/cmd/sgs/elfdump/amd64/Makefile @@ -42,5 +42,4 @@ ROOTCCSBINLINK = $(ROOTCCSBINLINK64) include ../Makefile.targ include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile index 99d01314e3..f24ce47957 100644 --- a/usr/src/cmd/sgs/elfdump/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfdump/sparcv9/Makefile @@ -42,6 +42,5 @@ ROOTCCSBINLINK = $(ROOTCCSBINLINK64) include ../Makefile.targ include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/elfedit/Makefile.targ b/usr/src/cmd/sgs/elfedit/Makefile.targ index cc29b10c33..51fe995726 100644 --- a/usr/src/cmd/sgs/elfedit/Makefile.targ +++ b/usr/src/cmd/sgs/elfedit/Makefile.targ @@ -53,11 +53,7 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/sgs/elfedit/amd64/Makefile b/usr/src/cmd/sgs/elfedit/amd64/Makefile index a1495d9645..6a2b43ecb9 100644 --- a/usr/src/cmd/sgs/elfedit/amd64/Makefile +++ b/usr/src/cmd/sgs/elfedit/amd64/Makefile @@ -40,5 +40,4 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ 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 b3aa57ce27..4eec2ac865 100644 --- a/usr/src/cmd/sgs/elfedit/modules/amd64/Makefile +++ b/usr/src/cmd/sgs/elfedit/modules/amd64/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 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 79373e43b7..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 $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/elfedit/sparcv9/Makefile b/usr/src/cmd/sgs/elfedit/sparcv9/Makefile index a1495d9645..6a2b43ecb9 100644 --- a/usr/src/cmd/sgs/elfedit/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfedit/sparcv9/Makefile @@ -40,5 +40,4 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ 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 6841e2aec0..908c0d71ef 100644 --- a/usr/src/cmd/sgs/elfwrap/Makefile.targ +++ b/usr/src/cmd/sgs/elfwrap/Makefile.targ @@ -67,11 +67,7 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/sgs/elfwrap/amd64/Makefile b/usr/src/cmd/sgs/elfwrap/amd64/Makefile index 28b6384226..2beea08a8a 100644 --- a/usr/src/cmd/sgs/elfwrap/amd64/Makefile +++ b/usr/src/cmd/sgs/elfwrap/amd64/Makefile @@ -38,5 +38,4 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ 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 28b6384226..2beea08a8a 100644 --- a/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile +++ b/usr/src/cmd/sgs/elfwrap/sparcv9/Makefile @@ -38,5 +38,4 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ include $(SRC)/Makefile.master.64 -install \ -package: $(ROOTPROG64) +install: $(ROOTPROG64) diff --git a/usr/src/cmd/sgs/lari/Makefile b/usr/src/cmd/sgs/lari/Makefile index 759535f45d..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 $(ROOTPROG) $(ROOTCCSBINLINK) +install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(PROG) diff --git a/usr/src/cmd/sgs/ld/Makefile.targ b/usr/src/cmd/sgs/ld/Makefile.targ index bbe84c419b..195e56b770 100644 --- a/usr/src/cmd/sgs/ld/Makefile.targ +++ b/usr/src/cmd/sgs/ld/Makefile.targ @@ -40,9 +40,6 @@ $(PROG): $(OBJS) $(MAPFILES) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - include $(SRC)/cmd/Makefile.targ # Derived source and header files (messaging). diff --git a/usr/src/cmd/sgs/ld/amd64/Makefile b/usr/src/cmd/sgs/ld/amd64/Makefile index 031fee4daa..1315c657ff 100644 --- a/usr/src/cmd/sgs/ld/amd64/Makefile +++ b/usr/src/cmd/sgs/ld/amd64/Makefile @@ -34,7 +34,7 @@ CONVLIBDIR = $(CONVLIBDIR64) RPATH = $(RPATH64) -package install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) +install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) .KEEP_STATE: diff --git a/usr/src/cmd/sgs/ld/i386/Makefile b/usr/src/cmd/sgs/ld/i386/Makefile index fe0ebe8b71..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 $(ROOTPROG) $(ROOTCCSBINLINK) +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 5f4fd77518..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 $(ROOTBIN) $(ROOTCCSBINLINK) +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 888d74a76a..8cc2aab477 100644 --- a/usr/src/cmd/sgs/ld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ld/sparcv9/Makefile @@ -35,7 +35,7 @@ RPATH = $(RPATH64) .KEEP_STATE: -package install: all $(ROOTBIN64) $(ROOTCCSBINLINK64) +install: all $(ROOTBIN64) $(ROOTCCSBINLINK64) include ../Makefile.targ include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/ldd/Makefile.targ b/usr/src/cmd/sgs/ldd/Makefile.targ index cc979fc6cf..97de6f7268 100644 --- a/usr/src/cmd/sgs/ldd/Makefile.targ +++ b/usr/src/cmd/sgs/ldd/Makefile.targ @@ -35,11 +35,7 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) $(PROG): $(OBJS) $(MAPFILE) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) 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/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/ldprof/Makefile.targ b/usr/src/cmd/sgs/ldprof/Makefile.targ index e119e69568..604c8d8bce 100644 --- a/usr/src/cmd/sgs/ldprof/Makefile.targ +++ b/usr/src/cmd/sgs/ldprof/Makefile.targ @@ -33,9 +33,6 @@ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - include ../../../../lib/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 b442a7a31a..fc65f60598 100644 --- a/usr/src/cmd/sgs/ldprof/amd64/Makefile +++ b/usr/src/cmd/sgs/ldprof/amd64/Makefile @@ -36,7 +36,7 @@ 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 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 b442a7a31a..fc65f60598 100644 --- a/usr/src/cmd/sgs/ldprof/sparcv9/Makefile +++ b/usr/src/cmd/sgs/ldprof/sparcv9/Makefile @@ -36,7 +36,7 @@ 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 diff --git a/usr/src/cmd/sgs/libconv/Makefile.targ b/usr/src/cmd/sgs/libconv/Makefile.targ index a03f082adb..0ed959038c 100644 --- a/usr/src/cmd/sgs/libconv/Makefile.targ +++ b/usr/src/cmd/sgs/libconv/Makefile.targ @@ -92,5 +92,3 @@ clobber: clean clean: -$(RM) $(PICS) $(CLEANFILES) - -delete: diff --git a/usr/src/cmd/sgs/libcrle/Makefile.targ b/usr/src/cmd/sgs/libcrle/Makefile.targ index 130a29b048..103325d79b 100644 --- a/usr/src/cmd/sgs/libcrle/Makefile.targ +++ b/usr/src/cmd/sgs/libcrle/Makefile.targ @@ -34,10 +34,6 @@ pics/%.o: ../common/%.c $(LIBLINKS): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - - include $(SRC)/lib/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 5b6d0a0534..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 $(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 5b6d0a0534..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 $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ b/usr/src/cmd/sgs/libelf/Makefile.targ index a06d4a0ab9..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) diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ.64 b/usr/src/cmd/sgs/libelf/Makefile.targ.64 index 506f990682..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) diff --git a/usr/src/cmd/sgs/libld/Makefile.targ b/usr/src/cmd/sgs/libld/Makefile.targ index 11ff575a19..34660f5c30 100644 --- a/usr/src/cmd/sgs/libld/Makefile.targ +++ b/usr/src/cmd/sgs/libld/Makefile.targ @@ -91,9 +91,6 @@ pics/%_sparc_64.o: \ $(LIBLINKS): $(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ diff --git a/usr/src/cmd/sgs/libld/amd64/Makefile b/usr/src/cmd/sgs/libld/amd64/Makefile index 25fac2d321..2fba0f1b6f 100644 --- a/usr/src/cmd/sgs/libld/amd64/Makefile +++ b/usr/src/cmd/sgs/libld/amd64/Makefile @@ -42,8 +42,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTFS_DYNLIB64) +install: all $(ROOTFS_DYNLIB64) include ../Makefile.targ 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 aaebcedcca..f05d8c97c0 100644 --- a/usr/src/cmd/sgs/libld/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libld/sparcv9/Makefile @@ -41,8 +41,7 @@ $(ROOTFS_DYNLIB64) := FILEMODE= 755 all: $(DYNLIB) $(LIBLINKS) -install \ -package: all $(ROOTFS_DYNLIB64) +install: all $(ROOTFS_DYNLIB64) include ../Makefile.targ include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.targ b/usr/src/cmd/sgs/liblddbg/Makefile.targ index 2b6adb8e33..04306cd11d 100644 --- a/usr/src/cmd/sgs/liblddbg/Makefile.targ +++ b/usr/src/cmd/sgs/liblddbg/Makefile.targ @@ -45,9 +45,6 @@ pics/%64.o: $(SRCDIR)/common/%.c $(LIBLINKS): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ diff --git a/usr/src/cmd/sgs/liblddbg/amd64/Makefile b/usr/src/cmd/sgs/liblddbg/amd64/Makefile index 83def9c036..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 $(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 46c551be1a..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 $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libldmake/Makefile.targ b/usr/src/cmd/sgs/libldmake/Makefile.targ index 119ba76720..bc9233d85e 100644 --- a/usr/src/cmd/sgs/libldmake/Makefile.targ +++ b/usr/src/cmd/sgs/libldmake/Makefile.targ @@ -33,7 +33,4 @@ pics/%.o: ../common/%.c $(COMPILE.c) -o $@ $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - include $(SRC)/lib/Makefile.targ diff --git a/usr/src/cmd/sgs/libldstab/Makefile.targ b/usr/src/cmd/sgs/libldstab/Makefile.targ index 8a28a5a3dc..ec8095d69f 100644 --- a/usr/src/cmd/sgs/libldstab/Makefile.targ +++ b/usr/src/cmd/sgs/libldstab/Makefile.targ @@ -34,9 +34,6 @@ pics/%64.o: ../common/%.c $(COMPILE.c) -o $@ -D_ELF64 $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - $(PICS): pics include $(SRC)/lib/Makefile.targ @@ -46,5 +43,3 @@ include $(SRC)/lib/Makefile.targ catalog: chkmsg: - -package: diff --git a/usr/src/cmd/sgs/libldstab/amd64/Makefile b/usr/src/cmd/sgs/libldstab/amd64/Makefile index e95fd017b2..d5cecd1d63 100644 --- a/usr/src/cmd/sgs/libldstab/amd64/Makefile +++ b/usr/src/cmd/sgs/libldstab/amd64/Makefile @@ -36,8 +36,7 @@ CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) all: $(DYNLIB) -install \ -package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) include ../Makefile.targ include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile index a2d4b977fb..28137bc002 100644 --- a/usr/src/cmd/sgs/libldstab/sparcv9/Makefile +++ b/usr/src/cmd/sgs/libldstab/sparcv9/Makefile @@ -36,8 +36,7 @@ CONVLIBDIR= $(CONVLIBDIR64) ELFLIBDIR= $(ELFLIBDIR64) all: $(DYNLIB) -install \ -package: all $(ROOTDYNLIB64) +install: all $(ROOTDYNLIB64) include ../Makefile.targ include $(SRC)/Makefile.master.64 diff --git a/usr/src/cmd/sgs/librtld/Makefile.targ b/usr/src/cmd/sgs/librtld/Makefile.targ index d645aeb27b..d76653370f 100644 --- a/usr/src/cmd/sgs/librtld/Makefile.targ +++ b/usr/src/cmd/sgs/librtld/Makefile.targ @@ -33,9 +33,6 @@ pics/%.o: ../common/%.c $(LIBLINKS): -$(RM) $@; $(SYMLINK) $(DYNLIB) $@ -delete: - $(RM) $(DYNLIB) - $(PICS): pics diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.targ b/usr/src/cmd/sgs/librtld_db/Makefile.targ index f320a5c72d..5cfb3a7d57 100644 --- a/usr/src/cmd/sgs/librtld_db/Makefile.targ +++ b/usr/src/cmd/sgs/librtld_db/Makefile.targ @@ -37,9 +37,6 @@ pics/%64.o: ../common/%.c $(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $< $(POST_PROCESS_O) -delete: - -$(RM) $(DYNLIB) - include $(SRC)/lib/Makefile.targ # Derived source and header files (messaging). 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/mcs/Makefile.targ b/usr/src/cmd/sgs/mcs/Makefile.targ index 6c262c34a6..2e711928c5 100644 --- a/usr/src/cmd/sgs/mcs/Makefile.targ +++ b/usr/src/cmd/sgs/mcs/Makefile.targ @@ -39,9 +39,6 @@ all: $(PROG) $(STRIPFILE) clean: $(RM) $(CLEANFILES) -delete: - $(RM) $(PROG) - $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) $(POST_PROCESS) diff --git a/usr/src/cmd/sgs/mcs/amd64/Makefile b/usr/src/cmd/sgs/mcs/amd64/Makefile index d174bc9a83..5508c4f133 100644 --- a/usr/src/cmd/sgs/mcs/amd64/Makefile +++ b/usr/src/cmd/sgs/mcs/amd64/Makefile @@ -37,8 +37,7 @@ ELFLIBDIR= $(ELFLIBDIR64) ROOTLINKS= $(ROOTBIN64)/$(STRIPFILE) ROOTPROG= $(ROOTPROG64) -install \ -package: all $(ROOTPROG64) $(ROOTSTRIPFILEPROG64) \ +install: all $(ROOTPROG64) $(ROOTSTRIPFILEPROG64) \ $(ROOTLINKS) $(ROOTCCSBINLINK64) include ../Makefile.targ diff --git a/usr/src/cmd/sgs/mcs/i386/Makefile b/usr/src/cmd/sgs/mcs/i386/Makefile index 831dd99cd5..d0e925f701 100644 --- a/usr/src/cmd/sgs/mcs/i386/Makefile +++ b/usr/src/cmd/sgs/mcs/i386/Makefile @@ -29,6 +29,5 @@ include ../Makefile.com include ../Makefile.targ -install \ -package: all $(ROOTPROG) $(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 c82355093b..5972df244e 100644 --- a/usr/src/cmd/sgs/mcs/sparc/Makefile +++ b/usr/src/cmd/sgs/mcs/sparc/Makefile @@ -29,6 +29,5 @@ include ../Makefile.com include ../Makefile.targ -install \ -package: all $(ROOTPROG) $(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 7dca77d8f7..aa088097d6 100644 --- a/usr/src/cmd/sgs/mcs/sparcv9/Makefile +++ b/usr/src/cmd/sgs/mcs/sparcv9/Makefile @@ -37,8 +37,7 @@ ELFLIBDIR= $(ELFLIBDIR64) ROOTLINKS= $(ROOTBIN64)/$(STRIPFILE) ROOTPROG= $(ROOTPROG64) -install \ -package: all $(ROOTPROG64) $(ROOTSTRIPFILEPROG64) \ +install: all $(ROOTPROG64) $(ROOTSTRIPFILEPROG64) \ $(ROOTLINKS) $(ROOTCCSBINLINK64) include ../Makefile.targ 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 9cdf227c3b..a3e6e6ea57 100644 --- a/usr/src/cmd/sgs/moe/Makefile.targ +++ b/usr/src/cmd/sgs/moe/Makefile.targ @@ -42,11 +42,7 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/sgs/moe/amd64/Makefile b/usr/src/cmd/sgs/moe/amd64/Makefile index 367985727f..7476f7b860 100644 --- a/usr/src/cmd/sgs/moe/amd64/Makefile +++ b/usr/src/cmd/sgs/moe/amd64/Makefile @@ -38,6 +38,5 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ 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 367985727f..7476f7b860 100644 --- a/usr/src/cmd/sgs/moe/sparcv9/Makefile +++ b/usr/src/cmd/sgs/moe/sparcv9/Makefile @@ -38,6 +38,5 @@ ROOTPROG= $(ROOTPROG64) include ../Makefile.targ 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 3fecd419db..0045c7dd63 100644 --- a/usr/src/cmd/sgs/nm/amd64/Makefile +++ b/usr/src/cmd/sgs/nm/amd64/Makefile @@ -60,7 +60,6 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) clean: diff --git a/usr/src/cmd/sgs/nm/i386/Makefile b/usr/src/cmd/sgs/nm/i386/Makefile index 1c499e279a..59f302d0fd 100644 --- a/usr/src/cmd/sgs/nm/i386/Makefile +++ b/usr/src/cmd/sgs/nm/i386/Makefile @@ -74,7 +74,6 @@ $(XPG4OBJS): objs.xpg4 objs.xpg4: -@mkdir -p $@ -package \ install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) clean: diff --git a/usr/src/cmd/sgs/nm/sparc/Makefile b/usr/src/cmd/sgs/nm/sparc/Makefile index d2689d8dee..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,7 +72,6 @@ $(XPG4OBJS): objs.xpg4 objs.xpg4: -@mkdir -p $@ -package \ install: all $(ROOTPROG) $(ROOTXPG4PROG) $(ROOTCCSBINLINK) clean: diff --git a/usr/src/cmd/sgs/nm/sparcv9/Makefile b/usr/src/cmd/sgs/nm/sparcv9/Makefile index 65e74afca5..4879ba0698 100644 --- a/usr/src/cmd/sgs/nm/sparcv9/Makefile +++ b/usr/src/cmd/sgs/nm/sparcv9/Makefile @@ -60,7 +60,6 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) clean: diff --git a/usr/src/cmd/sgs/pvs/Makefile.targ b/usr/src/cmd/sgs/pvs/Makefile.targ index cc4a5a1505..2ae435d8d1 100644 --- a/usr/src/cmd/sgs/pvs/Makefile.targ +++ b/usr/src/cmd/sgs/pvs/Makefile.targ @@ -38,11 +38,7 @@ all: $(PROG) clean: $(RM) $(OBJS) $(CLEANFILES) -delete: - $(RM) $(PROG) - -install \ -package: all $(ROOTPROG) +install: all $(ROOTPROG) $(PROG): $(OBJS) $(MAPFILE) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) diff --git a/usr/src/cmd/sgs/rtld/Makefile.targ b/usr/src/cmd/sgs/rtld/Makefile.targ index 4afe280ede..bfef661cfd 100644 --- a/usr/src/cmd/sgs/rtld/Makefile.targ +++ b/usr/src/cmd/sgs/rtld/Makefile.targ @@ -75,9 +75,6 @@ $(RTLD): pics $(PICS) $(CRTS) $(LDLIBS) $(CRTN) $(POST_PROCESS_SO) -delete: - -$(RM) $(RTLD) - $(ROOTFS_LIBDIR)/%: % $(INS.file) 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 d823082f4c..f30bdb707d 100644 --- a/usr/src/cmd/sgs/size/Makefile.targ +++ b/usr/src/cmd/sgs/size/Makefile.targ @@ -33,13 +33,9 @@ $(PROG): $(OBJS) all: $(PROG) -package \ install: all $(ROOTPROG) $(ROOTCCSBINLINK) clean: $(RM) $(CLEANFILES) -delete: - $(RM) $(PROG) - include $(SRC)/cmd/Makefile.targ diff --git a/usr/src/cmd/sgs/size/amd64/Makefile b/usr/src/cmd/sgs/size/amd64/Makefile index 06ce1733c0..980afd1aa5 100644 --- a/usr/src/cmd/sgs/size/amd64/Makefile +++ b/usr/src/cmd/sgs/size/amd64/Makefile @@ -38,8 +38,6 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) ROOTCCSBINLINK= $(ROOTCCSBINLINK64) - -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ 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 a8eb88560f..14095c03c1 100644 --- a/usr/src/cmd/sgs/size/sparcv9/Makefile +++ b/usr/src/cmd/sgs/size/sparcv9/Makefile @@ -38,7 +38,6 @@ CONVLIBDIR = $(CONVLIBDIR64) ROOTPROG= $(ROOTPROG64) ROOTCCSBINLINK= $(ROOTCCSBINLINK64) -package \ install: all $(ROOTPROG64) $(ROOTCCSBINLINK64) include ../Makefile.targ 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) |