Signed-off-by: Diego Elio 'Flameeyes' Pettenò <flameeyes@xxxxxxxxx> --- Makefile.am | 3 --- configure.ac | 1 - partx/Makefile.am | 15 --------------- partx/module.am | 14 ++++++++++++++ 4 files changed, 14 insertions(+), 19 deletions(-) delete mode 100644 partx/Makefile.am create mode 100644 partx/module.am diff --git a/Makefile.am b/Makefile.am index b509309..d9db739 100644 --- a/Makefile.am +++ b/Makefile.am @@ -57,9 +57,6 @@ 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 LINUX -SUBDIRS += \ - partx - linux_version_srcs = lib/linux_version.c endif diff --git a/configure.ac b/configure.ac index fbbebd2..d8dfd9f 100644 --- a/configure.ac +++ b/configure.ac @@ -1135,7 +1135,6 @@ AC_CONFIG_FILES([ Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl mount/Makefile -partx/Makefile po/Makefile.in schedutils/Makefile shlibs/blkid/blkid.pc diff --git a/partx/Makefile.am b/partx/Makefile.am deleted file mode 100644 index 36163aa..0000000 --- a/partx/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -include $(top_srcdir)/config/include-Makefile.am - -if BUILD_PARTX - -usrsbin_exec_PROGRAMS = addpart delpart partx -partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \ - efi.h gpt.h crc32.h partx.h dos.h $(top_srcdir)/lib/blkdev.c - -if LINUX -partx_SOURCES += $(top_srcdir)/lib/linux_version.c -endif - -dist_man_MANS = addpart.8 delpart.8 partx.8 - -endif diff --git a/partx/module.am b/partx/module.am new file mode 100644 index 0000000..6b2ccc8 --- /dev/null +++ b/partx/module.am @@ -0,0 +1,14 @@ +if LINUX +if BUILD_PARTX + +usrsbin_exec_PROGRAMS += partx/addpart partx/delpart partx/partx +partx_partx_SOURCES = partx/bsd.c partx/dos.c partx/partx.c \ + partx/solaris.c partx/unixware.c partx/gpt.c \ + partx/crc32.c partx/efi.h partx/gpt.h partx/crc32.h \ + partx/partx.h partx/dos.h lib/blkdev.c \ + $(linux_version_srcs) + +dist_man_MANS += partx/addpart.8 partx/delpart.8 partx/partx.8 + +endif # BUILD_PARTX +endif # Linux \ No newline at end of file -- 1.7.1.1 -- To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
