make distcheck failing with included file from another directory.

[Joshua Moore-Oliva]

One of my test programs (which is in a test directory) relies on a header from 
another directory (the src directory).  During distcheck (it works without 
distcheck, I am probably 
running into VPATH problems) it cannot find the headers.  I thought I had taken 
care of this with adding the srcdir into my include path, but this doesn't seem 
to be doing the trick.

An excerpt from my Makefile.am is here

INCLUDES = -I$(top_builddir) -I$(top_srcdir)

check_PROGRAMS = test001 test002 test003 test004 test005 test006 test007 
test008 \
                 test009 test010 test011 test012 test013 test014 test015 test016

test001_CPPFLAGS = -Da_p=a_confirm
test001_SOURCES = test001.csp test001procs.cc
nodist_test001_SOURCES = test001.cc
test001_LDADD = $(top_builddir)/src/libcspxx.a $(SOCKETLIBS)


The error I get during compilation is here.

make[3]: Entering directory 
`/home/chatgris/code/university/USRA/S05/csp++/trunk/csp++-4.1/_build/tests/csp'
if g++ -DHAVE_CONFIG_H -I. -I../../../tests/csp -I../../src -I../.. -I../../.. 
-Da_p=a_confirm -I/usr/include  -g -O2 -MT test001-test001procs.o -MD -MP -MF 
".deps/test001-test001procs.Tpo" -c -o test001-test001procs.o `test -f 
'test001procs.cc' || echo '../../../tests/csp/'`test001procs.cc; \
then mv -f ".deps/test001-test001procs.Tpo" ".deps/test001-test001procs.Po"; 
else rm -f ".deps/test001-test001procs.Tpo"; exit 1; fi
../../../tests/csp/test001procs.cc:2:20: Action.h: No such file or directory
../../../tests/csp/test001procs.cc:3:17: Lit.h: No such file or directory

I am guessing that I don't know the right way to include files from other 
directories in my project.  What is the right way to?

Thanks, Joshua Moore-Oliva