From 237b937a659e73980ccc811842aebeb2da5a16e4 Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Fri, 15 Jan 2010 09:33:54 +0100 Subject: [PATCH] Updated build configuration of ntfsprogs to use libntfs-3g's includes and libraries. --- ntfsprogs/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index 758cd104..bfb99c4b 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -1,10 +1,10 @@ if REALLYSTATIC -AM_LIBS = $(top_builddir)/libntfs/.libs/libntfs.a +AM_LIBS = AM_LFLAGS = -static STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ else -AM_LIBS = $(top_builddir)/libntfs/libntfs.la -AM_LFLAGS = $(all_libraries) +AM_LIBS = +AM_LFLAGS = $(all_libraries) -lntfs-3g LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ endif @@ -42,7 +42,7 @@ EXTRA_PROGRAMS += ntfsrm endif # Set the include path. -AM_CPPFLAGS = -I$(top_srcdir)/include/ntfs $(all_includes) +AM_CPPFLAGS = $(all_includes) ntfsfix_SOURCES = ntfsfix.c utils.c utils.h ntfsfix_LDADD = $(AM_LIBS)