diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index 2aa370ea7..24f52ebab 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -47,8 +47,6 @@ CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@
 CFLAGS = @WARNING_FLAGS@ @CFLAGS@
 LDFLAGS = @LDFLAGS@
 
-SHARED = @shared@
-
 O = cadpli.o
 
 all: dep cadpli.vpl $(ALL32)
@@ -80,7 +78,7 @@ ifeq (@MINGW32@,yes)
 endif
 
 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
 
diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in
index 62a799e98..9245bf18e 100644
--- a/ivlpp/Makefile.in
+++ b/ivlpp/Makefile.in
@@ -69,7 +69,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
 ivlpp@EXEEXT@: $O
 	$(CC) $(LDFLAGS) $O -o ivlpp@EXEEXT@ @EXTRALIBS@
 
-lexor.c: lexor.lex
+lexor.c: $(srcdir)/lexor.lex
 	$(LEX) -olexor.c $(srcdir)/lexor.lex
 
 install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@
diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in
index 52154fbbf..dc8bf3f46 100644
--- a/libveriuser/Makefile.in
+++ b/libveriuser/Makefile.in
@@ -88,7 +88,7 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status
 config.h: stamp-config-h
 
 libveriuser.o: $O
-	$(LD) -r -o $@ $O
+	$(LD) $(LDFLAGS) -r -o $@ $O
 
 libveriuser.a: libveriuser.o
 	rm -f $@
diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in
index db72580a6..a8491da7e 100644
--- a/tgt-fpga/Makefile.in
+++ b/tgt-fpga/Makefile.in
@@ -83,7 +83,7 @@ else
 endif
 
 fpga.tgt: $O $(TGTDEPLIBS)
-	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
+	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
 
 iverilog-fpga.ps: $(srcdir)/iverilog-fpga.man
 	man -t $(srcdir)/iverilog-fpga.man > iverilog-fpga.ps
diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in
index c3b2d6f85..8a354ef97 100644
--- a/tgt-null/Makefile.in
+++ b/tgt-null/Makefile.in
@@ -78,7 +78,7 @@ else
 endif
 
 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
 
diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in
index 31f3ce7f3..7ae034a09 100644
--- a/tgt-pal/Makefile.in
+++ b/tgt-pal/Makefile.in
@@ -77,7 +77,7 @@ else
 endif
 
 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
 
diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in
index a1fa69549..b9df1d927 100644
--- a/tgt-stub/Makefile.in
+++ b/tgt-stub/Makefile.in
@@ -79,7 +79,7 @@ else
 endif
 
 stub.tgt: $O $(TGTDEPLIBS)
-	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
+	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
 
 install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \
 	$(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf
diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in
index 60f692780..b1ba3d771 100644
--- a/tgt-verilog/Makefile.in
+++ b/tgt-verilog/Makefile.in
@@ -77,7 +77,7 @@ else
 endif
 
 verilog.tgt: $O $(TGTDEPLIBS)
-	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
+	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
 
 install: all installdirs $(libdir)/ivl/verilog.tgt \
 	$(includedir)/vpi_user.h
diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in
index 553edceab..8487fc1ab 100644
--- a/tgt-vhdl/Makefile.in
+++ b/tgt-vhdl/Makefile.in
@@ -82,7 +82,7 @@ else
 endif
 
 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
 	@rm -f $@
diff --git a/tgt-vlog95/Makefile.in b/tgt-vlog95/Makefile.in
index cfe1b5973..2c95d9e55 100644
--- a/tgt-vlog95/Makefile.in
+++ b/tgt-vlog95/Makefile.in
@@ -78,7 +78,7 @@ else
 endif
 
 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
 
diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in
index 4438c8c62..9edeb32ec 100644
--- a/tgt-vvp/Makefile.in
+++ b/tgt-vvp/Makefile.in
@@ -85,7 +85,7 @@ else
 endif
 
 vvp.tgt: $O $(TGTDEPLIBS)
-	$(CC) @shared@ -o $@ $O $(TGTLDFLAGS)
+	$(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS)
 
 vvp.conf: $(srcdir)/vvp.conf.in Makefile
 	echo 'flag:VVP_EXECUTABLE=$(bindir)/vvp$(suffix)' | cat $(srcdir)/vvp.conf.in - > vvp.conf
diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 2cdef7762..45dd03fee 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -124,12 +124,12 @@ endif
 system.vpi: $O $(OPP) ../vvp/libvpi.a
 	$(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
 
 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
 
 sdf_parse.c sdf_parse.h: $(srcdir)/sdf_parse.y
diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index 6a7d278e2..beaf67387 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -129,7 +129,7 @@ vvp@EXEEXT@ libvpi.a: $O $(srcdir)/vvp.def
 	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS)
 else
 libvpi.a: libvpi.c
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(CPPFLAGS) $(CFLAGS) -c $<
 	rm -f libvpi.a
 	$(AR) cqv libvpi.a libvpi.o
 	$(RANLIB) libvpi.a