I'm trying to fix some of the problems with the Makefile.

I can't test this because it doesn't seem to like the automake 1.4 on debian.

diff --git a/config.h b/config.h
index 4db4252ec87365cab237a943d9f550c3655e7527..bc6b9c55b6ce156f98fb0e09c0251f5cbf2c78c9 100644 (file)
--- a/config.h
+++ b/config.h
@@ -10,13 +10,13 @@
 #define DEFAULT_LCLIMPORTDIR "/usr/local/share/lclint/imports"
 
 /* gcc's private include directory */
-#define GCC_INCLUDE_DIR "/usr/lib/gcc-lib/i386-redhat-linux/2.96/include"
+#define GCC_INCLUDE_DIR "/usr/lib/gcc-lib/i386-linux/2.95.2/include"
 
 /* the system's main include directory */
 #define GCC_INCLUDE_DIR2 "/usr/local/include"
 
 /* String describing who compiled this binary and how */
-#define LCL_COMPILE "Compiled using gcc -g -O2 on Linux paisley 2.4.3-12 #1 Fri Jun 8 13:35:30 EDT 2001 i686 unknown by evans"
+#define LCL_COMPILE "Compiled using gcc -g -O2 on Linux davesworld 2.2.19 #1 Sat Apr 28 00:01:25 EDT 2001 i686 unknown by drl7x"
 
 /* LCLint's version number */
 #define LCL_PARSE_VERSION "LCLint 3.0.0.19"

diff --git a/imports/Makefile b/imports/Makefile
index d422376cde1bc042356d45d55a420201dd2ef8b6..c84ac2c7279887fc53274644f9d9be37c9abdd9d 100644 (file)
--- a/imports/Makefile
+++ b/imports/Makefile
@@ -38,10 +38,10 @@ pkglibdir = $(libdir)/lclint
 pkgincludedir = $(includedir)/lclint
 top_builddir = ..
 
-ACLOCAL = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run aclocal
-AUTOCONF = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run autoconf
-AUTOMAKE = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run automake
-AUTOHEADER = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run autoheader
+ACLOCAL = ${SHELL} /tmp/LCLintDev/config/missing --run aclocal
+AUTOCONF = ${SHELL} /tmp/LCLintDev/config/missing --run autoconf
+AUTOMAKE = ${SHELL} /tmp/LCLintDev/config/missing --run automake
+AUTOHEADER = ${SHELL} /tmp/LCLintDev/config/missing --run autoheader
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -57,8 +57,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = 
 host_triplet = i686-pc-linux-gnu
-AMTAR = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run tar
-AWK = gawk
+AMTAR = ${SHELL} /tmp/LCLintDev/config/missing --run tar
+AWK = mawk
 BISON = bison
 CAT = cat
 CC = gcc
@@ -80,7 +80,7 @@ RM = rm
 VERSION = 3.0.0.19
 am__include = include
 am__quote = 
-install_sh = /net/af10/evans/LCLintDev/config/install-sh
+install_sh = /tmp/LCLintDev/config/install-sh
 
 AUTOMAKE_OPTIONS = 1.5 foreign
 

diff --git a/lib/Makefile b/lib/Makefile
index 1240b493d398c357e9b8d2c553e87d18b199d83f..72d9d245c0f8863cf3de03d1a89c4bc6789210a5 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -38,10 +38,10 @@ pkglibdir = $(libdir)/lclint
 pkgincludedir = $(includedir)/lclint
 top_builddir = ..
 
-ACLOCAL = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run aclocal
-AUTOCONF = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run autoconf
-AUTOMAKE = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run automake
-AUTOHEADER = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run autoheader
+ACLOCAL = ${SHELL} /tmp/LCLintDev/config/missing --run aclocal
+AUTOCONF = ${SHELL} /tmp/LCLintDev/config/missing --run autoconf
+AUTOMAKE = ${SHELL} /tmp/LCLintDev/config/missing --run automake
+AUTOHEADER = ${SHELL} /tmp/LCLintDev/config/missing --run autoheader
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -57,8 +57,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = 
 host_triplet = i686-pc-linux-gnu
-AMTAR = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run tar
-AWK = gawk
+AMTAR = ${SHELL} /tmp/LCLintDev/config/missing --run tar
+AWK = mawk
 BISON = bison
 CAT = cat
 CC = gcc
@@ -80,7 +80,7 @@ RM = rm
 VERSION = 3.0.0.19
 am__include = include
 am__quote = 
-install_sh = /net/af10/evans/LCLintDev/config/install-sh
+install_sh = /tmp/LCLintDev/config/install-sh
 
 AUTOMAKE_OPTIONS = 1.5 foreign
 

diff --git a/src/Makefile.am b/src/Makefile.am
index b28b82226d60e083713a599bf43cca23280a6cdc..d0812957c27a7725d7afe546e5509b6c3a998d5e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -125,7 +125,7 @@ Headers/signature_gen.h signature.c: signature.c.der signature.y
        else \
          $(BISON) $(YFLAGS) -p lsl signature.y; \
          $(CAT) bison.head signature.tab.c bison.reset >signature.c; \
