Updated build configuration of ntfsprogs to use libntfs-3g's includes and libraries.
parent
8bed21697d
commit
237b937a65
|
|
@ -1,10 +1,10 @@
|
||||||
if REALLYSTATIC
|
if REALLYSTATIC
|
||||||
AM_LIBS = $(top_builddir)/libntfs/.libs/libntfs.a
|
AM_LIBS =
|
||||||
AM_LFLAGS = -static
|
AM_LFLAGS = -static
|
||||||
STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||||
else
|
else
|
||||||
AM_LIBS = $(top_builddir)/libntfs/libntfs.la
|
AM_LIBS =
|
||||||
AM_LFLAGS = $(all_libraries)
|
AM_LFLAGS = $(all_libraries) -lntfs-3g
|
||||||
LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ EXTRA_PROGRAMS += ntfsrm
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Set the include path.
|
# 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_SOURCES = ntfsfix.c utils.c utils.h
|
||||||
ntfsfix_LDADD = $(AM_LIBS)
|
ntfsfix_LDADD = $(AM_LIBS)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue