Update the Makefiles to use more override able values.

Update the various Makefiles to use override able constants.
This commit is contained in:
Cary R 2012-01-02 10:19:20 -08:00
parent ba4137d1e8
commit a433fa3fcd
13 changed files with 14 additions and 16 deletions

View File

@ -47,8 +47,6 @@ CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@
CFLAGS = @WARNING_FLAGS@ @CFLAGS@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
SHARED = @shared@
O = cadpli.o O = cadpli.o
all: dep cadpli.vpl $(ALL32) all: dep cadpli.vpl $(ALL32)
@ -80,7 +78,7 @@ ifeq (@MINGW32@,yes)
endif endif
cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o
$(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS)
install: all installdirs $(vpidir)/cadpli.vpl install: all installdirs $(vpidir)/cadpli.vpl

View File

@ -69,7 +69,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
ivlpp@EXEEXT@: $O ivlpp@EXEEXT@: $O
$(CC) $(LDFLAGS) $O -o ivlpp@EXEEXT@ @EXTRALIBS@ $(CC) $(LDFLAGS) $O -o ivlpp@EXEEXT@ @EXTRALIBS@
lexor.c: lexor.lex lexor.c: $(srcdir)/lexor.lex
$(LEX) -olexor.c $(srcdir)/lexor.lex $(LEX) -olexor.c $(srcdir)/lexor.lex
install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@ install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@

View File

@ -88,7 +88,7 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status
config.h: stamp-config-h config.h: stamp-config-h
libveriuser.o: $O libveriuser.o: $O
$(LD) -r -o $@ $O $(LD) $(LDFLAGS) -r -o $@ $O
libveriuser.a: libveriuser.o libveriuser.a: libveriuser.o
rm -f $@ rm -f $@

View File

@ -83,7 +83,7 @@ else
endif endif
fpga.tgt: $O $(TGTDEPLIBS) fpga.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
iverilog-fpga.ps: $(srcdir)/iverilog-fpga.man iverilog-fpga.ps: $(srcdir)/iverilog-fpga.man
man -t $(srcdir)/iverilog-fpga.man > iverilog-fpga.ps man -t $(srcdir)/iverilog-fpga.man > iverilog-fpga.ps

View File

@ -78,7 +78,7 @@ else
endif endif
null.tgt: $O $(TGTDEPLIBS) null.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf

View File

@ -77,7 +77,7 @@ else
endif endif
pal.tgt: $O $(TGTDEPLIBS) pal.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(LDFLAGS) -lipal $(CC) @shared@ $(LDFLAGS)-o $@ $O $(TGTLDFLAGS) $(LDFLAGS) -lipal
install: all installdirs $(libdir)/ivl/pal.tgt install: all installdirs $(libdir)/ivl/pal.tgt

View File

@ -79,7 +79,7 @@ else
endif endif
stub.tgt: $O $(TGTDEPLIBS) stub.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \ install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf $(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf

View File

@ -77,7 +77,7 @@ else
endif endif
verilog.tgt: $O $(TGTDEPLIBS) verilog.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
install: all installdirs $(libdir)/ivl/verilog.tgt \ install: all installdirs $(libdir)/ivl/verilog.tgt \
$(includedir)/vpi_user.h $(includedir)/vpi_user.h

View File

@ -82,7 +82,7 @@ else
endif endif
vhdl.tgt: $O $(TGTDEPLIBS) vhdl.tgt: $O $(TGTDEPLIBS)
$(CXX) @shared@ -o $@ $O $(TGTLDFLAGS) $(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status
@rm -f $@ @rm -f $@

View File

@ -78,7 +78,7 @@ else
endif endif
vlog95.tgt: $O $(TGTDEPLIBS) vlog95.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf

View File

@ -85,7 +85,7 @@ else
endif endif
vvp.tgt: $O $(TGTDEPLIBS) vvp.tgt: $O $(TGTDEPLIBS)
$(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
vvp.conf: $(srcdir)/vvp.conf.in Makefile vvp.conf: $(srcdir)/vvp.conf.in Makefile
echo 'flag:VVP_EXECUTABLE=$(bindir)/vvp$(suffix)' | cat $(srcdir)/vvp.conf.in - > vvp.conf echo 'flag:VVP_EXECUTABLE=$(bindir)/vvp$(suffix)' | cat $(srcdir)/vvp.conf.in - > vvp.conf

View File

@ -124,12 +124,12 @@ endif
system.vpi: $O $(OPP) ../vvp/libvpi.a system.vpi: $O $(OPP) ../vvp/libvpi.a
$(CXX) @shared@ -o $@ $O $(OPP) -L../vvp $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS) $(CXX) @shared@ -o $@ $O $(OPP) -L../vvp $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS)
sys_readmem_lex.c: sys_readmem_lex.lex sys_readmem_lex.c: $(srcdir)/sys_readmem_lex.lex
$(LEX) -t $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c $(LEX) -t $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c
sdf_lexor.o: sdf_lexor.c sdf_parse.h sdf_lexor.o: sdf_lexor.c sdf_parse.h
sdf_lexor.c: sdf_lexor.lex sdf_lexor.c: $(srcdir)/sdf_lexor.lex
$(LEX) -t $(srcdir)/sdf_lexor.lex > sdf_lexor.c $(LEX) -t $(srcdir)/sdf_lexor.lex > sdf_lexor.c
sdf_parse.c sdf_parse.h: $(srcdir)/sdf_parse.y sdf_parse.c sdf_parse.h: $(srcdir)/sdf_parse.y

View File

@ -129,7 +129,7 @@ vvp@EXEEXT@ libvpi.a: $O $(srcdir)/vvp.def
$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS) $(CXX) $(LDFLAGS) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS)
else else
libvpi.a: libvpi.c libvpi.a: libvpi.c
$(CC) $(CFLAGS) -c $< $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
rm -f libvpi.a rm -f libvpi.a
$(AR) cqv libvpi.a libvpi.o $(AR) cqv libvpi.a libvpi.o
$(RANLIB) libvpi.a $(RANLIB) libvpi.a