-         $(MV) Headers/signature_gen.h Headers/signature_gen.bak; \
+         -$(MV) Headers/signature_gen.h Headers/signature_gen.bak; \
          $(CAT) bison.head signature.tab.h bison.reset >Headers/signature_gen.h; \
          $(RM) signature.tab.c signature.tab.h; \
        fi
@@ -138,18 +138,22 @@ Headers/cgrammar_tokens.h cgrammar.c: cgrammar.c.der cgrammar.y
          echo '* (see cgrammar.y for explanation)'; \
          $(BISON) $(YFLAGS) cgrammar.y; \
          $(CAT) bison.head cgrammar.tab.c bison.reset >cgrammar.c; \
-         $(MV) Headers/cgrammar_tokens.h Headers/cgrammar_tokens.bak; \
+         -$(MV) Headers/cgrammar_tokens.h Headers/cgrammar_tokens.bak; \
          $(CAT) bison.head cgrammar.tab.h bison.reset >Headers/cgrammar_tokens.h; \
          $(RM) cgrammar.tab.c cgrammar.tab.h; \
        fi
 
-Headers/mtgrammar_tokens.h mtgrammar.c: mtgrammar.c.der mtgrammar.y
+## 10/16/001 drl added copy so that the file mtgrammar.c.der is created
+## also removed the dependency for this file on mtgrammary.c  
+
+Headers/mtgrammar_tokens.h mtgrammar.c: mtgrammar.y
        if test x$(BISON) = xno; then \
          $(CP) mtgrammar.c.der mtgrammar.c; \
        else \
          $(BISON) $(YFLAGS) -p mt mtgrammar.y; \
          $(CAT) bison.head mtgrammar.tab.c bison.reset >mtgrammar.c; \
-         $(MV) Headers/mtgrammar_tokens.h Headers/mtgrammar_tokens.bak; \
+         $(CP) mtgrammar.c mtgrammar.c.der
+         -$(MV) Headers/mtgrammar_tokens.h Headers/mtgrammar_tokens.bak; \
          $(CAT) bison.head mtgrammar.tab.h bison.reset >Headers/mtgrammar_tokens.h; \
          $(RM) mtgrammar.tab.c mtgrammar.tab.h; \
        fi
@@ -161,9 +165,9 @@ Headers/llgrammar_gen.h Headers/llgrammar_gen2.h llgrammar.c: llgrammar.c.der ll
          echo '* Expect 2 shift/reduce conflicts'; \
          $(BISON) $(YFLAGS) -p yl llgrammar.y; \
          $(CAT) bison.head llgrammar.tab.c bison.reset >llgrammar.c; \
-         $(MV) Headers/llgrammar_gen2.h Headers/llgrammar_gen2.bak; \
+         -$(MV) Headers/llgrammar_gen2.h Headers/llgrammar_gen2.bak; \
          $(CAT) bison.head llgrammar.tab.h bison.reset >Headers/llgrammar_gen2.h; \
-         $(MV) Headers/llgrammar_gen.h Headers/llgrammar_gen.bak; \
+         0$(MV) Headers/llgrammar_gen.h Headers/llgrammar_gen.bak; \
          $(CAT) bison.head llgrammar.tab.h bison.reset >Headers/llgrammar_gen.h; \
          $(RM) llgrammar.tab.c llgrammar.tab.h; \
        fi

diff --git a/test/Makefile b/test/Makefile
index 988bc486fe199839d67d06570c73560b65d3660e..fced064a10ee2e34130d4bf1148691872ea8aec8 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -38,10 +38,10 @@ pkglibdir = $(libdir)/lclint
 pkgincludedir = $(includedir)/lclint
 top_builddir = ..
 
-ACLOCAL = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run aclocal
-AUTOCONF = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run autoconf
-AUTOMAKE = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run automake
-AUTOHEADER = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run autoheader
+ACLOCAL = ${SHELL} /tmp/LCLintDev/config/missing --run aclocal
+AUTOCONF = ${SHELL} /tmp/LCLintDev/config/missing --run autoconf
+AUTOMAKE = ${SHELL} /tmp/LCLintDev/config/missing --run automake
+AUTOHEADER = ${SHELL} /tmp/LCLintDev/config/missing --run autoheader
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -57,8 +57,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = 
 host_triplet = i686-pc-linux-gnu
-AMTAR = ${SHELL} /net/af10/evans/LCLintDev/config/missing --run tar
-AWK = gawk
+AMTAR = ${SHELL} /tmp/LCLintDev/config/missing --run tar
+AWK = mawk
 BISON = bison
 CAT = cat
 CC = gcc
@@ -80,7 +80,7 @@ RM = rm
 VERSION = 3.0.0.19
 am__include = include
 am__quote = 
-install_sh = /net/af10/evans/LCLintDev/config/install-sh
+install_sh = /tmp/LCLintDev/config/install-sh
 
 AUTOMAKE_OPTIONS = 1.5 foreign