diff --git a/configure.ac b/configure.ac index 80d52e03..29e27840 100644 --- a/configure.ac +++ b/configure.ac @@ -461,7 +461,6 @@ AC_CONFIG_FILES([ Makefile include/Makefile include/fuse-lite/Makefile - include/ntfs/Makefile include/ntfs-3g/Makefile libfuse-lite/Makefile libntfs-3g/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index e8766d30..0fa17025 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,4 +1,4 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in -SUBDIRS = ntfs ntfs-3g fuse-lite +SUBDIRS = ntfs-3g fuse-lite diff --git a/include/ntfs/Makefile.am b/include/ntfs/Makefile.am deleted file mode 100644 index 829422a7..00000000 --- a/include/ntfs/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ - -linux_ntfsincludedir = $(includedir)/ntfs - -noinst_HEADERS = \ - list.h - -MAINTAINERCLEANFILES = Makefile.in diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index 22fd19ea..ddd58825 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -34,7 +34,7 @@ EXTRA_PROGRAMS += ntfsdecrypt endif # Set the include path. -AM_CPPFLAGS = -I$(top_srcdir)/include/ntfs -I$(top_srcdir)/include/ntfs-3g $(all_includes) +AM_CPPFLAGS = -I$(top_srcdir)/include/ntfs-3g $(all_includes) ntfsfix_SOURCES = ntfsfix.c utils.c utils.h ntfsfix_LDADD = $(AM_LIBS) @@ -52,7 +52,7 @@ ntfsinfo_SOURCES = ntfsinfo.c utils.c utils.h ntfsinfo_LDADD = $(AM_LIBS) ntfsinfo_LDFLAGS = $(AM_LFLAGS) -ntfsundelete_SOURCES = ntfsundelete.c ntfsundelete.h utils.c utils.h +ntfsundelete_SOURCES = ntfsundelete.c ntfsundelete.h utils.c utils.h list.h ntfsundelete_LDADD = $(AM_LIBS) ntfsundelete_LDFLAGS = $(AM_LFLAGS) @@ -68,7 +68,7 @@ ntfscluster_SOURCES = ntfscluster.c ntfscluster.h cluster.c cluster.h utils.c ut ntfscluster_LDADD = $(AM_LIBS) ntfscluster_LDFLAGS = $(AM_LFLAGS) -ntfsls_SOURCES = ntfsls.c utils.c utils.h +ntfsls_SOURCES = ntfsls.c utils.c utils.h list.h ntfsls_LDADD = $(AM_LIBS) ntfsls_LDFLAGS = $(AM_LFLAGS) diff --git a/include/ntfs/list.h b/ntfsprogs/list.h similarity index 100% rename from include/ntfs/list.h rename to ntfsprogs/list.h