|
From: Anton A. <an...@us...> - 2001-02-02 00:16:16
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv6014/ntfstools
Modified Files:
Makefile ntfsdump_logfile.c ntfsfix.c
Added Files:
Makefile.am Makefile.in
Log Message:
Changed make process to using autoconf/automake/libtool.
Added necessary files for this and for the gnu standard.
Inititial checkin. Probably still stuff missing. Will know soon...
--- NEW FILE ---
bin_PROGRAMS = ntfsfix ntfsdump_logfile
ntfsfix_SOURCES = ntfsfix.c
ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la
ntfsdump_logfile_SOURCES= ntfsdump_logfile.c
ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la
# Set the include path.
INCLUDES = -I$(top_srcdir)/include $(all_includes)
# The library search path.
ntfsfix_LDFLAGS = $(all_libraries)
ntfsdump_logfile_LDFLAGS= $(all_libraries)
--- NEW FILE ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_alias = @build_alias@
build_triplet = @build@
host_alias = @host_alias@
host_triplet = @host@
target_alias = @target_alias@
target_triplet = @target@
AS = @AS@
AUTODIRS = @AUTODIRS@
CC = @CC@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
LDFLAGS = @LDFLAGS@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
VERSION = @VERSION@
all_includes = @all_includes@
all_libraries = @all_libraries@
bin_PROGRAMS = ntfsfix ntfsdump_logfile
ntfsfix_SOURCES = ntfsfix.c
ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la
ntfsdump_logfile_SOURCES = ntfsdump_logfile.c
ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la
# Set the include path.
INCLUDES = -I$(top_srcdir)/include $(all_includes)
# The library search path.
ntfsfix_LDFLAGS = $(all_libraries)
ntfsdump_logfile_LDFLAGS = $(all_libraries)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I..
LIBS = @LIBS@
ntfsfix_OBJECTS = ntfsfix.o
ntfsfix_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
ntfsdump_logfile_OBJECTS = ntfsdump_logfile.o
ntfsdump_logfile_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/ntfsdump_logfile.P .deps/ntfsfix.P
SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES)
OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS)
all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .lo .o .s
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu ntfstools/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
mostlyclean-binPROGRAMS:
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
distclean-binPROGRAMS:
maintainer-clean-binPROGRAMS:
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(bindir)
@list='$(bin_PROGRAMS)'; for p in $$list; do \
if test -f $$p; then \
echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
else :; fi; \
done
uninstall-binPROGRAMS:
@$(NORMAL_UNINSTALL)
list='$(bin_PROGRAMS)'; for p in $$list; do \
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
.s.o:
$(COMPILE) -c $<
.S.o:
$(COMPILE) -c $<
mostlyclean-compile:
-rm -f *.o core *.core
clean-compile:
distclean-compile:
-rm -f *.tab.c
maintainer-clean-compile:
.s.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
.S.lo:
$(LIBTOOL) --mode=compile $(COMPILE) -c $<
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
distclean-libtool:
maintainer-clean-libtool:
ntfsfix: $(ntfsfix_OBJECTS) $(ntfsfix_DEPENDENCIES)
@rm -f ntfsfix
$(LINK) $(ntfsfix_LDFLAGS) $(ntfsfix_OBJECTS) $(ntfsfix_LDADD) $(LIBS)
ntfsdump_logfile: $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_DEPENDENCIES)
@rm -f ntfsdump_logfile
$(LINK) $(ntfsdump_logfile_LDFLAGS) $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_LDADD) $(LIBS)
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = ntfstools
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu ntfstools/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-include $(DEP_FILES)
mostlyclean-depend:
clean-depend:
distclean-depend:
-rm -rf .deps
maintainer-clean-depend:
%.o: %.c
@echo '$(COMPILE) -c $<'; \
$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm .deps/$(*F).pp
%.lo: %.c
@echo '$(LTCOMPILE) -c $<'; \
$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
@-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
< .deps/$(*F).pp > .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
>> .deps/$(*F).P; \
rm -f .deps/$(*F).pp
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am: install-binPROGRAMS
install-exec: install-exec-am
install-data-am:
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-binPROGRAMS
uninstall: uninstall-am
all-am: Makefile $(PROGRAMS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \
clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \
distclean-tags distclean-depend distclean-generic \
clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-binPROGRAMS \
maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-tags maintainer-clean-depend \
maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
distclean-tags clean-tags maintainer-clean-tags distdir \
mostlyclean-depend distclean-depend clean-depend \
maintainer-clean-depend info-am info dvi-am dvi check check-am \
installcheck-am installcheck install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile 2001/01/30 12:29:03 1.1
--- Makefile 2001/02/02 00:16:18 1.2
***************
*** 1,10 ****
! #
! # Makefile for the NTFS utilities.
! #
!
! EXTRA_CFLAGS := -L$(TOPDIR)/lib $(TOPDIR)/lib/libntfs.so
!
! first_target:
! rm -f ntfsfix.o
! $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $(TOPDIR)/bin/ntfsfix ntfsfix.c
--- 1,363 ----
! # Generated automatically from Makefile.in by configure.
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
+ # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
+
+ SHELL = /bin/sh
+
+ srcdir = .
+ top_srcdir = ..
+ prefix = /usr/local
+ exec_prefix = ${prefix}
+
+ bindir = ${exec_prefix}/bin
+ sbindir = ${exec_prefix}/sbin
+ libexecdir = ${exec_prefix}/libexec
+ datadir = ${prefix}/share
+ sysconfdir = ${prefix}/etc
+ sharedstatedir = ${prefix}/com
+ localstatedir = ${prefix}/var
+ libdir = ${exec_prefix}/lib
+ infodir = ${prefix}/info
+ mandir = ${prefix}/man
+ includedir = ${prefix}/include
+ oldincludedir = /usr/include
+
+ DESTDIR =
+
+ pkgdatadir = $(datadir)/Linux-NTFS
+ pkglibdir = $(libdir)/Linux-NTFS
+ pkgincludedir = $(includedir)/Linux-NTFS
+
+ top_builddir = ..
+
+ ACLOCAL = aclocal
+ AUTOCONF = autoconf
+ AUTOMAKE = automake
+ AUTOHEADER = autoheader
+
+ INSTALL = /usr/bin/install -c
+ INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_DATA = ${INSTALL} -m 644
+ INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+ transform = s,x,x,
+
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_alias = i586-pc-linux
+ build_triplet = i586-pc-linux-gnu
+ host_alias = i586-pc-linux
+ host_triplet = i586-pc-linux-gnu
+ target_alias = i586-pc-linux
+ target_triplet = i586-pc-linux-gnu
+ AS = @AS@
+ AUTODIRS =
+ CC = gcc
+ CFLAGS = -g -O2
+ CPPFLAGS =
+ CXX = c++
+ DLLTOOL = @DLLTOOL@
+ LDFLAGS =
+ LIBTOOL = $(SHELL) $(top_builddir)/libtool
+ LN_S = ln -s
+ MAINT = #
+ MAKEINFO = makeinfo
+ OBJDUMP = @OBJDUMP@
+ PACKAGE = Linux-NTFS
+ RANLIB = ranlib
+ VERSION = 0.0.1
+ all_includes =
+ all_libraries =
+
+ bin_PROGRAMS = ntfsfix ntfsdump_logfile
+
+ ntfsfix_SOURCES = ntfsfix.c
+ ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la
+
+ ntfsdump_logfile_SOURCES = ntfsdump_logfile.c
+ ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la
+
+ # Set the include path.
+ INCLUDES = -I$(top_srcdir)/include $(all_includes)
+
+ # The library search path.
+ ntfsfix_LDFLAGS = $(all_libraries)
+ ntfsdump_logfile_LDFLAGS = $(all_libraries)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+ PROGRAMS = $(bin_PROGRAMS)
+
+
+ DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
+ LIBS =
+ ntfsfix_OBJECTS = ntfsfix.o
+ ntfsfix_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
+ ntfsdump_logfile_OBJECTS = ntfsdump_logfile.o
+ ntfsdump_logfile_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON = Makefile.am Makefile.in
+
+
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+ TAR = gtar
+ GZIP_ENV = --best
+ DEP_FILES = .deps/ntfsdump_logfile.P .deps/ntfsfix.P
+ SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES)
+ OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS)
+
+ all: all-redirect
+ .SUFFIXES:
+ .SUFFIXES: .S .c .lo .o .s
+ $(srcdir)/Makefile.in: # Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --gnu ntfstools/Makefile
+
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+ mostlyclean-binPROGRAMS:
+
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+ distclean-binPROGRAMS:
+
+ maintainer-clean-binPROGRAMS:
+
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ else :; fi; \
+ done
+
+ uninstall-binPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ list='$(bin_PROGRAMS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ done
+
+ .s.o:
+ $(COMPILE) -c $<
+
+ .S.o:
+ $(COMPILE) -c $<
+
+ mostlyclean-compile:
+ -rm -f *.o core *.core
+
+ clean-compile:
+
+ distclean-compile:
+ -rm -f *.tab.c
+
+ maintainer-clean-compile:
+
+ .s.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+ .S.lo:
+ $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+ clean-libtool:
+ -rm -rf .libs _libs
+
+ distclean-libtool:
+
+ maintainer-clean-libtool:
+
+ ntfsfix: $(ntfsfix_OBJECTS) $(ntfsfix_DEPENDENCIES)
+ @rm -f ntfsfix
+ $(LINK) $(ntfsfix_LDFLAGS) $(ntfsfix_OBJECTS) $(ntfsfix_LDADD) $(LIBS)
+
+ ntfsdump_logfile: $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_DEPENDENCIES)
+ @rm -f ntfsdump_logfile
+ $(LINK) $(ntfsdump_logfile_LDFLAGS) $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_LDADD) $(LIBS)
+
+ tags: TAGS
+
+ ID: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ here=`pwd` && cd $(srcdir) \
+ && mkid -f$$here/ID $$unique $(LISP)
+
+ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS)'; \
+ unique=`for i in $$list; do echo $$i; done | \
+ awk ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+
+ mostlyclean-tags:
+
+ clean-tags:
+
+ distclean-tags:
+ -rm -f TAGS ID
+
+ maintainer-clean-tags:
+
+ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+ subdir = ntfstools
+
+ distdir: $(DISTFILES)
+ here=`cd $(top_builddir) && pwd`; \
+ top_distdir=`cd $(top_distdir) && pwd`; \
+ distdir=`cd $(distdir) && pwd`; \
+ cd $(top_srcdir) \
+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu ntfstools/Makefile
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+
+ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+ -include $(DEP_FILES)
+
+ mostlyclean-depend:
+
+ clean-depend:
+
+ distclean-depend:
+ -rm -rf .deps
+
+ maintainer-clean-depend:
+
+ %.o: %.c
+ @echo '$(COMPILE) -c $<'; \
+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm .deps/$(*F).pp
+
+ %.lo: %.c
+ @echo '$(LTCOMPILE) -c $<'; \
+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
+ < .deps/$(*F).pp > .deps/$(*F).P; \
+ tr ' ' '\012' < .deps/$(*F).pp \
+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+ >> .deps/$(*F).P; \
+ rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+ dvi: dvi-am
+ check-am: all-am
+ check: check-am
+ installcheck-am:
+ installcheck: installcheck-am
+ install-exec-am: install-binPROGRAMS
+ install-exec: install-exec-am
+
+ install-data-am:
+ install-data: install-data-am
+
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+ uninstall-am: uninstall-binPROGRAMS
+ uninstall: uninstall-am
+ all-am: Makefile $(PROGRAMS)
+ all-redirect: all-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(bindir)
+
+
+ mostlyclean-generic:
+
+ clean-generic:
+
+ distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+ maintainer-clean-generic:
+ mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
+ mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
+ mostlyclean-generic
+
+ mostlyclean: mostlyclean-am
+
+ clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+ clean-depend clean-generic mostlyclean-am
+
+ clean: clean-am
+
+ distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \
+ distclean-tags distclean-depend distclean-generic \
+ clean-am
+ -rm -f libtool
+
+ distclean: distclean-am
+
+ maintainer-clean-am: maintainer-clean-binPROGRAMS \
+ maintainer-clean-compile maintainer-clean-libtool \
+ maintainer-clean-tags maintainer-clean-depend \
+ maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+ maintainer-clean: maintainer-clean-am
+
+ .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+ mostlyclean-compile distclean-compile clean-compile \
+ maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+ clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+ distclean-tags clean-tags maintainer-clean-tags distdir \
+ mostlyclean-depend distclean-depend clean-depend \
+ maintainer-clean-depend info-am info dvi-am dvi check check-am \
+ installcheck-am installcheck install-exec-am install-exec \
+ install-data-am install-data install-am install uninstall-am uninstall \
+ all-redirect all-am all installdirs mostlyclean-generic \
+ distclean-generic clean-generic maintainer-clean-generic clean \
+ mostlyclean distclean maintainer-clean
+
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ntfsdump_logfile.c 2001/01/27 14:22:02 1.1
--- ntfsdump_logfile.c 2001/02/02 00:16:18 1.2
***************
*** 73,85 ****
printf("\n");
if (argc != 2) {
! printf("%s v%s - Interpret and display information\nabout the "
! "journal ($LogFile) of an NTFS volume.\n\n"
/* Generic copyright / disclaimer. */
! "Copyright (c) 2000, 2001 Anton Altaparmakov.\n"
"%s is free software, released under the GNU "
! "General Public License and you\nare welcome to "
"redistribute it under certain conditions.\n"
! "%s comes with ABSOLUTELY NO WARRANTY; for details"
! "read the file GNU\nGeneral Public License to be found "
"in the file COPYING in the main Linux-NTFS\n"
"distribution directory.\n\n"
--- 73,85 ----
printf("\n");
if (argc != 2) {
! printf("%s v%s - Interpret and display information about the "
! "journal\n($LogFile) of an NTFS volume.\n\n"
/* Generic copyright / disclaimer. */
! "Copyright (c) 2000, 2001 Anton Altaparmakov.\n\n"
"%s is free software, released under the GNU "
! "General Public License\nand you are welcome to "
"redistribute it under certain conditions.\n"
! "%s comes with ABSOLUTELY NO WARRANTY; for details "
! "read the GNU\nGeneral Public License to be found "
"in the file COPYING in the main Linux-NTFS\n"
"distribution directory.\n\n"
***************
*** 108,112 ****
/* Check the $LogFile mft record. */
if (is_baad_record(b1)) {
- puts(FAILED);
fprintf(stderr, "Error: Incomplete multi sector "
"transfer detected in $LogFile.\nCannot "
--- 108,111 ----
***************
*** 115,119 ****
}
if (!is_mft_recordp(b1)) {
- puts(FAILED);
fprintf(stderr, "Error: Invalid mft record for $LogFile.\n"
"Cannot handle this yet. )-:\n");
--- 114,117 ----
***************
*** 142,146 ****
find_attribute((MFT_RECORD_HEADER*)b1, $DATA, NULL);
if (!a) {
- puts(FAILED);
fprintf(stderr, "Error: Attribute $DATA was not found in" \
"$LogFile!\n");
--- 140,143 ----
***************
*** 150,154 ****
l = get_attribute_value_length((ATTRIBUTE_RECORD_HEADER*)a);
if (!l) {
- puts(OK);
puts("$LogFile has zero length, no need to write to disk.");
goto log_file_error;
--- 147,150 ----
***************
*** 157,161 ****
lfd = (unsigned char*)malloc(l);
if (!lfd) {
- puts(FAILED);
puts("Not enough memory to load $LogFile.");
goto log_file_error;
--- 153,156 ----
***************
*** 163,167 ****
/* Read in the $LogFile into the buffer. */
if (l != get_attribute_value(vol, (ATTRIBUTE_RECORD_HEADER*)a, lfd)) {
- puts(FAILED);
puts("Amount of data read does not correspond to expected "
"length!");
--- 158,161 ----
***************
*** 171,175 ****
/* Check restart area. */
if (!is_rstr_recordp(lfd)) {
- puts(FAILED);
puts("$LogFile contents are corrupt (magic RSTR missing)!");
free(lfd);
--- 165,168 ----
***************
*** 178,186 ****
/* Do the interpretation and display now. */
rph = (RESTART_PAGE_HEADER*)lfd;
! lps = le32_to_cpu(rph->LogPageSize);
pass_loc:
if (!post_read_mst_fixup((NTFS_RECORD_HEADER*)rph, lps) ||
is_baad_recordp(rph)) {
- puts(FAILED);
puts("$LogFile incomplete multi sector transfer detected! "
"Cannot handle this yet!");
--- 171,178 ----
/* Do the interpretation and display now. */
rph = (RESTART_PAGE_HEADER*)lfd;
! lps = le32_to_cpu(rph->log_page_size);
pass_loc:
if (!post_read_mst_fixup((NTFS_RECORD_HEADER*)rph, lps) ||
is_baad_recordp(rph)) {
puts("$LogFile incomplete multi sector transfer detected! "
"Cannot handle this yet!");
***************
*** 188,194 ****
goto log_file_error;
}
! if (le16_to_cpu(rph->major_version != 1) ||
! le16_to_cpu(rph->minor_version != 1)) {
! puts(FAILED);
fprintf(stderr, "$LogFile version %i.%i! Error: Unknown "
"$LogFilee version!\n",
--- 180,185 ----
goto log_file_error;
}
! if (le16_to_cpu(rph->major_ver != 1) ||
! le16_to_cpu(rph->minor_ver != 1)) {
fprintf(stderr, "$LogFile version %i.%i! Error: Unknown "
"$LogFilee version!\n",
***************
*** 253,257 ****
if (!is_rcrd_recordp(rph))
puts("$LogFile's first record area magic RCRD is missing!");
- }
puts("That's all for now. Dumping of the actual log contents is not "
"implemented yet.");
--- 244,247 ----
***************
*** 266,270 ****
free(b1);
if (vol)
! ntfs_close(vol);
return i;
error_exit:
--- 256,260 ----
free(b1);
if (vol)
! ntfs_close(vol, 0);
return i;
error_exit:
Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsfix.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ntfsfix.c 2001/01/30 12:55:21 1.3
--- ntfsfix.c 2001/02/02 00:16:18 1.4
***************
*** 87,91 ****
" suffer! - You have been warned!\n\n"
/* Generic copyright / disclaimer. */
! "Copyright (c) 2000, 2001 Anton Altaparmakov.\n"
"%s is free software, released under the GNU "
"General Public License and you\nare welcome to "
--- 87,91 ----
" suffer! - You have been warned!\n\n"
/* Generic copyright / disclaimer. */
! "Copyright (c) 2000, 2001 Anton Altaparmakov.\n\n"
"%s is free software, released under the GNU "
"General Public License and you\nare welcome to "
***************
*** 96,100 ****
"distribution directory.\n\n"
/* Generic part ends here. */
! "Syntax: ntfsfix partition_name\n"
" e.g. ntfsfix /dev/hda6\n\n", EXEC_VERSION,
EXEC_NAME, EXEC_NAME);
--- 96,100 ----
"distribution directory.\n\n"
/* Generic part ends here. */
! "Syntax: ntfsfix partition_or_file_name\n"
" e.g. ntfsfix /dev/hda6\n\n", EXEC_VERSION,
EXEC_NAME, EXEC_NAME);
|
