|
From: Richard R. <fl...@us...> - 2002-07-03 11:30:10
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv5069 Modified Files: Makefile.am Makefile.in ntfsdump_logfile.c Log Message: moved undelete,logprogs to EXTRA_PROGRAMS Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -U2 -r1.23 -r1.24 --- Makefile.am 2 Jul 2002 23:47:11 -0000 1.23 +++ Makefile.am 3 Jul 2002 11:30:06 -0000 1.24 @@ -6,6 +6,7 @@ endif -bin_PROGRAMS = ntfsfix ntfsinfo # ntfsdump_logfile dumplog -sbin_PROGRAMS = mkntfs ntfslabel # ntfsundelete +EXTRA_PROGRAMS = ntfsundelete ntfsdump_logfile dumplog +bin_PROGRAMS = ntfsfix ntfsinfo +sbin_PROGRAMS = mkntfs ntfslabel man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 #ntfsundelete.8 @@ -31,15 +32,17 @@ ntfsinfo_LDFLAGS = $(all_libraries) -#ntfsundelete_SOURCES = ntfsundelete.c -#ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la -#ntfsundelete_LDFLAGS = $(all_libraries) - # We don't distribute these as they are not really of any use to anyone except # us developers for playing with. -#ntfsdump_logfile_SOURCES= ntfsdump_logfile.c -#ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la -#ntfsdump_logfile_LDFLAGS= $(all_libraries) -#dumplog_SOURCES = dumplog.c -#dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la -#dumplog_LDFLAGS = $(all_libraries) + +ntfsundelete_SOURCES = ntfsundelete.c +ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la +ntfsundelete_LDFLAGS = $(all_libraries) + +ntfsdump_logfile_SOURCES= ntfsdump_logfile.c +ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la +ntfsdump_logfile_LDFLAGS= $(all_libraries) + +dumplog_SOURCES = dumplog.c +dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la +dumplog_LDFLAGS = $(all_libraries) Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v retrieving revision 1.29 retrieving revision 1.30 diff -U2 -r1.29 -r1.30 --- Makefile.in 2 Jul 2002 23:47:11 -0000 1.29 +++ Makefile.in 3 Jul 2002 11:30:06 -0000 1.30 @@ -92,6 +92,7 @@ @DEBUG_FALSE@AM_CFLAGS = @DEBUG_FALSE@-D_FILE_OFFSET_BITS=64 -bin_PROGRAMS = ntfsfix ntfsinfo # ntfsdump_logfile dumplog -sbin_PROGRAMS = mkntfs ntfslabel # ntfsundelete +EXTRA_PROGRAMS = ntfsundelete ntfsdump_logfile dumplog +bin_PROGRAMS = ntfsfix ntfsinfo +sbin_PROGRAMS = mkntfs ntfslabel man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 #ntfsundelete.8 @@ -116,4 +117,19 @@ ntfsinfo_LDADD = $(top_srcdir)/libntfs/libntfs.la ntfsinfo_LDFLAGS = $(all_libraries) + +# We don't distribute these as they are not really of any use to anyone except +# us developers for playing with. + +ntfsundelete_SOURCES = ntfsundelete.c +ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la +ntfsundelete_LDFLAGS = $(all_libraries) + +ntfsdump_logfile_SOURCES = ntfsdump_logfile.c +ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la +ntfsdump_logfile_LDFLAGS = $(all_libraries) + +dumplog_SOURCES = dumplog.c +dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la +dumplog_LDFLAGS = $(all_libraries) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -126,4 +142,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ +ntfsundelete_OBJECTS = ntfsundelete.$(OBJEXT) +ntfsundelete_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +ntfsdump_logfile_OBJECTS = ntfsdump_logfile.$(OBJEXT) +ntfsdump_logfile_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +dumplog_OBJECTS = dumplog.$(OBJEXT) +dumplog_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la ntfsfix_OBJECTS = ntfsfix.$(OBJEXT) ntfsfix_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la @@ -151,8 +173,9 @@ TAR = gtar GZIP_ENV = --best -DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/mkntfs.P .deps/ntfsfix.P \ -.deps/ntfsinfo.P .deps/ntfslabel.P .deps/sd.P .deps/upcase.P -SOURCES = $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES) -OBJECTS = $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS) +DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/dumplog.P .deps/mkntfs.P \ +.deps/ntfsdump_logfile.P .deps/ntfsfix.P .deps/ntfsinfo.P \ +.deps/ntfslabel.P .deps/ntfsundelete.P .deps/sd.P .deps/upcase.P +SOURCES = $(ntfsundelete_SOURCES) $(ntfsdump_logfile_SOURCES) $(dumplog_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES) +OBJECTS = $(ntfsundelete_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(dumplog_OBJECTS) $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS) all: all-redirect @@ -263,4 +286,16 @@ maintainer-clean-libtool: +ntfsundelete$(EXEEXT): $(ntfsundelete_OBJECTS) $(ntfsundelete_DEPENDENCIES) + @rm -f ntfsundelete$(EXEEXT) + $(LINK) $(ntfsundelete_LDFLAGS) $(ntfsundelete_OBJECTS) $(ntfsundelete_LDADD) $(LIBS) + +ntfsdump_logfile$(EXEEXT): $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_DEPENDENCIES) + @rm -f ntfsdump_logfile$(EXEEXT) + $(LINK) $(ntfsdump_logfile_LDFLAGS) $(ntfsdump_logfile_OBJECTS) $(ntfsdump_logfile_LDADD) $(LIBS) + +dumplog$(EXEEXT): $(dumplog_OBJECTS) $(dumplog_DEPENDENCIES) + @rm -f dumplog$(EXEEXT) + $(LINK) $(dumplog_LDFLAGS) $(dumplog_OBJECTS) $(dumplog_LDADD) $(LIBS) + ntfsfix$(EXEEXT): $(ntfsfix_OBJECTS) $(ntfsfix_DEPENDENCIES) @rm -f ntfsfix$(EXEEXT) @@ -482,17 +517,4 @@ mostlyclean distclean maintainer-clean - -#ntfsundelete_SOURCES = ntfsundelete.c -#ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la -#ntfsundelete_LDFLAGS = $(all_libraries) - -# We don't distribute these as they are not really of any use to anyone except -# us developers for playing with. -#ntfsdump_logfile_SOURCES= ntfsdump_logfile.c -#ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la -#ntfsdump_logfile_LDFLAGS= $(all_libraries) -#dumplog_SOURCES = dumplog.c -#dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la -#dumplog_LDFLAGS = $(all_libraries) # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: ntfsdump_logfile.c =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/ntfsdump_logfile.c,v retrieving revision 1.21 retrieving revision 1.22 diff -U2 -r1.21 -r1.22 --- ntfsdump_logfile.c 2 Jul 2002 23:47:11 -0000 1.21 +++ ntfsdump_logfile.c 3 Jul 2002 11:30:07 -0000 1.22 @@ -137,5 +137,5 @@ goto log_file_error; } - a = ctx.attr; + a = ctx->attr; /* Get length of $LogFile contents. */ l = get_attribute_value_length(a); |
