From: Sergey Poznyakoff Date: Sat, 1 Dec 2012 17:07:47 +0000 (+0200) Subject: Use AM_CPPFLAGS instead of INCLUDES. X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=d350b509c0e1b1296c3d50f1a36c9b6b32f07655;p=chaz%2Ftar Use AM_CPPFLAGS instead of INCLUDES. --- diff --git a/lib/Makefile.am b/lib/Makefile.am index d73fac8..a484fcd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -26,7 +26,7 @@ rmt-command.h : Makefile $(AM_V_at)mv $@-t $@ BUILT_SOURCES = rmt-command.h CLEANFILES = rmt-command.h rmt-command.h-t -INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu +AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu noinst_HEADERS = system.h system-ioctl.h rmt.h paxlib.h stdopen.h xattr-at.h libtar_a_SOURCES = \ diff --git a/src/Makefile.am b/src/Makefile.am index 782df19..ce9b369 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -45,7 +45,7 @@ tar_SOURCES = \ warning.c\ xattrs.c -INCLUDES = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib +AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) diff --git a/tests/Makefile.am b/tests/Makefile.am index dfe1f8a..f04ee39 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -220,6 +220,6 @@ check_PROGRAMS = genfile genfile_SOURCES = genfile.c argcv.c argcv.h localedir = $(datadir)/locale -INCLUDES = -I$(top_srcdir)/gnu -I../gnu -I$(top_srcdir)/gnu -I$(top_srcdir)/lib +AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../gnu -I$(top_srcdir)/gnu -I$(top_srcdir)/lib AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" LDADD = ../gnu/libgnu.a $(LIBINTL) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS)