diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | disk-utils/Makemodule.am | 37 | ||||
| -rw-r--r-- | disk-utils/addpart.8 (renamed from partx/addpart.8) | 0 | ||||
| -rw-r--r-- | disk-utils/addpart.c (renamed from partx/addpart.c) | 0 | ||||
| -rw-r--r-- | disk-utils/delpart.8 (renamed from partx/delpart.8) | 0 | ||||
| -rw-r--r-- | disk-utils/delpart.c (renamed from partx/delpart.c) | 0 | ||||
| -rw-r--r-- | disk-utils/partx.8 (renamed from partx/partx.8) | 6 | ||||
| -rw-r--r-- | disk-utils/partx.c (renamed from partx/partx.c) | 1 | ||||
| -rw-r--r-- | disk-utils/partx.h (renamed from partx/partx.h) | 0 | ||||
| -rw-r--r-- | partx/.gitignore | 3 | ||||
| -rw-r--r-- | partx/Makefile.am | 24 |
12 files changed, 40 insertions, 36 deletions
diff --git a/Makefile.am b/Makefile.am index 8c58e4e01..98f7a3866 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,10 +34,6 @@ SUBDIRS = \ RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \ -name CVS -o -name .pc -o -name .hg -o -name .git \) -prune -o -if BUILD_PARTX -SUBDIRS += partx -endif - ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST += \ diff --git a/configure.ac b/configure.ac index 09e76952f..2f3e196b5 100644 --- a/configure.ac +++ b/configure.ac @@ -1302,7 +1302,6 @@ libmount/src/libmount.h libuuid/uuid.pc man/ru/Makefile misc-utils/uuidd.service -partx/Makefile po/Makefile.in tests/Makefile tests/commands.sh diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am index 7219f8c73..48506980c 100644 --- a/disk-utils/Makemodule.am +++ b/disk-utils/Makemodule.am @@ -126,3 +126,40 @@ usrsbin_exec_PROGRAMS += fdformat dist_man_MANS += disk-utils/fdformat.8 fdformat_SOURCES = disk-utils/fdformat.c endif # LINUX + + +if BUILD_PARTX +usrsbin_exec_PROGRAMS += partx addpart delpart +dist_man_MANS += \ + disk-utils/addpart.8 \ + disk-utils/delpart.8 \ + disk-utils/partx.8 + + +addpart_SOURCES = \ + disk-utils/addpart.c \ + disk-utils/partx.h \ + lib/strutils.c + +delpart_SOURCES = \ + disk-utils/delpart.c \ + disk-utils/partx.h \ + lib/strutils.c + +partx_SOURCES = \ + disk-utils/partx.c \ + disk-utils/partx.h \ + lib/at.c \ + lib/blkdev.c \ + lib/canonicalize.c \ + lib/linux_version.c \ + lib/loopdev.c \ + lib/mbsalign.c \ + lib/strutils.c \ + lib/sysfs.c \ + lib/tt.c + +partx_CFLAGS = -I$(ul_libblkid_incdir) +partx_LDADD = libblkid.la + +endif # BUILD_PARTX diff --git a/partx/addpart.8 b/disk-utils/addpart.8 index 9dcd0a324..9dcd0a324 100644 --- a/partx/addpart.8 +++ b/disk-utils/addpart.8 diff --git a/partx/addpart.c b/disk-utils/addpart.c index 0d814bf3e..0d814bf3e 100644 --- a/partx/addpart.c +++ b/disk-utils/addpart.c diff --git a/partx/delpart.8 b/disk-utils/delpart.8 index 433582f14..433582f14 100644 --- a/partx/delpart.8 +++ b/disk-utils/delpart.8 diff --git a/partx/delpart.c b/disk-utils/delpart.c index 79925db89..79925db89 100644 --- a/partx/delpart.c +++ b/disk-utils/delpart.c diff --git a/partx/partx.8 b/disk-utils/partx.8 index 86350c412..be1608d78 100644 --- a/partx/partx.8 +++ b/disk-utils/partx.8 @@ -21,9 +21,9 @@ The .I disk argument is optional when a .I partition -argument is provided. To force scanning a partition as if it were a -whole disk (for example to list nested subpartitions), use the argument -"-". For example: +argument is provided. To force scanning a partition as if it were a whole disk +(for example to list nested subpartitions), use the argument "-". For example: + .RS 7 .TP partx \-\-show \- /dev/sda3 diff --git a/partx/partx.c b/disk-utils/partx.c index 0c3f8f980..6c3287b54 100644 --- a/partx/partx.c +++ b/disk-utils/partx.c @@ -879,4 +879,3 @@ int main(int argc, char **argv) close(fd); return rc ? EXIT_FAILURE : EXIT_SUCCESS; } - diff --git a/partx/partx.h b/disk-utils/partx.h index ed0fd0aa4..ed0fd0aa4 100644 --- a/partx/partx.h +++ b/disk-utils/partx.h diff --git a/partx/.gitignore b/partx/.gitignore deleted file mode 100644 index 9767d23d6..000000000 --- a/partx/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -addpart -delpart -partx diff --git a/partx/Makefile.am b/partx/Makefile.am deleted file mode 100644 index 1f418903b..000000000 --- a/partx/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -usrsbin_exec_PROGRAMS = addpart delpart -dist_man_MANS = addpart.8 delpart.8 - -usrsbin_exec_PROGRAMS += partx -addpart_SOURCES = addpart.c $(top_srcdir)/lib/strutils.c -delpart_SOURCES = delpart.c $(top_srcdir)/lib/strutils.c -partx_SOURCES = \ - partx.c \ - partx.h \ - $(top_srcdir)/lib/at.c \ - $(top_srcdir)/lib/blkdev.c \ - $(top_srcdir)/lib/canonicalize.c \ - $(top_srcdir)/lib/linux_version.c \ - $(top_srcdir)/lib/loopdev.c \ - $(top_srcdir)/lib/mbsalign.c \ - $(top_srcdir)/lib/strutils.c \ - $(top_srcdir)/lib/sysfs.c \ - $(top_srcdir)/lib/tt.c - -partx_CFLAGS = -I$(ul_libblkid_incdir) -partx_LDADD = $(ul_libblkid_la) -dist_man_MANS += partx.8 |