diff --git a/Makefile.in b/Makefile.in index 14ef02c08..974e141ed 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.161 2003/12/12 04:36:48 steve Exp $" +#ident "$Id: Makefile.in,v 1.162 2004/02/10 19:25:00 steve Exp $" # # SHELL = /bin/sh @@ -43,7 +43,6 @@ mandir = @mandir@ libdir64 = @libdir64@ dllib=@DLLIB@ -rdynamic=@rdynamic@ strip_dynamic=@strip_dynamic@ CC = @CC@ @@ -56,10 +55,10 @@ STRIP = @STRIP@ LEX = @LEX@ YACC = @YACC@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ -CXXFLAGS = @CXXFLAGS@ -I. -I$(srcdir) +CPPFLAGS = @ident_support@ @DEFS@ -I. -I$(srcdir) @CPPFLAGS@ +CXXFLAGS = -Wall @CXXFLAGS@ PICFLAGS = @PICFLAG@ -LDFLAGS = @LDFLAGS@ +LDFLAGS = @rdynamic@ @LDFLAGS@ # The TARGETS variable lists the target modules that can be build and # installed. Some of them depend on external things, so are only @@ -149,7 +148,7 @@ ivl@EXEEXT@: $O ivl.def $(CXX) -o ivl@EXEEXT@ ivl.exp $O $(dllib) @EXTRALIBS@ else ivl@EXEEXT@: $O - $(CXX) $(CXXFLAGS) $(rdynamic) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib) + $(CXX) $(LDFLAGS) -o ivl@EXEEXT@ $O $(dllib) endif @@ -169,7 +168,7 @@ dep: mkdir dep %.o: %.cc - $(CXX) -Wall @ident_support@ $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o mv $*.d dep/$*.d diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index 20a7a6ffa..59e619664 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.8 2003/11/08 19:30:15 steve Exp $" +#ident "$Id: Makefile.in,v 1.9 2004/02/10 19:25:00 steve Exp $" # # SHELL = /bin/sh @@ -38,13 +38,12 @@ vpidir = @libdir@/ivl/@vpidir1@ strip_dynamic=@strip_dynamic@ CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ @@ -69,7 +68,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I$(srcdir) -I$(srcdir)/.. -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< mv $*.d dep O = cadpli.o diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index a793dc78d..b9d3e6042 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.5 2002/12/08 03:06:30 steve Exp $" +#ident "$Id: Makefile.in,v 1.6 2004/02/10 19:25:00 steve Exp $" # # SHELL = /bin/sh @@ -37,14 +37,12 @@ mandir = @mandir@ dllib=@DLLIB@ CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ -CFLAGS = @CFLAGS@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' -CXXFLAGS = @CXXFLAGS@ -I. -I$(srcdir)/.. +CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: iverilog-vpi@EXEEXT@ @@ -63,7 +61,7 @@ iverilog-vpi@EXEEXT@: $O main.o: main.c - $(CC) $(CFLAGS) -c $(srcdir)/main.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c # Windows specific... res.o: res.rc diff --git a/driver/Makefile.in b/driver/Makefile.in index db4063e67..9328c55fa 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.22 2003/11/18 06:31:46 steve Exp $" +#ident "$Id: Makefile.in,v 1.23 2004/02/10 19:25:00 steve Exp $" # # SHELL = /bin/sh @@ -37,14 +37,12 @@ mandir = @mandir@ dllib=@DLLIB@ CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ -CFLAGS = @CFLAGS@ -Wall @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' -CXXFLAGS = @CXXFLAGS@ -I.. -I. -I$(srcdir)/.. -I$(srcdir) +CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: iverilog@EXEEXT@ @@ -70,7 +68,7 @@ cfparse.h cfparse.c: cfparse.y main.o: main.c globals.h - $(CC) $(CFLAGS) -c -DCXX='"@CXX@"' -DIVL_ROOT='"@libdir@/ivl"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c + $(CC) $(CPPFLAGS) $(CFLAGS) -c -DIVL_ROOT='"@libdir@/ivl"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(srcdir)/main.c build_string.o: build_string.c globals.h cflexor.o: cflexor.c cfparse.h cfparse_misc.h globals.h diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in index fa42b6446..ee042462a 100644 --- a/ivlpp/Makefile.in +++ b/ivlpp/Makefile.in @@ -18,7 +18,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.15 2003/09/05 18:04:16 steve Exp $" +#ident "$Id: Makefile.in,v 1.16 2004/02/10 19:25:00 steve Exp $" # # SHELL = /bin/sh @@ -40,8 +40,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ -CFLAGS = @CFLAGS@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) +CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: ivlpp diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index a931e85fb..8bad8bb1f 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.32 2004/01/15 20:52:32 steve Exp $" +#ident "$Id: Makefile.in,v 1.33 2004/02/10 19:25:00 steve Exp $" # # SHELL = /bin/sh @@ -33,13 +33,13 @@ libdir = @libdir@ libdir64 = @libdir64@ includedir = $(prefix)/include -CC = @CC@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. +CC = @CC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ RANLIB = @RANLIB@ @@ -84,7 +84,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall @ident_support@ $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep @@ -112,7 +112,7 @@ bin32: mkdir bin32 bin32/%.o: %.c - $(CC) -m32 -Wall $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ + $(CC) -m32 $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ bin32/libveriuser.o: $(addprefix bin32/,$O) $(LD) -melf_i386 -r -o $@ $(addprefix bin32/,$O) diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index e63cbe914..a540f346c 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -17,7 +17,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.15 2003/11/13 03:10:38 steve Exp $" +#ident "$Id: Makefile.in,v 1.16 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -40,9 +40,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: dep fpga.tgt @@ -51,7 +50,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall @ident_support@ -I.. -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep D = d-generic.o d-generic-edif.o d-lpm.o d-virtex.o d-virtex2.o diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in index bbfb639c2..47291c039 100644 --- a/tgt-null/Makefile.in +++ b/tgt-null/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.10 2003/11/13 03:10:38 steve Exp $" +#ident "$Id: Makefile.in,v 1.11 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -34,14 +34,12 @@ libdir = @libdir@ includedir = $(prefix)/include CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: dep null.tgt @@ -50,7 +48,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I.. -I$(srcdir)/.. -I$(srcdir) $(CPPFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep O = null.o diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in index 8012189ff..c38bb5ee7 100644 --- a/tgt-pal/Makefile.in +++ b/tgt-pal/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.10 2003/02/27 22:13:22 steve Exp $" +#ident "$Id: Makefile.in,v 1.11 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -34,14 +34,12 @@ libdir = @libdir@ includedir = $(prefix)/include CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: dep pal.tgt @@ -50,7 +48,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep O = imain.o dump_final.o emit_jed.o enables.o fit_log.o fit_reg.o pads.o diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index be007436f..82b7d6a2d 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.12 2003/08/22 04:27:10 steve Exp $" +#ident "$Id: Makefile.in,v 1.13 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -39,9 +39,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: dep stub.tgt @@ -50,7 +49,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I.. -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep O = stub.o diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in index 7aa4bc5e6..aee582948 100644 --- a/tgt-verilog/Makefile.in +++ b/tgt-verilog/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.11 2003/08/22 04:27:11 steve Exp $" +#ident "$Id: Makefile.in,v 1.12 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -34,14 +34,12 @@ libdir = @libdir@ includedir = $(prefix)/include CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: dep verilog.tgt @@ -50,7 +48,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I.. -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep O = verilog.o diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index 96f17758b..2e4e53921 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.21 2004/01/28 23:54:10 steve Exp $" +#ident "$Id: Makefile.in,v 1.22 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -38,9 +38,8 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ @PICFLAG@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ all: dep vvp.tgt vvp.conf vvp-s.conf @@ -49,7 +48,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I. -I$(srcdir)/.. @ident_support@ $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep O = vvp.o draw_mux.o draw_vpi.o eval_expr.o eval_real.o vector.o \ diff --git a/vpi/Makefile.in b/vpi/Makefile.in index c84f75143..421097953 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.52 2004/01/28 23:54:21 steve Exp $" +#ident "$Id: Makefile.in,v 1.53 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -38,13 +38,12 @@ vpidir = $(libdir)/ivl/@vpidir1@ strip_dynamic=@strip_dynamic@ CC = @CC@ -CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ @@ -61,7 +60,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall -I. -I$(srcdir)/.. -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_fileio.o \ @@ -92,7 +91,7 @@ bin32: mkdir bin32 bin32/%.o: %.c - $(CC) -m32 -Wall -I$(srcdir)/.. -I$(srcdir) -I.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ + $(CC) -m32 $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@ bin32/system.vpi: $(addprefix bin32/,$O) $(CC) -m32 @shared@ -o $@ $(addprefix bin32/,$O) -L../vvp/bin32 $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS) diff --git a/vpip/Makefile.in b/vpip/Makefile.in index a61e71ff2..4041d5f86 100644 --- a/vpip/Makefile.in +++ b/vpip/Makefile.in @@ -18,7 +18,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.7 2003/02/27 22:13:22 steve Exp $" +#ident "$Id: Makefile.in,v 1.8 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -34,15 +34,13 @@ bindir = @bindir@ libdir = @libdir@ includedir = $(prefix)/include -CC = @CC@ -I$(srcdir) -I$(srcdir)/.. -CXX = @CXX@ -I$(srcdir) -I$(srcdir)/.. +CC = @CC@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @CPPFLAGS@ @DEFS@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ +CPPFLAGS = @ident_support@ -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ +CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ STRIP = @STRIP@ @@ -73,7 +71,7 @@ dep: mkdir dep %.o: %.c - $(CC) -Wall $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 49a31814d..6c92abe7e 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.58 2003/11/08 16:20:33 steve Exp $" +#ident "$Id: Makefile.in,v 1.59 2004/02/10 19:25:01 steve Exp $" # # SHELL = /bin/sh @@ -36,7 +36,7 @@ libdir64 = @libdir64@ CC = @CC@ HOSTCC = @CC@ -CXX = @CXX@ -Wall +CXX = @CXX@ INSTALL = @INSTALL@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -46,14 +46,12 @@ RANLIB = @RANLIB@ LEX = @LEX@ YACC = @YACC@ -CPPFLAGS = -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ -CXXFLAGS = @CXXFLAGS@ -CFLAGS = @CFLAGS@ -LDFLAGS = @LDFLAGS@ +CPPFLAGS = @ident_support@ -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ +CXXFLAGS = -Wall @CXXFLAGS@ +LDFLAGS = @rdynamic@ @LDFLAGS@ LIBS = @LIBS@ @EXTRALIBS@ dllib=@DLLIB@ -rdynamic=@rdynamic@ MDIR1 = -DMODULE_DIR1=\"$(libdir)/ivl/@vpidir1@\" ifneq (x@vpidir2@,x) @@ -106,18 +104,18 @@ libvpi.a: libvpi.c $(RANLIB) libvpi.a vvp: $O - $(CXX) $(rdynamic) $(CXXFLAGS) $(LDFLAGS) -o vvp $O $(LIBS) $(dllib) + $(CXX) $(LDFLAGS) -o vvp $O $(LIBS) $(dllib) endif dep: mkdir dep %.o: %.cc - $(CXX) @ident_support@ $(CPPFLAGS) $(CFLAGS) $(MDIR1) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $*.o + $(CXX) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $*.o mv $*.d dep/$*.d %.o: %.c - $(CC) @ident_support@ $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $*.o + $(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep/$*.d tables.cc: $(srcdir)/draw_tt.c @@ -133,18 +131,18 @@ bin32: mkdir bin32 bin32/%.o: %.cc - $(CXX) -m32 -DHAVE_CVS_IDENT=1 $(CPPFLAGS) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $@ + $(CXX) -m32 $(CPPFLAGS) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $@ bin32/%.o: %.c - $(CC) -m32 -DHAVE_CVS_IDENT=1 $(CPPFLAGS) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $@ + $(CC) -m32 $(CPPFLAGS) $(MDIR2) $(CFLAGS) -MD -c $< -o $@ bin32/lexor.o: lexor.cc parse.h vvp32: $(addprefix bin32/,$O) bin32/libvpi.a - $(CXX) -m32 $(rdynamic) $(CXXFLAGS) $(LDFLAGS) -o vvp32 $(addprefix bin32/,$O) $(LIBS) $(dllib) + $(CXX) -m32 $(LDFLAGS) -o vvp32 $(addprefix bin32/,$O) $(LIBS) $(dllib) bin32/libvpi.a: libvpi.c - $(CC) -m32 -c -o bin32/libvpi.o $(srcdir)/libvpi.c + $(CC) -m32 $(CPPFLAGS) $(CFLAGS) -o bin32/libvpi.o -c $(srcdir)/libvpi.c rm -f bin32/libvpi.a ar cqv bin32/libvpi.a bin32/libvpi.o $(RANLIB) bin32/libvpi.a