diff --git a/Makefile.in b/Makefile.in index 0e385ea58..8c2d66107 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,7 +77,7 @@ MAN = @MAN@ PS2PDF = @PS2PDF@ GIT = @GIT@ -CPPFLAGS = @ident_support@ @DEFS@ -I. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ +CPPFLAGS = @DEFS@ -I. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ CXXFLAGS = -Wall @CXXFLAGS@ PICFLAGS = @PICFLAG@ LDFLAGS = @rdynamic@ @LDFLAGS@ diff --git a/aclocal.m4 b/aclocal.m4 index 0c140fc0a..5398aacda 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,28 +1,3 @@ -# AX_CPP_IDENT -# ------------ -# Check if the C compiler supports #ident -# Define and substitute ident_support if so. -# -# It would be simpler and more consistent with the rest of the autoconf -# structure to AC_DEFINE(HAVE_CPP_IDENT) instead of -# ident_support='-DHAVE_CVS_IDENT=1' and AC_SUBST(ident_support), but that -# change would require all C files in the icarus top level directory to -# put #include before the #ifdef HAVE_CVS_IDENT (and change -# HAVE_CVS_IDENT to HAVE_CPP_IDENT). That would also remove all special -# ident_support handling from the Makefile. Manyana. -# -AC_DEFUN([AX_CPP_IDENT], -[AC_CACHE_CHECK([for ident support in C compiler], ax_cv_cpp_ident, -[AC_TRY_COMPILE([ -#ident "$Id: aclocal.m4,v 1.7 2007/05/16 23:59:12 steve Exp $" -],[while (0) {}], -[AS_VAR_SET(ax_cv_cpp_ident, yes)], -[AS_VAR_SET(ax_cv_cpp_ident, no)])]) -if test $ax_cv_cpp_ident = yes; then - ident_support='-DHAVE_CVS_IDENT=1' -fi -AC_SUBST(ident_support) -])# AC_CPP_IDENT # AX_ENABLE_SUFFIX # ---------------- diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index 669961ff6..86f1cb4f2 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -39,7 +39,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/cadpli/configure.in b/cadpli/configure.in index fa55d815a..12e1f2601 100644 --- a/cadpli/configure.in +++ b/cadpli/configure.in @@ -58,6 +58,4 @@ AX_C_UNDERSCORES_TRAILING ## end of test for underscores ####################### -AX_CPP_IDENT - AC_OUTPUT(Makefile) diff --git a/configure.in b/configure.in index ab66fb7a8..ff001db97 100644 --- a/configure.in +++ b/configure.in @@ -121,8 +121,6 @@ AX_C_UNDERSCORES_TRAILING ## end of test for underscores ####################### -AX_CPP_IDENT - # XXX disable tgt-fpga for the moment AC_CONFIG_SUBDIRS(vvp vpi tgt-stub tgt-null tgt-vvp tgt-vhdl libveriuser cadpli) diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index c484e4e32..46d937906 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -43,7 +43,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ +CPPFLAGS = -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/driver/Makefile.in b/driver/Makefile.in index f624bd427..8e9c6ee03 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -43,7 +43,7 @@ INSTALL_DATA = @INSTALL_DATA@ MAN = @MAN@ PS2PDF = @PS2PDF@ -CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ +CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in index c4e0b1ccf..ef4fa0e7f 100644 --- a/ivlpp/Makefile.in +++ b/ivlpp/Makefile.in @@ -42,7 +42,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ +CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index 5c69e5485..7a4591c34 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -38,7 +38,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ RANLIB = @RANLIB@ diff --git a/libveriuser/configure.in b/libveriuser/configure.in index d3a37b8d9..9d2241442 100644 --- a/libveriuser/configure.in +++ b/libveriuser/configure.in @@ -8,7 +8,6 @@ AC_PROG_INSTALL AC_PROG_RANLIB AC_EXEEXT -AX_CPP_IDENT AX_ENABLE_SUFFIX diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 0413f258b..ed9b0c96e 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -42,7 +42,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/tgt-fpga/configure.in b/tgt-fpga/configure.in index 5481e1d8f..4abaa5a87 100644 --- a/tgt-fpga/configure.in +++ b/tgt-fpga/configure.in @@ -25,6 +25,4 @@ AX_C_PICFLAG # linker options when building a shared library AX_LD_SHAREDLIB_OPTS -AX_CPP_IDENT - AC_OUTPUT(Makefile) diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in index c38bb5ee7..3c89e6bc3 100644 --- a/tgt-pal/Makefile.in +++ b/tgt-pal/Makefile.in @@ -38,7 +38,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index b77bd6ec9..ecf50b22f 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -37,7 +37,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I.. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I.. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/tgt-stub/configure.in b/tgt-stub/configure.in index 5f3b050bb..40f724eb9 100644 --- a/tgt-stub/configure.in +++ b/tgt-stub/configure.in @@ -23,6 +23,4 @@ AX_C_PICFLAG # linker options when building a shared library AX_LD_SHAREDLIB_OPTS -AX_CPP_IDENT - AC_OUTPUT(Makefile) diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index 20423541e..d7e32fc0e 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -38,7 +38,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ @PICFLAG@ CXXFLAGS = -Wall @CXXFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/tgt-vhdl/configure.in b/tgt-vhdl/configure.in index 52ca76897..88219335a 100644 --- a/tgt-vhdl/configure.in +++ b/tgt-vhdl/configure.in @@ -27,6 +27,4 @@ AX_C_PICFLAG # linker options when building a shared library AX_LD_SHAREDLIB_OPTS -AX_CPP_IDENT - AC_OUTPUT(Makefile) diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index 4c1076523..476b4458d 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -40,7 +40,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/tgt-vvp/configure.in b/tgt-vvp/configure.in index 9a245752a..91d0fd5d6 100644 --- a/tgt-vvp/configure.in +++ b/tgt-vvp/configure.in @@ -36,6 +36,4 @@ AX_C_PICFLAG # linker options when building a shared library AX_LD_SHAREDLIB_OPTS -AX_CPP_IDENT - AC_OUTPUT(Makefile) diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 77c5b492b..6d45a5043 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -41,7 +41,7 @@ INSTALL_DATA = @INSTALL_DATA@ LEX = @LEX@ YACC = @YACC@ -CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@ +CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ diff --git a/vpi/configure.in b/vpi/configure.in index bf3d8f775..9b671d539 100644 --- a/vpi/configure.in +++ b/vpi/configure.in @@ -84,6 +84,4 @@ AX_LD_RDYNAMIC # linker options when building a shared library AX_LD_SHAREDLIB_OPTS -AX_CPP_IDENT - AC_OUTPUT(Makefile) diff --git a/vvp/Makefile.in b/vvp/Makefile.in index ad4f066ce..791d64484 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -50,7 +50,7 @@ YACC = @YACC@ MAN = @MAN@ PS2PDF = @PS2PDF@ -CPPFLAGS = @ident_support@ -I. -I.. -I $(srcdir) -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ +CPPFLAGS = -I. -I.. -I $(srcdir) -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CXXFLAGS = -Wall @CXXFLAGS@ LDFLAGS = @rdynamic@ @LDFLAGS@ LIBS = @LIBS@ @EXTRALIBS@ diff --git a/vvp/configure.in b/vvp/configure.in index 3ffa8bc4c..7496dfb92 100644 --- a/vvp/configure.in +++ b/vvp/configure.in @@ -106,8 +106,6 @@ AX_LD_RDYNAMIC AX_LD_EXTRALIBS -AX_CPP_IDENT - # If not otherwise specified, set the libdir64 variable # to the same as libdir. AC_MSG_CHECKING(for libdir64 path)