From f1c5c8700ba6941c397a59aaefcb8ac9990d4971 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 2 Apr 2026 11:13:45 +0200
Subject: [PATCH] vvp: add DLLIB to LIBS to simplify build rules

---
 vvp/Makefile.in | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/vvp/Makefile.in b/vvp/Makefile.in
index 480eb205c..fbdb2aeff 100644
--- a/vvp/Makefile.in
+++ b/vvp/Makefile.in
@@ -62,7 +62,7 @@ CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ -DICARUS_VPI_CONST=const
 CFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CC@ @CFLAGS@
 CXXFLAGS = @WARNING_FLAGS@ @WARNING_FLAGS_CXX@ @CXXFLAGS@
 LDFLAGS = @rdynamic@ @LDFLAGS@
-LIBS = @LIBS@ @EXTRALIBS@
+LIBS = @LIBS@ @EXTRALIBS@ @DLLIB@
 
 LIBVVP_VERSION = @LIBVVP_VERSION@
 LIBVVP_SOVERSION = @LIBVVP_SOVERSION@
@@ -83,8 +83,6 @@ SLDIR=$(libdir)
 SLEXT=so
 endif
 
-dllib=@DLLIB@
-
 MDIR1 = -DMODULE_DIR1='"$(libdir)/ivl$(suffix)"'
 
 VPI = vpi_modules.o vpi_bit.o vpi_callback.o vpi_cobject.o vpi_const.o vpi_darray.o \
@@ -185,10 +183,10 @@ ifeq (@WIN32@,yes)
 # cocotb to build VPI modules without using our vpi_user.h and libvpi.a.
 # The .def file controls what is exported.
 vvp@EXEEXT@: main.o $O $(srcdir)/vvp.def
-	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ $(LDFLAGS) $(srcdir)/vvp.def main.o $O $(dllib) $(LIBS)
+	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ $(LDFLAGS) $(srcdir)/vvp.def main.o $O $(LIBS)
 else
 vvp@EXEEXT@: $O main.o
-	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ main.o $O $(LIBS) $(dllib)
+	$(CXX) $(LDFLAGS) -o vvp@EXEEXT@ main.o $O $(LIBS)
 endif
 endif