diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index 049806fc..62eefd6c 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -25,10 +25,9 @@ endif # Workaround to make REALLYSTATIC work with automake 1.5. LINK=$(STATIC_LINK) $(LIBTOOL_LINK) -bin_PROGRAMS = ntfsfix ntfsinfo -sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate \ - ntfscluster ntfsclone ntfsls +bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls +sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 @@ -65,8 +64,6 @@ ntfsresize_SOURCES = ntfsresize.c utils.c utils.h ntfsresize_LDADD = $(AM_LIBS) ntfsresize_LDFLAGS = $(AM_LFLAGS) -# We don't distribute these - ntfsclone_SOURCES = ntfsclone.c utils.c utils.h ntfsclone_LDADD = $(AM_LIBS) ntfsclone_LDFLAGS = $(AM_LFLAGS) @@ -79,6 +76,8 @@ ntfsls_SOURCES = ntfsls.c utils.c utils.h ntfsls_LDADD = $(AM_LIBS) ntfsls_LDFLAGS = $(AM_LFLAGS) +# We don't distribute these + ntfstruncate_SOURCES = attrdef.c ntfstruncate.c utils.c utils.h ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index 32b95b81..3c6be661 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -111,11 +111,9 @@ install_sh = @install_sh@ # Workaround to make REALLYSTATIC work with automake 1.5. LINK = $(STATIC_LINK) $(LIBTOOL_LINK) -bin_PROGRAMS = ntfsfix ntfsinfo -sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate \ - ntfscluster ntfsclone ntfsls - +bin_PROGRAMS = ntfsfix ntfsinfo ntfscluster ntfsls +sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize ntfsclone +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 @@ -153,8 +151,6 @@ ntfsresize_SOURCES = ntfsresize.c utils.c utils.h ntfsresize_LDADD = $(AM_LIBS) ntfsresize_LDFLAGS = $(AM_LFLAGS) - -# We don't distribute these ntfsclone_SOURCES = ntfsclone.c utils.c utils.h ntfsclone_LDADD = $(AM_LIBS) ntfsclone_LDFLAGS = $(AM_LFLAGS) @@ -167,6 +163,8 @@ ntfsls_SOURCES = ntfsls.c utils.c utils.h ntfsls_LDADD = $(AM_LIBS) ntfsls_LDFLAGS = $(AM_LFLAGS) + +# We don't distribute these ntfstruncate_SOURCES = attrdef.c ntfstruncate.c utils.c utils.h ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) @@ -188,11 +186,11 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = mkntfs.8 ntfsfix.8 ntfsinfo.8 ntfslabel.8 \ ntfsprogs.8 ntfsresize.8 ntfsundelete.8 EXTRA_PROGRAMS = ntfsdump_logfile$(EXEEXT) dumplog$(EXEEXT) \ - ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) ntfscluster$(EXEEXT) \ - ntfsclone$(EXEEXT) ntfsls$(EXEEXT) -bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) + ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) +bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) ntfscluster$(EXEEXT) \ + ntfsls$(EXEEXT) sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) ntfsundelete$(EXEEXT) \ - ntfsresize$(EXEEXT) + ntfsresize$(EXEEXT) ntfsclone$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) am_dumplog_OBJECTS = dumplog.$(OBJEXT)