[PATCH] includeopt-fix

[Alexey Mahotkin]

 > -# FIXME - the fact that compiling on my Linux 2.2.16 system finds
 > -# /usr/include/error.h instead of $(top_srcdir)/src/error.h but
 > -# everything compiles and tests anyhow implies that src/error.h may
 > -# be unecessary now.  Should look more deeply into this

If you delete #include "error.h" from savecwd.c, everything compiles ok
with just a warning:

/var/src/ccvs/lib/savecwd.c: In function `save_cwd':
/var/src/ccvs/lib/savecwd.c:63: warning: implicit declaration of function 
`error'

So, maybe savecwd.[ch] should just be moved to src/, or error.[ch] to lib/,
to get rid of circular dependency between two directories.  Or maybe just
leave everything alone.  I do not see where there could be trouble.


2003-05-10  Alexey Mahotkin  <alexm@hsys.msk.ru>

        * Makefile.am: get rid of $(includeopt); -Isrc/ is ok, so remove
        lengthy explanation.


 lib/Makefile.am |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

--- ccvs/lib/Makefile.am~includeopt-fix Sat May 10 20:50:17 2003
+++ ccvs-alexm/lib/Makefile.am  Sat May 10 20:55:42 2003
@@ -14,19 +14,10 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# For now we need to include $(top_srcdir)/src because some systems
-# (at least 'AIX rioscpu2 3 4 000030498200',
-# 'HP-UX hp60 B.10.20 A 9000/770 hp60 two-user license', &
-# 'IRIX64 sgiop110 6.5 07151433 IP30') have trouble finding error.h
-# when compiling savecwd.c
 #
-# FIXME - the fact that compiling on my Linux 2.2.16 system finds
-# /usr/include/error.h instead of $(top_srcdir)/src/error.h but
-# everything compiles and tests anyhow implies that src/error.h may
-# be unecessary now.  Should look more deeply into this
+# savecwd.h needs src/error.h
 #
-# $(includeopt) is CVS specific and set by configure
-INCLUDES = -I$(top_srcdir)/src $(includeopt)
+AM_CPPFLAGS = -I$(top_srcdir)/src
 
 noinst_LIBRARIES = libcvs.a
 

_

--alexm