diff --git a/Makefile.in b/Makefile.in index 9bec01b4..f41970a5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -117,9 +117,9 @@ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ - Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \ - configure configure.ac depcomp install-sh ltconfig ltmain.sh \ - missing mkinstalldirs ntfsprogs.spec.in + Makefile.in NEWS acconfig.h aclocal.m4 config.guess config.h.in \ + config.sub configure configure.ac depcomp install-sh ltconfig \ + ltmain.sh missing mkinstalldirs ntfsprogs.spec.in DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -152,7 +152,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4) $(top_srcdir)/acconfig.h cd $(top_srcdir) && $(AUTOHEADER) touch $(srcdir)/config.h.in diff --git a/configure b/configure index 7d83cbee..75859839 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.57 for ntfsprogs 1.7.2-WIP. +# Generated by GNU Autoconf 2.57 for ntfsprogs 1.8-devel. # # Report bugs to . # @@ -427,8 +427,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ntfsprogs' PACKAGE_TARNAME='ntfsprogs' -PACKAGE_VERSION='1.7.2-WIP' -PACKAGE_STRING='ntfsprogs 1.7.2-WIP' +PACKAGE_VERSION='1.8-devel' +PACKAGE_STRING='ntfsprogs 1.8-devel' PACKAGE_BUGREPORT='linux-ntfs-dev@lists.sourceforge.net' ac_unique_file="config.h.in" @@ -947,7 +947,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ntfsprogs 1.7.2-WIP to adapt to many kinds of systems. +\`configure' configures ntfsprogs 1.8-devel to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1014,7 +1014,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ntfsprogs 1.7.2-WIP:";; + short | recursive ) echo "Configuration of ntfsprogs 1.8-devel:";; esac cat <<\_ACEOF @@ -1115,7 +1115,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -ntfsprogs configure 1.7.2-WIP +ntfsprogs configure 1.8-devel generated by GNU Autoconf 2.57 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 @@ -1130,7 +1130,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ntfsprogs $as_me 1.7.2-WIP, which was +It was created by ntfsprogs $as_me 1.8-devel, which was generated by GNU Autoconf 2.57. Invocation command line was $ $0 $@ @@ -1809,9 +1809,8 @@ fi # Define the identity of the package. PACKAGE=ntfsprogs - VERSION=1.7.2-WIP + VERSION=1.8-devel -VERSION=1.8.0-devel cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" @@ -11425,7 +11424,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by ntfsprogs $as_me 1.7.2-WIP, which was +This file was extended by ntfsprogs $as_me 1.8-devel, which was generated by GNU Autoconf 2.57. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11488,7 +11487,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ntfsprogs config.status 1.7.2-WIP +ntfsprogs config.status 1.8-devel configured by $0, generated by GNU Autoconf 2.57, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index 05ccdb04..f4593b4d 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -151,8 +151,8 @@ ntfsresize_SOURCES = ntfsresize.c utils.c utils.h ntfsresize_LDADD = $(AM_LIBS) ntfsresize_LDFLAGS = $(AM_LFLAGS) -# We don't distribute these +# We don't distribute these ntfsclone_SOURCES = ntfsclone.c utils.c utils.h ntfsclone_LDADD = $(AM_LIBS) ntfsclone_LDFLAGS = $(AM_LFLAGS) @@ -182,7 +182,8 @@ 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) + ntfswipe$(EXEEXT) ntfstruncate$(EXEEXT) ntfscluster$(EXEEXT) \ + ntfsclone$(EXEEXT) bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT) sbin_PROGRAMS = mkntfs$(EXEEXT) ntfslabel$(EXEEXT) ntfsundelete$(EXEEXT) \ ntfsresize$(EXEEXT) @@ -201,6 +202,12 @@ mkntfs_OBJECTS = $(am_mkntfs_OBJECTS) @REALLYSTATIC_TRUE@ $(top_srcdir)/libntfs/.libs/libntfs.a @REALLYSTATIC_FALSE@mkntfs_DEPENDENCIES = \ @REALLYSTATIC_FALSE@ $(top_srcdir)/libntfs/libntfs.la +am_ntfsclone_OBJECTS = ntfsclone.$(OBJEXT) utils.$(OBJEXT) +ntfsclone_OBJECTS = $(am_ntfsclone_OBJECTS) +@REALLYSTATIC_TRUE@ntfsclone_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@ $(top_srcdir)/libntfs/.libs/libntfs.a +@REALLYSTATIC_FALSE@ntfsclone_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ $(top_srcdir)/libntfs/libntfs.la am_ntfscluster_OBJECTS = ntfscluster.$(OBJEXT) utils.$(OBJEXT) ntfscluster_OBJECTS = $(am_ntfscluster_OBJECTS) @REALLYSTATIC_TRUE@ntfscluster_DEPENDENCIES = \ @@ -264,8 +271,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/attrdef.Po ./$(DEPDIR)/boot.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/dumplog.Po ./$(DEPDIR)/mkntfs.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ntfscluster.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ntfsclone.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/ntfsclone.Po ./$(DEPDIR)/ntfscluster.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ntfsdump_logfile.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ntfsfix.Po ./$(DEPDIR)/ntfsinfo.Po \ @AMDEP_TRUE@ ./$(DEPDIR)/ntfslabel.Po ./$(DEPDIR)/ntfsresize.Po \ @@ -278,7 +284,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -DIST_SOURCES = $(dumplog_SOURCES) $(mkntfs_SOURCES) \ +DIST_SOURCES = $(dumplog_SOURCES) $(mkntfs_SOURCES) $(ntfsclone_SOURCES) \ $(ntfscluster_SOURCES) $(ntfsdump_logfile_SOURCES) \ $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(ntfslabel_SOURCES) \ $(ntfsresize_SOURCES) $(ntfstruncate_SOURCES) \ @@ -378,6 +384,9 @@ dumplog$(EXEEXT): $(dumplog_OBJECTS) $(dumplog_DEPENDENCIES) mkntfs$(EXEEXT): $(mkntfs_OBJECTS) $(mkntfs_DEPENDENCIES) @rm -f mkntfs$(EXEEXT) $(LINK) $(mkntfs_LDFLAGS) $(mkntfs_OBJECTS) $(mkntfs_LDADD) $(LIBS) +ntfsclone$(EXEEXT): $(ntfsclone_OBJECTS) $(ntfsclone_DEPENDENCIES) + @rm -f ntfsclone$(EXEEXT) + $(LINK) $(ntfsclone_LDFLAGS) $(ntfsclone_OBJECTS) $(ntfsclone_LDADD) $(LIBS) ntfscluster$(EXEEXT): $(ntfscluster_OBJECTS) $(ntfscluster_DEPENDENCIES) @rm -f ntfscluster$(EXEEXT) $(LINK) $(ntfscluster_LDFLAGS) $(ntfscluster_OBJECTS) $(ntfscluster_LDADD) $(LIBS) @@ -416,6 +425,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boot.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dumplog.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkntfs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsclone.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfscluster.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsdump_logfile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsfix.Po@am__quote@