[Linux-NTFS-cvs] CVS: linux-ntfs/ntfstools Makefile.am,1.27,1.28 Makefile.in,1.33,1.34

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv21134/ntfstools

Modified Files:
	Makefile.am Makefile.in 
Log Message:
add ntfsundelete to the build.  fix rpm build.  trawl for typos.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -U2 -r1.27 -r1.28
--- Makefile.am	8 Jul 2002 15:59:34 -0000	1.27
+++ Makefile.am	18 Jul 2002 02:57:56 -0000	1.28
@@ -7,9 +7,9 @@
 
 bin_PROGRAMS		= ntfsfix ntfsinfo
-sbin_PROGRAMS		= mkntfs ntfslabel
-EXTRA_PROGRAMS		= ntfsundelete ntfsresize ntfsdump_logfile dumplog
+sbin_PROGRAMS		= mkntfs ntfslabel ntfsundelete
+EXTRA_PROGRAMS		= ntfsresize ntfsdump_logfile dumplog
 
-man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8
-EXTRA_MANS		= ntfsundelete.8
+man_MANS		= mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 ntfsundelete.8
+EXTRA_MANS		=
 
 CLEANFILES		= $(EXTRA_PROGRAMS)
@@ -36,9 +36,9 @@
 ntfsinfo_LDFLAGS	= $(all_libraries)
 
-# We don't distribute these
-
-ntfsundelete_SOURCES	= ntfsundelete.c
+ntfsundelete_SOURCES	= ntfsundelete.c ntfsundelete.h
 ntfsundelete_LDADD	= $(top_srcdir)/libntfs/libntfs.la
 ntfsundelete_LDFLAGS	= $(all_libraries)
+
+# We don't distribute these
 
 ntfsresize_SOURCES	= ntfsresize.c

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -U2 -r1.33 -r1.34
--- Makefile.in	8 Jul 2002 15:59:34 -0000	1.33
+++ Makefile.in	18 Jul 2002 02:57:56 -0000	1.34
@@ -93,6 +93,6 @@
 
 bin_PROGRAMS = ntfsfix ntfsinfo
-sbin_PROGRAMS = mkntfs ntfslabel
-EXTRA_PROGRAMS = ntfsundelete ntfsresize ntfsdump_logfile dumplog
+sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete 
+EXTRA_PROGRAMS = ntfsresize ntfsdump_logfile dumplog
 
 man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8
@@ -122,10 +122,10 @@
 ntfsinfo_LDFLAGS = $(all_libraries)
 
-# We don't distribute these
-
-ntfsundelete_SOURCES = ntfsundelete.c
+ntfsundelete_SOURCES = ntfsundelete.c ntfsundelete.h
 ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la
 ntfsundelete_LDFLAGS = $(all_libraries)
 
+# We don't distribute these
+
 ntfsresize_SOURCES = ntfsresize.c
 ntfsresize_LDADD = $(top_srcdir)/libntfs/libntfs.la
@@ -144,5 +144,6 @@
 ntfsundelete.8
 bin_PROGRAMS =  ntfsfix$(EXEEXT) ntfsinfo$(EXEEXT)
-sbin_PROGRAMS =  mkntfs$(EXEEXT) ntfslabel$(EXEEXT)
+sbin_PROGRAMS =  mkntfs$(EXEEXT) ntfslabel$(EXEEXT) \
+ntfsundelete$(EXEEXT)
 PROGRAMS =  $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
@@ -150,6 +151,4 @@
 DEFS = @DEFS@ -I. -I$(srcdir) -I..
 LIBS = @LIBS@
-ntfsundelete_OBJECTS =  ntfsundelete.$(OBJEXT)
-ntfsundelete_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
 ntfsresize_OBJECTS =  ntfsresize.$(OBJEXT)
 ntfsresize_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
@@ -167,4 +166,6 @@
 ntfslabel_OBJECTS =  ntfslabel.$(OBJEXT)
 ntfslabel_DEPENDENCIES =  $(top_srcdir)/libntfs/libntfs.la
+ntfsundelete_OBJECTS =  ntfsundelete.$(OBJEXT)
+ntfsundelete_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)
@@ -187,6 +188,6 @@
 .deps/ntfslabel.P .deps/ntfsresize.P .deps/ntfsundelete.P .deps/sd.P \
 .deps/upcase.P
-SOURCES = $(ntfsundelete_SOURCES) $(ntfsresize_SOURCES) $(ntfsdump_logfile_SOURCES) $(dumplog_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES)
-OBJECTS = $(ntfsundelete_OBJECTS) $(ntfsresize_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(dumplog_OBJECTS) $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS)
+SOURCES = $(ntfsresize_SOURCES) $(ntfsdump_logfile_SOURCES) $(dumplog_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES) $(ntfsundelete_SOURCES)
+OBJECTS = $(ntfsresize_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(dumplog_OBJECTS) $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS) $(ntfsundelete_OBJECTS)
 
 all: all-redirect
@@ -299,8 +300,4 @@
 maintainer-clean-libtool:
 
-ntfsundelete$(EXEEXT): $(ntfsundelete_OBJECTS) $(ntfsundelete_DEPENDENCIES)
-	@rm -f ntfsundelete$(EXEEXT)
-	$(LINK) $(ntfsundelete_LDFLAGS) $(ntfsundelete_OBJECTS) $(ntfsundelete_LDADD) $(LIBS)
-
 ntfsresize$(EXEEXT): $(ntfsresize_OBJECTS) $(ntfsresize_DEPENDENCIES)
 	@rm -f ntfsresize$(EXEEXT)
@@ -330,4 +327,8 @@
 	@rm -f ntfslabel$(EXEEXT)
 	$(LINK) $(ntfslabel_LDFLAGS) $(ntfslabel_OBJECTS) $(ntfslabel_LDADD) $(LIBS)
+
+ntfsundelete$(EXEEXT): $(ntfsundelete_OBJECTS) $(ntfsundelete_DEPENDENCIES)
+	@rm -f ntfsundelete$(EXEEXT)
+	$(LINK) $(ntfsundelete_LDFLAGS) $(ntfsundelete_OBJECTS) $(ntfsundelete_LDADD) $(LIBS)
 
 install-man8: