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>
This commit is contained in:
parent
787fc0be21
commit
2984313a46
|
@ -1,6 +1,6 @@
|
||||||
include $(top_srcdir)/config/include-Makefile.am
|
include $(top_srcdir)/config/include-Makefile.am
|
||||||
|
|
||||||
SUBDIRS = lib \
|
SUBDIRS = \
|
||||||
include \
|
include \
|
||||||
disk-utils \
|
disk-utils \
|
||||||
fdisk \
|
fdisk \
|
||||||
|
|
|
@ -415,7 +415,6 @@ fdisk/Makefile
|
||||||
getopt/Makefile
|
getopt/Makefile
|
||||||
hwclock/Makefile
|
hwclock/Makefile
|
||||||
include/Makefile
|
include/Makefile
|
||||||
lib/Makefile
|
|
||||||
login-utils/Makefile
|
login-utils/Makefile
|
||||||
misc-utils/Makefile
|
misc-utils/Makefile
|
||||||
mount/Makefile
|
mount/Makefile
|
||||||
|
|
|
@ -26,9 +26,9 @@ endif
|
||||||
if BUILD_CRAMFS
|
if BUILD_CRAMFS
|
||||||
sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
|
sbin_PROGRAMS += fsck.cramfs mkfs.cramfs
|
||||||
fsck_cramfs_SOURCES = fsck.cramfs.c cramfs.h
|
fsck_cramfs_SOURCES = fsck.cramfs.c cramfs.h
|
||||||
mkfs_cramfs_SOURCES = mkfs.cramfs.c cramfs.h
|
mkfs_cramfs_SOURCES = mkfs.cramfs.c cramfs.h ../lib/md5.c
|
||||||
fsck_cramfs_LDADD = -lz
|
fsck_cramfs_LDADD = -lz
|
||||||
mkfs_cramfs_LDADD = -lz $(top_srcdir)/lib/libmd5.a
|
mkfs_cramfs_LDADD = -lz
|
||||||
endif
|
endif
|
||||||
|
|
||||||
mkswap_LDADD =
|
mkswap_LDADD =
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
include $(top_srcdir)/config/include-Makefile.am
|
|
||||||
|
|
||||||
noinst_LIBRARIES = libmd5.a libenv.a libsetproctitle.a
|
|
||||||
|
|
||||||
libmd5_a_SOURCES = md5.c
|
|
||||||
libenv_a_SOURCES = env.c
|
|
||||||
libsetproctitle_a_SOURCES = setproctitle.c
|
|
|
@ -40,14 +40,17 @@ usrbinexec_PROGRAMS += chfn chsh newgrp
|
||||||
usrsbinexec_PROGRAMS += vipw
|
usrsbinexec_PROGRAMS += vipw
|
||||||
man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
|
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
|
chfn_SOURCES = chfn.c $(chfn_chsh_common)
|
||||||
chsh_SOURCES = chsh.c islocal.c setpwnam.c islocal.h my_crypt.h setpwnam.h
|
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
|
newgrp_SOURCES = newgrp.c my_crypt.h
|
||||||
vipw_SOURCES = vipw.c setpwnam.h
|
vipw_SOURCES = vipw.c setpwnam.h
|
||||||
|
|
||||||
chfn_LDADD = ../lib/libenv.a
|
chfn_LDADD =
|
||||||
chsh_LDADD = ../lib/libenv.a
|
chsh_LDADD =
|
||||||
login_LDADD = ../lib/libsetproctitle.a
|
login_LDADD =
|
||||||
newgrp_LDADD =
|
newgrp_LDADD =
|
||||||
vipw_LDADD =
|
vipw_LDADD =
|
||||||
|
|
||||||
|
@ -70,9 +73,8 @@ if HAVE_PAM
|
||||||
chfn_LDADD += -lpam -lpam_misc
|
chfn_LDADD += -lpam -lpam_misc
|
||||||
chsh_LDADD += -lpam -lpam_misc
|
chsh_LDADD += -lpam -lpam_misc
|
||||||
login_LDADD += -lpam -lpam_misc
|
login_LDADD += -lpam -lpam_misc
|
||||||
login_SOURCES = login.c login.h my_crypt.h
|
|
||||||
else
|
else
|
||||||
login_SOURCES = login.c checktty.c login.h my_crypt.h
|
login_SOURCES += checktty.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_AUDIT
|
if HAVE_AUDIT
|
||||||
|
|
|
@ -11,7 +11,7 @@ bin_PROGRAMS =
|
||||||
usrbinexec_PROGRAMS = cal ddate logger look mcookie \
|
usrbinexec_PROGRAMS = cal ddate logger look mcookie \
|
||||||
namei script whereis
|
namei script whereis
|
||||||
|
|
||||||
mcookie_LDADD = $(top_srcdir)/lib/libmd5.a
|
mcookie_SOURCES = mcookie.c ../lib/md5.c
|
||||||
|
|
||||||
usrbinexec_SCRIPTS = chkdupexe scriptreplay
|
usrbinexec_SCRIPTS = chkdupexe scriptreplay
|
||||||
|
|
||||||
|
|
|
@ -13,16 +13,16 @@ MNTHDRS = fstab.h linux_fs.h mount_mntent.h mount_constants.h my_dev_t.h \
|
||||||
sundries.h
|
sundries.h
|
||||||
mount_common = fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \
|
mount_common = fstab.c sundries.c xmalloc.c realpath.c mount_mntent.c \
|
||||||
getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \
|
getusername.c get_label_uuid.c mount_by_label.c mount_blkid.c \
|
||||||
lomount.c $(MNTHDRS)
|
lomount.c $(MNTHDRS) ../lib/env.c
|
||||||
|
|
||||||
mount_SOURCES = mount.c $(mount_common) \
|
mount_SOURCES = mount.c $(mount_common) ../lib/setproctitle.c \
|
||||||
mount_guess_fstype.c
|
mount_guess_fstype.c
|
||||||
mount_LDADD = $(top_srcdir)/lib/libenv.a $(top_srcdir)/lib/libsetproctitle.a
|
mount_LDADD =
|
||||||
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
|
mount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
|
||||||
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||||
|
|
||||||
umount_SOURCES = umount.c $(mount_common)
|
umount_SOURCES = umount.c $(mount_common)
|
||||||
umount_LDADD = $(top_srcdir)/lib/libenv.a
|
umount_LDADD =
|
||||||
umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
|
umount_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
|
||||||
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue