summaryrefslogtreecommitdiffstats
path: root/login-utils
diff options
context:
space:
mode:
authorStepan Kasal2007-05-15 20:46:08 +0200
committerKarel Zak2007-05-16 11:43:29 +0200
commit2984313a46226c7ecd8c5db92236bfaea107a0c7 (patch)
treedd8ba6510f381a79d3b42eae9ce8a714d5009f75 /login-utils
parentbuild-sys: mount/Makefile.am tiny cleanup (diff)
downloadkernel-qcow2-util-linux-2984313a46226c7ecd8c5db92236bfaea107a0c7.tar.gz
kernel-qcow2-util-linux-2984313a46226c7ecd8c5db92236bfaea107a0c7.tar.xz
kernel-qcow2-util-linux-2984313a46226c7ecd8c5db92236bfaea107a0c7.zip
build-sys: do not build convenience libraries in lib/
Build lib/*.c individually for each project which uses it, so that the right set of flags is applied each time. Signed-off-by: Stepan Kasal <skasal@redhat.com>
Diffstat (limited to 'login-utils')
-rw-r--r--login-utils/Makefile.am16
1 files changed, 9 insertions, 7 deletions
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index f66982175..efdba27c0 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -40,14 +40,17 @@ usrbinexec_PROGRAMS += chfn chsh newgrp
usrsbinexec_PROGRAMS += vipw
man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
-chfn_SOURCES = chfn.c islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h
-chsh_SOURCES = chsh.c islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h
+chfn_SOURCES = chfn.c $(chfn_chsh_common)
+chsh_SOURCES = chsh.c $(chfn_chsh_common)
+chfn_chsh_common = islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h \
+ ../lib/env.c
+login_SOURCES = login.c login.h my_crypt.h ../lib/setproctitle.c
newgrp_SOURCES = newgrp.c my_crypt.h
vipw_SOURCES = vipw.c setpwnam.h
-chfn_LDADD = ../lib/libenv.a
-chsh_LDADD = ../lib/libenv.a
-login_LDADD = ../lib/libsetproctitle.a
+chfn_LDADD =
+chsh_LDADD =
+login_LDADD =
newgrp_LDADD =
vipw_LDADD =
@@ -70,9 +73,8 @@ if HAVE_PAM
chfn_LDADD += -lpam -lpam_misc
chsh_LDADD += -lpam -lpam_misc
login_LDADD += -lpam -lpam_misc
-login_SOURCES = login.c login.h my_crypt.h
else
-login_SOURCES = login.c checktty.c login.h my_crypt.h
+login_SOURCES += checktty.c
endif
if HAVE_AUDIT