From 1f2547829c8daadc71dc3c362e3f16f84fb8e836 Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Wed, 25 Feb 2004 14:21:14 +0000 Subject: [PATCH] Update for move of include files. (Logical change 1.280) --- configure | 3 ++- configure.ac | 1 + libntfs/Makefile.am | 2 +- libntfs/Makefile.in | 2 +- ntfsprogs/Makefile.am | 4 ++-- ntfsprogs/Makefile.in | 4 ++-- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 9b40db5e..96ccc398 100755 --- a/configure +++ b/configure @@ -21487,7 +21487,7 @@ done # Makefiles to be created by configure. - ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" + ac_config_files="$ac_config_files Makefile doc/Makefile include/Makefile include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 ntfsprogs/Makefile ntfsprogs/mkntfs.8 ntfsprogs/ntfscat.8 ntfsprogs/ntfsclone.8 ntfsprogs/ntfscluster.8 ntfsprogs/ntfsfix.8 ntfsprogs/ntfsinfo.8 ntfsprogs/ntfslabel.8 ntfsprogs/ntfsls.8 ntfsprogs/ntfsprogs.8 ntfsprogs/ntfsresize.8 ntfsprogs/ntfsundelete.8 ntfsprogs.spec" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -22068,6 +22068,7 @@ do "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "include/ntfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/ntfs/Makefile" ;; "libntfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libntfs/Makefile" ;; "libntfs/libntfs.conf" ) CONFIG_FILES="$CONFIG_FILES libntfs/libntfs.conf" ;; "libntfs/libntfs-gnomevfs.8" ) CONFIG_FILES="$CONFIG_FILES libntfs/libntfs-gnomevfs.8" ;; diff --git a/configure.ac b/configure.ac index 54d2a6ca..0e8b63e3 100644 --- a/configure.ac +++ b/configure.ac @@ -202,6 +202,7 @@ AC_CONFIG_FILES([ Makefile doc/Makefile include/Makefile + include/ntfs/Makefile libntfs/Makefile libntfs/libntfs.conf libntfs/libntfs-gnomevfs.8 diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am index 93c434d0..fa90081c 100644 --- a/libntfs/Makefile.am +++ b/libntfs/Makefile.am @@ -29,7 +29,7 @@ LTVERSION_LIBNTFS = 5:0:0 LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0 -linux_ntfsincludedir = -I$(top_srcdir)/include +linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs lib_LTLIBRARIES = libntfs.la libntfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS) diff --git a/libntfs/Makefile.in b/libntfs/Makefile.in index a5aaa9c8..8c56a637 100644 --- a/libntfs/Makefile.in +++ b/libntfs/Makefile.in @@ -177,7 +177,7 @@ target_vendor = @target_vendor@ LTVERSION_LIBNTFS = 5:0:0 LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0 -linux_ntfsincludedir = -I$(top_srcdir)/include +linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs lib_LTLIBRARIES = libntfs.la libntfs_la_LDFLAGS = -version-info $(LTVERSION_LIBNTFS) diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index e9c6cea5..dbebdd39 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -22,10 +22,10 @@ EXTRA_MANS = CLEANFILES = $(EXTRA_PROGRAMS) -linux_ntfsincludedir = -I$(top_srcdir)/include +linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs # Set the include path. -INCLUDES = -I$(top_srcdir)/include $(all_includes) +INCLUDES = -I$(top_srcdir)/include/ntfs $(all_includes) ntfsfix_SOURCES = ntfsfix.c ntfsfix_LDADD = $(AM_LIBS) diff --git a/ntfsprogs/Makefile.in b/ntfsprogs/Makefile.in index c8f05bf1..a0f7e0d5 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -168,10 +168,10 @@ EXTRA_MANS = CLEANFILES = $(EXTRA_PROGRAMS) -linux_ntfsincludedir = -I$(top_srcdir)/include +linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs # Set the include path. -INCLUDES = -I$(top_srcdir)/include $(all_includes) +INCLUDES = -I$(top_srcdir)/include/ntfs $(all_includes) ntfsfix_SOURCES = ntfsfix.c ntfsfix_LDADD = $(AM_LIBS)