From 34b4126bec4b74ff3c1ec2593fb8bbde3c77d6d1 Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Mon, 18 Nov 2002 16:27:23 +0000 Subject: [PATCH] autogen.sh doesn't work with automake 1.5 -- fix by Szaka (Logical change 1.15) --- ntfstools/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ntfstools/Makefile.am b/ntfstools/Makefile.am index 6f365809..81600372 100644 --- a/ntfstools/Makefile.am +++ b/ntfstools/Makefile.am @@ -8,13 +8,16 @@ endif if REALLYSTATIC AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a AM_LFLAGS = -static -LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +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 $@ +LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ endif +# Workaround to make REALLYSTATIC work with automake 1.5. +LINK=$(STATIC_LINK) $(LIBTOOL_LINK) + bin_PROGRAMS = ntfsfix ntfsinfo sbin_PROGRAMS = mkntfs ntfslabel ntfsundelete ntfsresize EXTRA_PROGRAMS = ntfsdump_logfile dumplog ntfswipe