diff options
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | disk-utils/Makemodule.am | 73 | ||||
-rw-r--r-- | disk-utils/cfdisk.8 (renamed from fdisks/cfdisk.8) | 0 | ||||
-rw-r--r-- | disk-utils/cfdisk.c (renamed from fdisks/cfdisk.c) | 0 | ||||
-rw-r--r-- | disk-utils/fdisk-menu.c (renamed from fdisks/fdisk-menu.c) | 0 | ||||
-rw-r--r-- | disk-utils/fdisk.8 (renamed from fdisks/fdisk.8) | 0 | ||||
-rw-r--r-- | disk-utils/fdisk.c (renamed from fdisks/fdisk.c) | 0 | ||||
-rw-r--r-- | disk-utils/fdisk.h (renamed from fdisks/fdisk.h) | 0 | ||||
-rw-r--r-- | disk-utils/sfdisk.8 (renamed from fdisks/sfdisk.8) | 0 | ||||
-rw-r--r-- | disk-utils/sfdisk.c (renamed from fdisks/sfdisk.c) | 0 | ||||
-rw-r--r-- | fdisks/Makemodule.am | 77 |
11 files changed, 73 insertions, 78 deletions
diff --git a/Makefile.am b/Makefile.am index 5eb76ac95..151d483bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -86,7 +86,6 @@ include login-utils/Makemodule.am include sys-utils/Makemodule.am include misc-utils/Makemodule.am include disk-utils/Makemodule.am -include fdisks/Makemodule.am include bash-completion/Makemodule.am diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index 580139234..dd9143931 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -112,6 +112,79 @@ blockdev_SOURCES = disk-utils/blockdev.c blockdev_LDADD = $(LDADD) libcommon.la endif + +if BUILD_FDISK +sbin_PROGRAMS += fdisk +dist_man_MANS += disk-utils/fdisk.8 +fdisk_SOURCES = \ + disk-utils/fdisk.c \ + disk-utils/fdisk.h \ + disk-utils/fdisk-menu.c + +fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la +fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_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 +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) +endif +endif # BUILD_FDISK + + +if !ARCH_SPARC +sbin_PROGRAMS += sfdisk +dist_man_MANS += disk-utils/sfdisk.8 +sfdisk_SOURCES = disk-utils/sfdisk.c +sfdisk_LDADD = $(LDADD) libcommon.la + +if HAVE_STATIC_SFDISK +sbin_PROGRAMS += sfdisk.static +sfdisk_static_SOURCES = $(sfdisk_SOURCES) +sfdisk_static_LDFLAGS = -all-static +sfdisk_static_LDADD = $(sfdisk_LDADD) +endif +endif # ARCH_SPARC + + +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 +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 HAVE_SLANG +cfdisk_LDADD += -lslang +else +cfdisk_CFLAGS += $(NCURSES_CFLAGS) +cfdisk_LDADD += $(NCURSES_LIBS) +endif +endif # BUILD_CFDISK + + if BUILD_PARTX usrsbin_exec_PROGRAMS += partx addpart delpart resizepart dist_man_MANS += \ diff --git a/fdisks/cfdisk.8 b/disk-utils/cfdisk.8 index 2fae5925f..2fae5925f 100644 --- a/fdisks/cfdisk.8 +++ b/disk-utils/cfdisk.8 diff --git a/fdisks/cfdisk.c b/disk-utils/cfdisk.c index 0fd64bf61..0fd64bf61 100644 --- a/fdisks/cfdisk.c +++ b/disk-utils/cfdisk.c diff --git a/fdisks/fdisk-menu.c b/disk-utils/fdisk-menu.c index d7b852deb..d7b852deb 100644 --- a/fdisks/fdisk-menu.c +++ b/disk-utils/fdisk-menu.c diff --git a/fdisks/fdisk.8 b/disk-utils/fdisk.8 index 0a3c1e706..0a3c1e706 100644 --- a/fdisks/fdisk.8 +++ b/disk-utils/fdisk.8 diff --git a/fdisks/fdisk.c b/disk-utils/fdisk.c index e003baf64..e003baf64 100644 --- a/fdisks/fdisk.c +++ b/disk-utils/fdisk.c diff --git a/fdisks/fdisk.h b/disk-utils/fdisk.h index 8d8144a7c..8d8144a7c 100644 --- a/fdisks/fdisk.h +++ b/disk-utils/fdisk.h diff --git a/fdisks/sfdisk.8 b/disk-utils/sfdisk.8 index 62d0ed095..62d0ed095 100644 --- a/fdisks/sfdisk.8 +++ b/disk-utils/sfdisk.8 diff --git a/fdisks/sfdisk.c b/disk-utils/sfdisk.c index bd32aa8a5..bd32aa8a5 100644 --- a/fdisks/sfdisk.c +++ b/disk-utils/sfdisk.c diff --git a/fdisks/Makemodule.am b/fdisks/Makemodule.am deleted file mode 100644 index a59195b66..000000000 --- a/fdisks/Makemodule.am +++ /dev/null @@ -1,77 +0,0 @@ - -if !ARCH_M68K - -if BUILD_FDISK -sbin_PROGRAMS += fdisk -dist_man_MANS += fdisks/fdisk.8 -fdisk_SOURCES = \ - fdisks/fdisk.c \ - fdisks/fdisk.h \ - fdisks/fdisk-menu.c - -fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la -fdisk_CFLAGS = $(AM_CFLAGS) -I$(ul_libfdisk_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 -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) -endif - -endif # BUILD_FDISK - - -if !ARCH_SPARC - -sbin_PROGRAMS += sfdisk -dist_man_MANS += fdisks/sfdisk.8 -sfdisk_SOURCES = fdisks/sfdisk.c -sfdisk_LDADD = $(LDADD) libcommon.la - -if HAVE_STATIC_SFDISK -sbin_PROGRAMS += sfdisk.static -sfdisk_static_SOURCES = $(sfdisk_SOURCES) -sfdisk_static_LDFLAGS = -all-static -sfdisk_static_LDADD = $(sfdisk_LDADD) -endif - - -if BUILD_CFDISK -sbin_PROGRAMS += cfdisk -dist_man_MANS += fdisks/cfdisk.8 -cfdisk_SOURCES = fdisks/cfdisk.c -cfdisk_LDADD = $(LDADD) libcommon.la libfdisk.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 HAVE_SLANG -cfdisk_LDADD += -lslang -else -cfdisk_CFLAGS += $(NCURSES_CFLAGS) -cfdisk_LDADD += $(NCURSES_LIBS) -endif -endif # BUILD_CFDISK - -endif # !ARCH_SPARC -endif # !ARCH_M68K |