|
From: Richard R. <fl...@us...> - 2002-07-21 14:06:48
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv774/ntfstools Modified Files: Makefile.am Makefile.in Log Message: "configure --enable-really-static" and "make strip" very little has changed, but configure has lots of line numbers that have shift slightly Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v retrieving revision 1.29 retrieving revision 1.30 diff -U2 -r1.29 -r1.30 --- Makefile.am 19 Jul 2002 14:53:27 -0000 1.29 +++ Makefile.am 21 Jul 2002 14:06:42 -0000 1.30 @@ -6,4 +6,14 @@ endif +if REALLYSTATIC +AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a +AM_LFLAGS = -static +LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +else +AM_LIBS = $(top_srcdir)/libntfs/libntfs.la +AM_LFLAGS = $(all_libraries) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +endif + bin_PROGRAMS = ntfsfix ntfsinfo sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete @@ -21,39 +31,43 @@ ntfsfix_SOURCES = ntfsfix.c -ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsfix_LDFLAGS = $(all_libraries) +ntfsfix_LDADD = $(AM_LIBS) +ntfsfix_LDFLAGS = $(AM_LFLAGS) mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c -mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la -mkntfs_LDFLAGS = $(all_libraries) +mkntfs_LDADD = $(AM_LIBS) +mkntfs_LDFLAGS = $(AM_LFLAGS) ntfslabel_SOURCES = ntfslabel.c -ntfslabel_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfslabel_LDFLAGS = $(all_libraries) +ntfslabel_LDADD = $(AM_LIBS) +ntfslabel_LDFLAGS = $(AM_LFLAGS) ntfsinfo_SOURCES = ntfsinfo.c -ntfsinfo_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsinfo_LDFLAGS = $(all_libraries) +ntfsinfo_LDADD = $(AM_LIBS) +ntfsinfo_LDFLAGS = $(AM_LFLAGS) ntfsundelete_SOURCES = ntfsundelete.c ntfsundelete.h -ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsundelete_LDFLAGS = $(all_libraries) +ntfsundelete_LDADD = $(AM_LIBS) +ntfsundelete_LDFLAGS = $(AM_LFLAGS) # We don't distribute these ntfswipe_SOURCES = ntfswipe.c ntfswipe.h -ntfswipe_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfswipe_LDFLAGS = $(all_libraries) +ntfswipe_LDADD = $(AM_LIBS) +ntfswipe_LDFLAGS = $(AM_LFLAGS) ntfsresize_SOURCES = ntfsresize.c -ntfsresize_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsresize_LDFLAGS = $(all_libraries) +ntfsresize_LDADD = $(AM_LIBS) +ntfsresize_LDFLAGS = $(AM_LFLAGS) ntfsdump_logfile_SOURCES= ntfsdump_logfile.c -ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsdump_logfile_LDFLAGS= $(all_libraries) +ntfsdump_logfile_LDADD = $(AM_LIBS) +ntfsdump_logfile_LDFLAGS= $(AM_LFLAGS) dumplog_SOURCES = dumplog.c -dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la -dumplog_LDFLAGS = $(all_libraries) +dumplog_LDADD = $(AM_LIBS) +dumplog_LDFLAGS = $(AM_LFLAGS) + +# Extra targets +strip: $(bin_PROGRAMS) $(sbin_PROGRAMS) + $(STRIP) $^ Index: Makefile.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v retrieving revision 1.35 retrieving revision 1.36 diff -U2 -r1.35 -r1.36 --- Makefile.in 19 Jul 2002 14:53:27 -0000 1.35 +++ Makefile.in 21 Jul 2002 14:06:42 -0000 1.36 @@ -91,4 +91,10 @@ @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 +@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 +@REALLYSTATIC_FALSE@AM_LFLAGS = @REALLYSTATIC_FALSE@$(all_libraries) +@REALLYSTATIC_TRUE@LINK = @REALLYSTATIC_TRUE@$(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +@REALLYSTATIC_FALSE@LINK = @REALLYSTATIC_FALSE@$(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ bin_PROGRAMS = ntfsfix ntfsinfo @@ -107,40 +113,40 @@ ntfsfix_SOURCES = ntfsfix.c -ntfsfix_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsfix_LDFLAGS = $(all_libraries) +ntfsfix_LDADD = $(AM_LIBS) +ntfsfix_LDFLAGS = $(AM_LFLAGS) mkntfs_SOURCES = attrdef.c upcase.c boot.c sd.c mkntfs.c -mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la -mkntfs_LDFLAGS = $(all_libraries) +mkntfs_LDADD = $(AM_LIBS) +mkntfs_LDFLAGS = $(AM_LFLAGS) ntfslabel_SOURCES = ntfslabel.c -ntfslabel_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfslabel_LDFLAGS = $(all_libraries) +ntfslabel_LDADD = $(AM_LIBS) +ntfslabel_LDFLAGS = $(AM_LFLAGS) ntfsinfo_SOURCES = ntfsinfo.c -ntfsinfo_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsinfo_LDFLAGS = $(all_libraries) +ntfsinfo_LDADD = $(AM_LIBS) +ntfsinfo_LDFLAGS = $(AM_LFLAGS) ntfsundelete_SOURCES = ntfsundelete.c ntfsundelete.h -ntfsundelete_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsundelete_LDFLAGS = $(all_libraries) +ntfsundelete_LDADD = $(AM_LIBS) +ntfsundelete_LDFLAGS = $(AM_LFLAGS) # We don't distribute these ntfswipe_SOURCES = ntfswipe.c ntfswipe.h -ntfswipe_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfswipe_LDFLAGS = $(all_libraries) +ntfswipe_LDADD = $(AM_LIBS) +ntfswipe_LDFLAGS = $(AM_LFLAGS) ntfsresize_SOURCES = ntfsresize.c -ntfsresize_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsresize_LDFLAGS = $(all_libraries) +ntfsresize_LDADD = $(AM_LIBS) +ntfsresize_LDFLAGS = $(AM_LFLAGS) ntfsdump_logfile_SOURCES = ntfsdump_logfile.c -ntfsdump_logfile_LDADD = $(top_srcdir)/libntfs/libntfs.la -ntfsdump_logfile_LDFLAGS = $(all_libraries) +ntfsdump_logfile_LDADD = $(AM_LIBS) +ntfsdump_logfile_LDFLAGS = $(AM_LFLAGS) dumplog_SOURCES = dumplog.c -dumplog_LDADD = $(top_srcdir)/libntfs/libntfs.la -dumplog_LDFLAGS = $(all_libraries) +dumplog_LDADD = $(AM_LIBS) +dumplog_LDFLAGS = $(AM_LFLAGS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h @@ -156,26 +162,52 @@ LIBS = @LIBS@ ntfsresize_OBJECTS = ntfsresize.$(OBJEXT) -ntfsresize_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@ntfsresize_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@ntfsresize_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a ntfsdump_logfile_OBJECTS = ntfsdump_logfile.$(OBJEXT) -ntfsdump_logfile_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@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) -dumplog_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@dumplog_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@dumplog_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a ntfswipe_OBJECTS = ntfswipe.$(OBJEXT) -ntfswipe_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@ntfswipe_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@ntfswipe_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a ntfsfix_OBJECTS = ntfsfix.$(OBJEXT) -ntfsfix_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@ntfsfix_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@ntfsfix_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a ntfsinfo_OBJECTS = ntfsinfo.$(OBJEXT) -ntfsinfo_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@ntfsinfo_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@ntfsinfo_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a mkntfs_OBJECTS = attrdef.$(OBJEXT) upcase.$(OBJEXT) boot.$(OBJEXT) \ sd.$(OBJEXT) mkntfs.$(OBJEXT) -mkntfs_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@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) -ntfslabel_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@ntfslabel_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@ntfslabel_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a ntfsundelete_OBJECTS = ntfsundelete.$(OBJEXT) -ntfsundelete_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_FALSE@ntfsundelete_DEPENDENCIES = \ +@REALLYSTATIC_FALSE@$(top_srcdir)/libntfs/libntfs.la +@REALLYSTATIC_TRUE@ntfsundelete_DEPENDENCIES = \ +@REALLYSTATIC_TRUE@$(top_srcdir)/libntfs/.libs/libntfs.a 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 $@ man8dir = $(mandir)/man8 MANS = $(man_MANS) @@ -546,4 +578,9 @@ mostlyclean distclean maintainer-clean + +# Extra targets + +strip: $(bin_PROGRAMS) $(sbin_PROGRAMS) + $(STRIP) $^ # Tell versions [3.59,3.63) of GNU make to not export all variables. |
