From 22886942176a30f70cdac226a8f76a4618b33ed1 Mon Sep 17 00:00:00 2001 From: Cary R Date: Thu, 18 Dec 2008 17:22:25 -0800 Subject: [PATCH] Fix MinGW compilation of driver-vpi. The Makefile.in was incorrectly changed and this broke compilation on MinGW. This patch basically reverts the previous changes and uses a few more $(srcdir) paths. --- driver-vpi/Makefile.in | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index fc9bd8c8d..29f25bc70 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -47,13 +47,12 @@ CPPFLAGS = -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@ CFLAGS = -Wall @CFLAGS@ LDFLAGS = @LDFLAGS@ -all: dep iverilog-vpi@EXEEXT@ +all: iverilog-vpi@EXEEXT@ check: all clean: rm -f *.o config.h iverilog-vpi@EXEEXT@ - rm -rf dep distclean: clean rm -f Makefile config.log @@ -66,20 +65,16 @@ O = main.o res.o iverilog-vpi@EXEEXT@: $O $(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@ +main.o: main.c config.h + $(CC) $(CPPFLAGS) $(CFLAGS) -c $(srcdir)/main.c -config.h: config.h.in Makefile + +config.h: $(srcdir)/config.h.in Makefile sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \ -e 's;@SUFFIX@;$(suffix);g' \ -e 's;@IVLCFLAGS@;@CXXFLAGS@;' \ -e 's;@SHARED@;@shared@;' $< > $@ -dep: - mkdir dep - -%.o: %.c - $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o - mv $*.d dep - # Windows specific... res.o: res.rc windres -i res.rc -o res.o @@ -95,5 +90,3 @@ installdirs: ../mkinstalldirs uninstall: rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@ - --include $(patsubst %.o, dep/%.d, $O)