changeset 19422:bef83800dfc7

12247 vtinfo and vtdaemon are missing CTF data Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk> Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
author Jason King <jason.king@joyent.com>
date Thu, 07 Nov 2019 23:35:24 -0600
parents 5663044c7c9f
children c5d675ef85e3
files usr/src/cmd/vt/Makefile
diffstat 1 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/vt/Makefile	Mon Jan 27 09:21:41 2020 +0300
+++ b/usr/src/cmd/vt/Makefile	Thu Nov 07 23:35:24 2019 -0600
@@ -23,43 +23,42 @@
 # Use is subject to license terms.
 #
 # Copyright 2015 RackTop Systems.
+# Copyright 2020 Joyent, Inc.
 #
 
 PROG= vtdaemon vtinfo vtxlock
 
 VTDAEMON_SRC= vtdaemon.c
-VTINFO_SRC= vtinfo.c
+VTDAEMON_OBJ= $(VTDAEMON_SRC:%.c=%.o)
+vtdaemon := OBJS = $(VTDAEMON_OBJ)
 
-include ../Makefile.cmd
+VTINFO_SRC= vtinfo.c
+VTINFO_OBJ= $(VTINFO_SRC:%.c=%.o)
+vtinfo := OBJS = $(VTINFO_OBJ)
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/cmd/Makefile.ctf
 
 CFLAGS += $(CCVERBOSE)
 CERRWARN += $(CNOWARN_UNINIT)
 
 vtdaemon := LDLIBS += -lpam -lbsm
-lint_vtdaemon := LDLIBS += -lpam -lbsm
 
 .KEEP_STATE:
 
-all: $(PROG) 
+all: $(PROG)
 
-vtdaemon: $(VTDAEMON_SRC)
-	$(LINK.c) -o $@ $(VTDAEMON_SRC) $(LDLIBS)
+vtdaemon: $(VTDAEMON_OBJ)
+	$(LINK.c) -o $@ $(VTDAEMON_OBJ) $(LDLIBS)
 	$(POST_PROCESS)
 
-vtinfo: $(VTINFO_SRC)
-	$(LINK.c) -o $@ $(VTINFO_SRC) $(LDLIBS)
+vtinfo: $(VTINFO_OBJ)
+	$(LINK.c) -o $@ $(VTINFO_OBJ) $(LDLIBS)
 	$(POST_PROCESS)
 
 install: all $(ROOTLIBPROG)
 
 clean:
-
-lint: lint_vtdaemon lint_vtinfo
-
-lint_vtdaemon:
-	$(LINT.c) $(VTDAEMON_SRC) $(LDLIBS)
-
-lint_vtinfo:
-	$(LINT.c) $(VTINFO_SRC) $(LDLIBS)
+	-$(RM) $(VTDAEMON_OBJ) $(VTINFO_OBJ)
 
 include ../Makefile.targ