From a2e4ff7cb639f4a6d593d69999c276b6cb000e1c Mon Sep 17 00:00:00 2001 From: "cantab.net!aia21" Date: Fri, 5 Mar 2004 11:04:40 +0000 Subject: [PATCH] Rename INCLUDES to AM_CPPFLAGS. (Logical change 1.294) --- libntfs/Makefile.am | 2 +- libntfs/Makefile.in | 2 +- ntfsprogs/Makefile.am | 2 +- ntfsprogs/Makefile.in | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libntfs/Makefile.am b/libntfs/Makefile.am index fa90081c..1a15a074 100644 --- a/libntfs/Makefile.am +++ b/libntfs/Makefile.am @@ -71,7 +71,7 @@ libntfs_gnomevfs_la_SOURCES = \ man_MANS = libntfs-gnomevfs.8 -INCLUDES = $(linux_ntfsincludedir) $(all_includes) +AM_CPPFLAGS = $(linux_ntfsincludedir) $(all_includes) EXTRA_DIST = unix_io.c win32_io.c libntfs.conf.in diff --git a/libntfs/Makefile.in b/libntfs/Makefile.in index 8c56a637..44d7d713 100644 --- a/libntfs/Makefile.in +++ b/libntfs/Makefile.in @@ -217,7 +217,7 @@ libntfs_gnomevfs_la_SOURCES = \ man_MANS = libntfs-gnomevfs.8 -INCLUDES = $(linux_ntfsincludedir) $(all_includes) +AM_CPPFLAGS = $(linux_ntfsincludedir) $(all_includes) EXTRA_DIST = unix_io.c win32_io.c libntfs.conf.in subdir = libntfs diff --git a/ntfsprogs/Makefile.am b/ntfsprogs/Makefile.am index dbebdd39..5e1f2456 100644 --- a/ntfsprogs/Makefile.am +++ b/ntfsprogs/Makefile.am @@ -25,7 +25,7 @@ CLEANFILES = $(EXTRA_PROGRAMS) linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs # Set the include path. -INCLUDES = -I$(top_srcdir)/include/ntfs $(all_includes) +AM_CPPFLAGS = -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 a0f7e0d5..86fce4dc 100644 --- a/ntfsprogs/Makefile.in +++ b/ntfsprogs/Makefile.in @@ -146,10 +146,10 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ -@REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a -@REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries) +@REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la @REALLYSTATIC_TRUE@AM_LFLAGS = -static +@REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries) @REALLYSTATIC_TRUE@STATIC_LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ @REALLYSTATIC_FALSE@LIBTOOL_LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ @@ -171,7 +171,7 @@ CLEANFILES = $(EXTRA_PROGRAMS) linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs # Set the include path. -INCLUDES = -I$(top_srcdir)/include/ntfs $(all_includes) +AM_CPPFLAGS = -I$(top_srcdir)/include/ntfs $(all_includes) ntfsfix_SOURCES = ntfsfix.c ntfsfix_LDADD = $(AM_LIBS)