su: use lib/pty-session.c code for --pty

[thirdparty/util-linux.git] / disk-utils / Makemodule.am

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 338cedc0ceca8bf40e552c77cd653ef0f01e0bb3..bea0ed6a6fc11d8ab11b3eba84ef055d5e66c4d9 100644 (file)
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -13,6 +13,11 @@ mkfs_minix_SOURCES = \
        disk-utils/minix_programs.h \
        disk-utils/mkfs.minix.c
 mkfs_minix_LDADD = $(LDADD) libcommon.la
+
+check_PROGRAMS += test_mkfs_minix
+test_mkfs_minix_SOURCES = $(mkfs_minix_SOURCES)
+test_mkfs_minix_LDADD = $(mkfs_minix_LDADD)
+test_mkfs_minix_CFLAGS = $(AM_CFLAGS) -DTEST_SCRIPT
 endif
 
 
@@ -138,22 +143,12 @@ fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la \
              libsmartcols.la libtcolors.la $(READLINE_LIBS)
 fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) -I$(ul_libsmartcols_incdir)
 
-if BUILD_LIBBLKID
-fdisk_CFLAGS += -I$(ul_libblkid_incdir)
-fdisk_LDADD += libblkid.la
-endif
-
-if BUILD_LIBUUID
-fdisk_CFLAGS += -I$(ul_libuuid_incdir)
-fdisk_LDADD += libuuid.la $(READLINE_LIBS_STATIC)
-endif
-
 if HAVE_STATIC_FDISK
 sbin_PROGRAMS += fdisk.static
 fdisk_static_SOURCES = $(fdisk_SOURCES)
 fdisk_static_LDFLAGS = -all-static
 fdisk_static_CFLAGS = $(fdisk_CFLAGS)
-fdisk_static_LDADD = $(fdisk_LDADD)
+fdisk_static_LDADD = $(fdisk_LDADD) $(READLINE_LIBS_STATIC)
 endif
 endif # BUILD_FDISK
 
@@ -170,16 +165,6 @@ sfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la \
               libsmartcols.la libtcolors.la $(READLINE_LIBS)
 sfdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir) -I$(ul_libsmartcols_incdir)
 
-if BUILD_LIBUUID
-sfdisk_CFLAGS += -I$(ul_libuuid_incdir)
-sfdisk_LDADD += libuuid.la
-endif
-
-if BUILD_LIBBLKID
-sfdisk_CFLAGS += -I$(ul_libblkid_incdir)
-sfdisk_LDADD += libblkid.la
-endif
-
 if HAVE_STATIC_SFDISK
 sbin_PROGRAMS += sfdisk.static
 sfdisk_static_SOURCES = $(sfdisk_SOURCES)
@@ -194,22 +179,20 @@ if BUILD_CFDISK
 sbin_PROGRAMS += cfdisk
 dist_man_MANS += disk-utils/cfdisk.8
 cfdisk_SOURCES = disk-utils/cfdisk.c
-cfdisk_LDADD = $(LDADD) libcommon.la libfdisk.la libtcolors.la
-cfdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_incdir)
-
-if BUILD_LIBUUID
-cfdisk_CFLAGS += -I$(ul_libuuid_incdir)
-cfdisk_LDADD += libuuid.la
-endif
-
-if BUILD_LIBBLKID
-cfdisk_CFLAGS += -I$(ul_libblkid_incdir)
-cfdisk_LDADD += libblkid.la
-endif
-
-if BUILD_LIBSMARTCOLS
-cfdisk_CFLAGS += -I$(ul_libsmartcols_incdir)
-cfdisk_LDADD += libsmartcols.la
+cfdisk_LDADD = \
+       $(LDADD) \
+       libsmartcols.la \
+       libcommon.la \
+       libfdisk.la \
+       libtcolors.la
+cfdisk_CFLAGS = \
+       $(AM_CFLAGS) \
+       -I$(ul_libfdisk_incdir) \
+       -I$(ul_libsmartcols_incdir)
+
+if BUILD_LIBMOUNT
+cfdisk_CFLAGS += -I$(ul_libmount_incdir)
+cfdisk_LDADD += libmount.la
 endif
 
 if HAVE_SLANG
@@ -229,25 +212,17 @@ dist_man_MANS += \
        disk-utils/resizepart.8 \
        disk-utils/partx.8
 
-addpart_SOURCES = \
-       disk-utils/addpart.c \
-       disk-utils/partx.h
+addpart_SOURCES = disk-utils/addpart.c
 addpart_LDADD = $(LDADD) libcommon.la
 
-delpart_SOURCES = \
-       disk-utils/delpart.c \
-       disk-utils/partx.h
+delpart_SOURCES = disk-utils/delpart.c
 delpart_LDADD = $(LDADD) libcommon.la
 
-resizepart_SOURCES = \
-       disk-utils/resizepart.c \
-       disk-utils/partx.h
+resizepart_SOURCES = disk-utils/resizepart.c
 resizepart_LDADD = $(LDADD) libcommon.la
 
-partx_SOURCES = \
-       disk-utils/partx.c \
-       disk-utils/partx.h
-partx_CFLAGS = -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir)
+partx_SOURCES = disk-utils/partx.c
+partx_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -I$(ul_libsmartcols_incdir)
 partx_LDADD = $(LDADD) libblkid.la libcommon.la libsmartcols.la
 
 endif # BUILD_PARTX