about summary refs log tree commit diff
path: root/login
diff options
context:
space:
mode:
Diffstat (limited to 'login')
-rw-r--r--login/Makefile9
-rw-r--r--login/programs/connection.c (renamed from login/utmpd/connection.c)0
-rw-r--r--login/programs/database.c (renamed from login/utmpd/database.c)0
-rw-r--r--login/programs/error.c (renamed from login/utmpd/error.c)0
-rw-r--r--login/programs/request.c (renamed from login/utmpd/request.c)0
-rw-r--r--login/programs/utmpd-private.h (renamed from login/utmpd/utmpd-private.h)0
-rw-r--r--login/programs/utmpd.c (renamed from login/utmpd/utmpd.c)0
-rw-r--r--login/programs/utmpd.h (renamed from login/utmpd/utmpd.h)0
-rw-r--r--login/programs/utmpdump.c (renamed from login/utmpdump.c)0
-rw-r--r--login/programs/xtmp.c (renamed from login/utmpd/xtmp.c)0
-rw-r--r--login/programs/xtmp.h (renamed from login/utmpd/xtmp.h)0
11 files changed, 6 insertions, 3 deletions
diff --git a/login/Makefile b/login/Makefile
index 832b1caf63..05913ee337 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -29,11 +29,14 @@ routines := getutent getutent_r getutid getutline getutid_r getutline_r \
 
 others = utmpd
 install-sbin = utmpd
-utmpd-routines := connection database error request xtmp
+utmpd-routines := utmpd connection database error request xtmp
+extra-objs := $(utmpd-routines:=.o)
 
-distribute := utmp-private.h utmpd/xtmp.h utmpd/utmpd.h utmpd/utmpd-private.h
+distribute := utmp-private.h programs/xtmp.h programs/utmpd.h \
+	      programs/utmpd-private.h $(utmpd-routines:%=programs/%.c)
 
-vpath %.c utmpd
+subdir-dirs = programs
+vpath %.c programs
 
 # Build the -lutil library with these extra functions.
 extra-libs      := libutil
diff --git a/login/utmpd/connection.c b/login/programs/connection.c
index 4e1663189d..4e1663189d 100644
--- a/login/utmpd/connection.c
+++ b/login/programs/connection.c
diff --git a/login/utmpd/database.c b/login/programs/database.c
index e31e0d9dae..e31e0d9dae 100644
--- a/login/utmpd/database.c
+++ b/login/programs/database.c
diff --git a/login/utmpd/error.c b/login/programs/error.c
index e6511442e3..e6511442e3 100644
--- a/login/utmpd/error.c
+++ b/login/programs/error.c
diff --git a/login/utmpd/request.c b/login/programs/request.c
index 0f68b8ae79..0f68b8ae79 100644
--- a/login/utmpd/request.c
+++ b/login/programs/request.c
diff --git a/login/utmpd/utmpd-private.h b/login/programs/utmpd-private.h
index 4a9cdb921e..4a9cdb921e 100644
--- a/login/utmpd/utmpd-private.h
+++ b/login/programs/utmpd-private.h
diff --git a/login/utmpd/utmpd.c b/login/programs/utmpd.c
index e11218151c..e11218151c 100644
--- a/login/utmpd/utmpd.c
+++ b/login/programs/utmpd.c
diff --git a/login/utmpd/utmpd.h b/login/programs/utmpd.h
index 8fbc33c923..8fbc33c923 100644
--- a/login/utmpd/utmpd.h
+++ b/login/programs/utmpd.h
diff --git a/login/utmpdump.c b/login/programs/utmpdump.c
index e1422b5028..e1422b5028 100644
--- a/login/utmpdump.c
+++ b/login/programs/utmpdump.c
diff --git a/login/utmpd/xtmp.c b/login/programs/xtmp.c
index d2d5feee3b..d2d5feee3b 100644
--- a/login/utmpd/xtmp.c
+++ b/login/programs/xtmp.c
diff --git a/login/utmpd/xtmp.h b/login/programs/xtmp.h
index 8fa982ee4f..8fa982ee4f 100644
--- a/login/utmpd/xtmp.h
+++ b/login/programs/xtmp.h