diff options
| author | Gordon Ross <gwr@nexenta.com> | 2013-08-23 18:31:03 -0400 |
|---|---|---|
| committer | Gordon Ross <gwr@nexenta.com> | 2013-08-30 14:41:32 -0400 |
| commit | b6805bf78d2bbbeeaea8909a05623587b42d58b3 (patch) | |
| tree | 1ed4f5376932228adba6378d95bbea467bdea834 /usr/src/cmd/ssh | |
| parent | a9478106a12424322498e53cf7cd75bd8a4d6004 (diff) | |
| download | illumos-joyent-b6805bf78d2bbbeeaea8909a05623587b42d58b3.tar.gz | |
4072 make clobber leaves trash
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Marcel Telka <marcel.telka@nexenta.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/cmd/ssh')
| -rw-r--r-- | usr/src/cmd/ssh/Makefile | 10 | ||||
| -rw-r--r-- | usr/src/cmd/ssh/sshd/Makefile | 17 |
2 files changed, 17 insertions, 10 deletions
diff --git a/usr/src/cmd/ssh/Makefile b/usr/src/cmd/ssh/Makefile index 8a537946b7..a36a9fb762 100644 --- a/usr/src/cmd/ssh/Makefile +++ b/usr/src/cmd/ssh/Makefile @@ -49,6 +49,8 @@ SUBDIRS= \ MSGFILE=ssh.po POFILE=_messages.po +CLOBBERFILES += $(MSGFILE) THIRDPARTYLICENSE + .KEEP_STATE: all := TARGET= all @@ -62,10 +64,10 @@ package := TARGET= package _msg := TARGET= _msg $(POFILE) := TARGET= $(POFILE) -all clean clobber install lint $(POFILE): $(SUBDIRS) - -clobber: FRC - $(RM) THIRDPARTYLICENSE +all clean install lint $(POFILE): $(SUBDIRS) +clobber: $(SUBDIRS) clobber_local +clobber_local: + $(RM) $(CLOBBERFILES) all install: THIRDPARTYLICENSE diff --git a/usr/src/cmd/ssh/sshd/Makefile b/usr/src/cmd/ssh/sshd/Makefile index bc5b60f584..a52e9b1cc8 100644 --- a/usr/src/cmd/ssh/sshd/Makefile +++ b/usr/src/cmd/ssh/sshd/Makefile @@ -60,10 +60,11 @@ OBJS = sshd.o \ serverloop.o \ session.o \ sshlogin.o \ - sshpty.o \ - ../sftp-server/sftp-server.o + sshpty.o -SRCS = $(OBJS:.o=.c) +EXTOBJS = sftp-server.o + +SRCS = $(OBJS:.o=.c) ../sftp-server/sftp-server.c include ../../Makefile.cmd include ../Makefile.ssh-common @@ -88,11 +89,15 @@ POFILE_DIR= .. all: $(PROG) -$(PROG): $(OBJS) $(MAPFILES) ../libssh/$(MACH)/libssh.a \ +$(PROG): $(OBJS) $(EXTOBJS) $(MAPFILES) ../libssh/$(MACH)/libssh.a \ ../libopenbsd-compat/$(MACH)/libopenbsd-compat.a - $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(DYNFLAGS) + $(LINK.c) $(OBJS) $(EXTOBJS) -o $@ $(LDLIBS) $(DYNFLAGS) $(POST_PROCESS) +%.o : ../sftp-server/%.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) + install: all $(DIRS) $(ROOTLIBSSHPROG) $(ROOTLIBSSH) @@ -103,7 +108,7 @@ $(DIRS): $(INS.dir) clean: - $(RM) -f $(OBJS) $(PROG) + $(RM) $(OBJS) $(EXTOBJS) lint: lint_SRCS |