From e7dd03f9a4dac4215da31e59b9af7a59b5623e78 Mon Sep 17 00:00:00 2001 From: "flatcap.org!flatcap" Date: Thu, 9 Jan 2003 01:42:21 +0000 Subject: [PATCH] add -Wall to normal build (not just debug) add new files to build (Logical change 1.80) --- ntfsprogs/Makefile.am | 13 +++++--- ntfsprogs/Makefile.in | 72 ++++++++++++++++++++++++++----------------- 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index 547be2b2..5d750aab 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -1,8 +1,8 @@ # Need this to enable 64-bit (device) file access functions and parameters. if DEBUG -AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -g -DDEBUG -Wall +AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG else -AM_CFLAGS = -D_FILE_OFFSET_BITS=64 +AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall endif if REALLYSTATIC @@ -20,7 +20,7 @@ LINK=$(STATIC_LINK) $(LIBTOOL_LINK) bin_PROGRAMS = ntfsfix ntfsinfo sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate ntfscluster man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 @@ -59,11 +59,15 @@ ntfsresize_LDFLAGS = $(AM_LFLAGS) # We don't distribute these +ntfscluster_SOURCES = ntfscluster.c ntfscluster.h utils.c utils.h +ntfscluster_LDADD = $(AM_LIBS) +ntfscluster_LDFLAGS = $(AM_LFLAGS) + ntfstruncate_SOURCES = attrdef.c ntfstruncate.c ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) -ntfswipe_SOURCES = ntfswipe.c ntfswipe.h +ntfswipe_SOURCES = ntfswipe.c ntfswipe.h utils.c utils.h ntfswipe_LDADD = $(AM_LIBS) ntfswipe_LDFLAGS = $(AM_LFLAGS) @@ -79,3 +83,4 @@ dumplog_LDFLAGS = $(AM_LFLAGS) strip: $(bin_PROGRAMS) $(sbin_PROGRAMS) $(STRIP) $^ + diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index fd754d5b..a442f7e7 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -88,8 +88,8 @@ STRIP = @STRIP@ VERSION = @VERSION@ all_includes = @all_includes@ all_libraries = @all_libraries@ -@DEBUG_TRUE@AM_CFLAGS = @DEBUG_TRUE@-D_FILE_OFFSET_BITS=64 -g -DDEBUG -Wall -@DEBUG_FALSE@AM_CFLAGS = @DEBUG_FALSE@-D_FILE_OFFSET_BITS=64 +@DEBUG_TRUE@AM_CFLAGS = @DEBUG_TRUE@-D_FILE_OFFSET_BITS=64 -Wall -g -DDEBUG +@DEBUG_FALSE@AM_CFLAGS = @DEBUG_FALSE@-D_FILE_OFFSET_BITS=64 -Wall @REALLYSTATIC_TRUE@AM_LIBS = @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a @REALLYSTATIC_FALSE@AM_LIBS = @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@AM_LFLAGS = @REALLYSTATIC_TRUE@-static @@ -102,7 +102,7 @@ LINK = $(STATIC_LINK) $(LIBTOOL_LINK) bin_PROGRAMS = ntfsfix ntfsinfo sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize -EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate +EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe ntfstruncate ntfscluster man_MANS = mkntfs.8 ntfsfix.8 ntfslabel.8 ntfsinfo.8 \ ntfsundelete.8 ntfsresize.8 ntfsprogs.8 @@ -142,11 +142,15 @@ ntfsresize_LDFLAGS = $(AM_LFLAGS) # We don't distribute these +ntfscluster_SOURCES = ntfscluster.c ntfscluster.h utils.c utils.h +ntfscluster_LDADD = $(AM_LIBS) +ntfscluster_LDFLAGS = $(AM_LFLAGS) + ntfstruncate_SOURCES = attrdef.c ntfstruncate.c ntfstruncate_LDADD = $(AM_LIBS) ntfstruncate_LDFLAGS = $(AM_LFLAGS) -ntfswipe_SOURCES = ntfswipe.c ntfswipe.h +ntfswipe_SOURCES = ntfswipe.c ntfswipe.h utils.c utils.h ntfswipe_LDADD = $(AM_LIBS) ntfswipe_LDFLAGS = $(AM_LFLAGS) @@ -170,56 +174,61 @@ PROGRAMS = $(bin_PROGRAMS) $(sbin_PROGRAMS) DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ntfsdump_logfile_OBJECTS = ntfsdump_logfile.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfsdump_logfile_DEPENDENCIES = \ -@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@ntfsdump_logfile_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -dumplog_OBJECTS = dumplog.$(OBJEXT) -@REALLYSTATIC_FALSE@dumplog_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ntfsdump_logfile_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +dumplog_OBJECTS = dumplog.$(OBJEXT) @REALLYSTATIC_TRUE@dumplog_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfswipe_OBJECTS = ntfswipe.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfswipe_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@dumplog_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfswipe_OBJECTS = ntfswipe.$(OBJEXT) utils.$(OBJEXT) @REALLYSTATIC_TRUE@ntfswipe_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfstruncate_OBJECTS = attrdef.$(OBJEXT) ntfstruncate.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfstruncate_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ntfswipe_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfstruncate_OBJECTS = attrdef.$(OBJEXT) ntfstruncate.$(OBJEXT) @REALLYSTATIC_TRUE@ntfstruncate_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfsfix_OBJECTS = ntfsfix.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfsfix_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ntfstruncate_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfscluster_OBJECTS = ntfscluster.$(OBJEXT) utils.$(OBJEXT) +@REALLYSTATIC_TRUE@ntfscluster_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a +@REALLYSTATIC_FALSE@ntfscluster_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfsfix_OBJECTS = ntfsfix.$(OBJEXT) @REALLYSTATIC_TRUE@ntfsfix_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfsinfo_OBJECTS = ntfsinfo.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfsinfo_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ntfsfix_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfsinfo_OBJECTS = ntfsinfo.$(OBJEXT) @REALLYSTATIC_TRUE@ntfsinfo_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a +@REALLYSTATIC_FALSE@ntfsinfo_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la mkntfs_OBJECTS = attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \ sd.$(OBJEXT) mkntfs.$(OBJEXT) -@REALLYSTATIC_FALSE@mkntfs_DEPENDENCIES = \ -@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@mkntfs_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfslabel_OBJECTS = ntfslabel.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfslabel_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@mkntfs_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfslabel_OBJECTS = ntfslabel.$(OBJEXT) @REALLYSTATIC_TRUE@ntfslabel_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfsundelete_OBJECTS = ntfsundelete.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfsundelete_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ntfslabel_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfsundelete_OBJECTS = ntfsundelete.$(OBJEXT) @REALLYSTATIC_TRUE@ntfsundelete_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a -ntfsresize_OBJECTS = ntfsresize.$(OBJEXT) -@REALLYSTATIC_FALSE@ntfsresize_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@ntfsundelete_DEPENDENCIES = \ @REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +ntfsresize_OBJECTS = ntfsresize.$(OBJEXT) @REALLYSTATIC_TRUE@ntfsresize_DEPENDENCIES = \ @REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a +@REALLYSTATIC_FALSE@ntfsresize_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(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) @@ -237,11 +246,12 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = gtar GZIP_ENV = --best 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/ntfsresize.P .deps/ntfstruncate.P \ -.deps/ntfsundelete.P .deps/ntfswipe.P .deps/sd.P .deps/upcase.P -SOURCES = $(ntfsdump_logfile_SOURCES) $(dumplog_SOURCES) $(ntfswipe_SOURCES) $(ntfstruncate_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES) $(ntfsundelete_SOURCES) $(ntfsresize_SOURCES) -OBJECTS = $(ntfsdump_logfile_OBJECTS) $(dumplog_OBJECTS) $(ntfswipe_OBJECTS) $(ntfstruncate_OBJECTS) $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS) $(ntfsundelete_OBJECTS) $(ntfsresize_OBJECTS) +.deps/ntfscluster.P .deps/ntfsdump_logfile.P .deps/ntfsfix.P \ +.deps/ntfsinfo.P .deps/ntfslabel.P .deps/ntfsresize.P \ +.deps/ntfstruncate.P .deps/ntfsundelete.P .deps/ntfswipe.P .deps/sd.P \ +.deps/upcase.P .deps/utils.P +SOURCES = $(ntfsdump_logfile_SOURCES) $(dumplog_SOURCES) $(ntfswipe_SOURCES) $(ntfstruncate_SOURCES) $(ntfscluster_SOURCES) $(ntfsfix_SOURCES) $(ntfsinfo_SOURCES) $(mkntfs_SOURCES) $(ntfslabel_SOURCES) $(ntfsundelete_SOURCES) $(ntfsresize_SOURCES) +OBJECTS = $(ntfsdump_logfile_OBJECTS) $(dumplog_OBJECTS) $(ntfswipe_OBJECTS) $(ntfstruncate_OBJECTS) $(ntfscluster_OBJECTS) $(ntfsfix_OBJECTS) $(ntfsinfo_OBJECTS) $(mkntfs_OBJECTS) $(ntfslabel_OBJECTS) $(ntfsundelete_OBJECTS) $(ntfsresize_OBJECTS) all: all-redirect .SUFFIXES: @@ -372,6 +382,10 @@ ntfstruncate$(EXEEXT): $(ntfstruncate_OBJECTS) $(ntfstruncate_DEPENDENCIES) @rm -f ntfstruncate$(EXEEXT) $(LINK) $(ntfstruncate_LDFLAGS) $(ntfstruncate_OBJECTS) $(ntfstruncate_LDADD) $(LIBS) +ntfscluster$(EXEEXT): $(ntfscluster_OBJECTS) $(ntfscluster_DEPENDENCIES) + @rm -f ntfscluster$(EXEEXT) + $(LINK) $(ntfscluster_LDFLAGS) $(ntfscluster_OBJECTS) $(ntfscluster_LDADD) $(LIBS) + ntfsfix$(EXEEXT): $(ntfsfix_OBJECTS) $(ntfsfix_DEPENDENCIES) @rm -f ntfsfix$(EXEEXT) $(LINK) $(ntfsfix_LDFLAGS) $(ntfsfix_OBJECTS) $(ntfsfix_LDADD) $(LIBS)