From 914641fc89204deb2f8021f9420a856a182c20b7 Mon Sep 17 00:00:00 2001 From: drl7x Date: Wed, 17 Oct 2001 02:43:23 +0000 Subject: [PATCH] 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. --- config.h | 4 ++-- imports/Makefile | 14 +++++++------- lib/Makefile | 14 +++++++------- src/Makefile.am | 16 ++++++++++------ test/Makefile | 14 +++++++------- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/config.h b/config.h index 4db4252..bc6b9c5 100644 --- 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 d422376..c84ac2c 100644 --- 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 1240b49..72d9d24 100644 --- 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 b28b822..d081295 100644 --- 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 988bc48..fced064 100644 --- 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 -- 2.45.2