Add appropriate dependencies on parse.o, pids.o, frobauth.o, & frobauth-mod.o.

(INSTALL-ids-ops):
  Renamed from INSTALL-hurdids-ops.
(SRCS):
  hurdids.c renamed to ids.c.
(targets):
  hurdids renamed to ids.
(addauth-LDLIBS, setauth-LDLIBS, su-LDLIBS):
  New variables.

1 files changed, 20 insertions, 11 deletions

diff --git a/utils/Makefile b/utils/Makefile
index ac29ff42..cd32a637 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -19,23 +19,27 @@ dir := utils
 makemode := utilities
 
 targets = shd ps settrans showtrans sync su mount fsysopts \
-	storeinfo login w uptime hurdids loginpr sush vmstat portinfo \
-	devprobe vminfo addauth
+	storeinfo login w uptime ids loginpr sush vmstat portinfo \
+	devprobe vminfo addauth rmauth unsu setauth
 special-targets = mount loginpr sush uptime
-SRCS = shd.c ps.c su.c settrans.c sync.c showtrans.c addauth.c \
+SRCS = shd.c ps.c su.c settrans.c sync.c showtrans.c addauth.c rmauth.c \
 	mount.sh fsysopts.c storeinfo.c login.c loginpr.sh sush.sh w.c \
-	uptime.sh psout.c hurdids.c vmstat.c portinfo.c devprobe.c vminfo.c \
-	parse.c
-LCLHDRS = psout.h parse.h
+	uptime.sh psout.c ids.c vmstat.c portinfo.c devprobe.c vminfo.c \
+	parse.c frobauth.c frobauth-mod.c
+LCLHDRS = psout.h parse.h pids.h frobauth.h
 
 OBJS = $(filter-out loginpr.sh mount.sh sush.sh uptime.sh,$(SRCS:.c=.o))
 HURDLIBS = ps ihash store fshelp ports threads shouldbeinlibc
 login-LDLIBS = -lutil $(LIBCRYPT)
 addauth-LDLIBS = $(LIBCRYPT)
+setauth-LDLIBS = $(LIBCRYPT)
+su-LDLIBS = $(LIBCRYPT)
 
 INSTALL-login-ops = -o root -m 4755
 INSTALL-addauth-ops = -o root -m 4755
-INSTALL-hurdids-ops = -o root -m 4755
+INSTALL-setauth-ops = -o root -m 4755
+INSTALL-su-ops = -o root -m 4755
+INSTALL-ids-ops = -o root -m 4755
 INSTALL-ps-ops = -o root -m 4755
 INSTALL-w-ops = -o root -m 4755
 INSTALL-vmstat-ops = -o root -m 4755
@@ -43,13 +47,18 @@ INSTALL-vminfo-ops = -o root -m 4755
 
 include ../Makeconf
 
-ps addauth: parse.o
-ps w addauth: psout.o ../libps/libps.a ../libihash/libihash.a
+ps addauth rmauth setauth su unsu: parse.o pids.o
+login addauth setauth su: nonsugid.o
+addauth rmauth setauth su unsu: frobauth.o
+rmauth setauth su unsu: frobauth-mod.o
+ps w: psout.o ../libps/libps.a ../libihash/libihash.a
+
 storeinfo: ../libstore/libstore.a
+
 # We must include libthreads because of a bug in the way shared libraries
 # work: all libraries that *any* routine in libfshelp uses must be defined.
 settrans: ../libfshelp/libfshelp.a ../libports/libports.a ../libthreads/libthreads.a
-ps w hurdids settrans sync showtrans fsysopts storeinfo login vmstat portinfo \
-  devprobe vminfo addauth: ../libshouldbeinlibc/libshouldbeinlibc.a
+ps w ids settrans sync showtrans fsysopts storeinfo login vmstat portinfo \
+  devprobe vminfo addauth rmauth setauth su unsu: ../libshouldbeinlibc/libshouldbeinlibc.a
 
 $(filter-out $(special-targets), $(targets)): %: %.o