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.
This commit is contained in:
parent
9ff319b39b
commit
2288694217
|
|
@ -47,13 +47,12 @@ CPPFLAGS = -I. -I$(srcdir)/.. -DVERSION='"$(VERSION)"' @CPPFLAGS@ @DEFS@
|
||||||
CFLAGS = -Wall @CFLAGS@
|
CFLAGS = -Wall @CFLAGS@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
|
|
||||||
all: dep iverilog-vpi@EXEEXT@
|
all: iverilog-vpi@EXEEXT@
|
||||||
|
|
||||||
check: all
|
check: all
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f *.o config.h iverilog-vpi@EXEEXT@
|
rm -f *.o config.h iverilog-vpi@EXEEXT@
|
||||||
rm -rf dep
|
|
||||||
|
|
||||||
distclean: clean
|
distclean: clean
|
||||||
rm -f Makefile config.log
|
rm -f Makefile config.log
|
||||||
|
|
@ -66,20 +65,16 @@ O = main.o res.o
|
||||||
iverilog-vpi@EXEEXT@: $O
|
iverilog-vpi@EXEEXT@: $O
|
||||||
$(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@
|
$(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@;' \
|
sed -e 's;@IVLCC@;@CC@;' -e 's;@IVLCXX@;@CXX@;' \
|
||||||
-e 's;@SUFFIX@;$(suffix);g' \
|
-e 's;@SUFFIX@;$(suffix);g' \
|
||||||
-e 's;@IVLCFLAGS@;@CXXFLAGS@;' \
|
-e 's;@IVLCFLAGS@;@CXXFLAGS@;' \
|
||||||
-e 's;@SHARED@;@shared@;' $< > $@
|
-e 's;@SHARED@;@shared@;' $< > $@
|
||||||
|
|
||||||
dep:
|
|
||||||
mkdir dep
|
|
||||||
|
|
||||||
%.o: %.c
|
|
||||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
|
||||||
mv $*.d dep
|
|
||||||
|
|
||||||
# Windows specific...
|
# Windows specific...
|
||||||
res.o: res.rc
|
res.o: res.rc
|
||||||
windres -i res.rc -o res.o
|
windres -i res.rc -o res.o
|
||||||
|
|
@ -95,5 +90,3 @@ installdirs: ../mkinstalldirs
|
||||||
|
|
||||||
uninstall:
|
uninstall:
|
||||||
rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
|
rm -f $(bindir)/iverilog-vpi$(suffix)@EXEEXT@
|
||||||
|
|
||||||
-include $(patsubst %.o, dep/%.d, $O)
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue