Permalink
Browse files

Makefile cleanup.

  • Loading branch information...
1 parent d482e34 commit 8188c4c69054742647535ce25ca26cd987f7e77c steve committed Feb 10, 2004
View
@@ -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
View
@@ -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
View
@@ -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
View
@@ -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
View
@@ -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
View
@@ -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)
View
@@ -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
View
@@ -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
View
@@ -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
View
@@ -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
View
@@ -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
Oops, something went wrong.

0 comments on commit 8188c4c

Please sign in to comment.