From 081fe1c816c2467073aa957615b12505b8e2378b Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 13:24:53 +0800 Subject: [PATCH 01/22] [1/20]vvp/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- vvp/Makefile.in | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 8d5724abb..709d64456 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -162,18 +162,18 @@ vvp.pdf: vvp.ps ifeq (@MINGW32@,yes) ifeq ($(MAN),none) -INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1 +INSTALL_DOC = installman else ifeq ($(PS2PDF),none) -INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1 +INSTALL_DOC = installman else -INSTALL_DOC = $(prefix)/vvp$(suffix).pdf $(mandir)/man1/vvp$(suffix).1 +INSTALL_DOC = installpdf installman all: vvp.pdf endif endif INSTALL_DOCDIR = $(mandir)/man1 else -INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1 +INSTALL_DOC = installman INSTALL_DOCDIR = $(mandir)/man1 endif @@ -182,17 +182,19 @@ stamp-config-h: $(srcdir)/config.h.in ../config.status cd ..; ./config.status --header=vvp/config.h config.h: stamp-config-h -install: all installdirs $(bindir)/vvp$(suffix)@EXEEXT@ $(INSTALL_DOC) +install: all installdirs installfiles -$(bindir)/vvp$(suffix)@EXEEXT@: ./vvp@EXEEXT@ - $(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@" +F = ./vvp@EXEEXT@ $(INSTALL_DOC) -$(mandir)/man1/vvp$(suffix).1: vvp.man +installman: installdirs $(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1" -$(prefix)/vvp$(suffix).pdf: vvp.pdf +installpdf: installdirs $(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf" +installfiles: $(F) installdirs + $(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@" + installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(INSTALL_DOCDIR)" From 0c12a24cfdb559921a4baf4800c162b98fde5dd5 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 13:37:45 +0800 Subject: [PATCH 02/22] [2/20]vpi/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- vpi/Makefile.in | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 44ab8915d..b85b1016f 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -187,38 +187,25 @@ stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status cd ..; ./config.status --header=vpi/vpi_config.h vpi_config.h: stamp-vpi_config-h -install: all installdirs \ - $(libdir)/libvpi$(suffix).a \ - $(vpidir)/system.vpi \ - $(vpidir)/va_math.vpi \ - $(vpidir)/v2005_math.vpi \ - $(vpidir)/v2009.vpi \ - $(vpidir)/vhdl_sys.vpi \ - $(vpidir)/vhdl_textio.vpi \ - $(vpidir)/vpi_debug.vpi +install: all installdirs installfiles -$(libdir)/libvpi$(suffix).a : ./libvpi.a - $(INSTALL_DATA) libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a" +F = ./libvpi.a \ + ./system.vpi \ + ./va_math.vpi \ + ./v2005_math.vpi \ + ./v2009.vpi \ + ./vhdl_sys.vpi \ + ./vhdl_textio.vpi \ + ./vpi_debug.vpi -$(vpidir)/system.vpi: ./system.vpi +installfiles: $(F) installdirs + $(INSTALL_DATA) ./libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a" $(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi" - -$(vpidir)/va_math.vpi: ./va_math.vpi $(INSTALL_PROGRAM) ./va_math.vpi "$(DESTDIR)$(vpidir)/va_math.vpi" - -$(vpidir)/v2005_math.vpi: ./v2005_math.vpi $(INSTALL_PROGRAM) ./v2005_math.vpi "$(DESTDIR)$(vpidir)/v2005_math.vpi" - -$(vpidir)/v2009.vpi: ./v2009.vpi $(INSTALL_PROGRAM) ./v2009.vpi "$(DESTDIR)$(vpidir)/v2009.vpi" - -$(vpidir)/vhdl_sys.vpi: ./vhdl_sys.vpi $(INSTALL_PROGRAM) ./vhdl_sys.vpi "$(DESTDIR)$(vpidir)/vhdl_sys.vpi" - -$(vpidir)/vhdl_textio.vpi: ./vhdl_textio.vpi $(INSTALL_PROGRAM) ./vhdl_textio.vpi "$(DESTDIR)$(vpidir)/vhdl_textio.vpi" - -$(vpidir)/vpi_debug.vpi: ./vpi_debug.vpi $(INSTALL_PROGRAM) ./vpi_debug.vpi "$(DESTDIR)$(vpidir)/vpi_debug.vpi" installdirs: $(srcdir)/../mkinstalldirs From 0100c0bc5ce9b51f0d33c872dc91bb72b18e16dd Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 13:41:56 +0800 Subject: [PATCH 03/22] [3/20]vhdlpp/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- vhdlpp/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in index 348d790bf..bf4539443 100644 --- a/vhdlpp/Makefile.in +++ b/vhdlpp/Makefile.in @@ -127,9 +127,11 @@ lexor_keyword.o: lexor_keyword.cc parse.h lexor_keyword.cc: $(srcdir)/lexor_keyword.gperf gperf -o -i 7 --ignore-case -C -k 1-4,6,9,$$ -H keyword_hash -N check_identifier -t $(srcdir)/lexor_keyword.gperf > lexor_keyword.cc || (rm -f lexor_keyword.cc ; false) -install: all installdirs $(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@ +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@: vhdlpp@EXEEXT@ +F = vhdlpp@EXEEXT@ + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./vhdlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@" installdirs: $(srcdir)/../mkinstalldirs From bd130786ff69d9ff65122ed529a2ce8bf7c34780 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 13:49:35 +0800 Subject: [PATCH 04/22] [4/20]tgt-vvp/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-vvp/Makefile.in | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index a9b4fd0a6..eb827d174 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -104,17 +104,16 @@ stamp-vvp_config-h: $(srcdir)/vvp_config.h.in ../config.status cd ..; ./config.status --header=tgt-vvp/vvp_config.h vvp_config.h: stamp-vvp_config-h -install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt +F = ./vvp.tgt \ + ./vvp.conf \ + ./vvp-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt" - -$(libdir)/ivl$(suffix)/vvp.conf: vvp.conf - $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf" - -$(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf - $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf" - + $(INSTALL_DATA) ./vvp.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf" + $(INSTALL_DATA) ./vvp-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" From c1229b756505bd45eee0953ffd6b2dc578fb616e Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 13:52:58 +0800 Subject: [PATCH 05/22] [5/20]tgt-vlog95:Remove useless $(INSTALL_DOC) fix install timestamp check and Remove useless $(INSTALL_DOC) Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-vlog95/Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tgt-vlog95/Makefile.in b/tgt-vlog95/Makefile.in index 609a0765f..59239b174 100644 --- a/tgt-vlog95/Makefile.in +++ b/tgt-vlog95/Makefile.in @@ -81,18 +81,17 @@ endif vlog95.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ $(LDFLAGS) -o $@ $O -lm $(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 installfiles -$(libdir)/ivl$(suffix)/vlog95.tgt: ./vlog95.tgt +F = ./vlog95.tgt \ + $(srcdir)/vlog95.conf \ + $(srcdir)/vlog95-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt" - -$(libdir)/ivl$(suffix)/vlog95.conf: $(srcdir)/vlog95.conf $(INSTALL_DATA) $(srcdir)/vlog95.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.conf" - -$(libdir)/ivl$(suffix)/vlog95-s.conf: $(srcdir)/vlog95-s.conf $(INSTALL_DATA) $(srcdir)/vlog95-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95-s.conf" - installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)" From 439d4405ddc3039ba72b22e02af5412b714a8f2d Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 13:58:29 +0800 Subject: [PATCH 06/22] [6/20]tgt-vhdl/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-vhdl/Makefile.in | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index 3d21f057e..c8ce6a855 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -90,17 +90,16 @@ stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status cd ..; ./config.status --header=tgt-vhdl/vhdl_config.h vhdl_config.h: stamp-vhdl_config-h -install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf \ - $(libdir)/ivl$(suffix)/vhdl-s.conf +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/vhdl.tgt: ./vhdl.tgt +F = ./vhdl.tgt \ + ./vhdl.conf \ + ./vhdl-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt" - -$(libdir)/ivl$(suffix)/vhdl.conf: vhdl.conf - $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" - -$(libdir)/ivl$(suffix)/vhdl-s.conf: vhdl-s.conf - $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" + $(INSTALL_DATA) ./vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" + $(INSTALL_DATA) ./vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" From 404e475022666d082c17449267d42fb920d0b339 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:28:42 +0800 Subject: [PATCH 07/22] [7/20]tgt-verilog/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-verilog/Makefile.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in index b06b4f889..d1498ed17 100644 --- a/tgt-verilog/Makefile.in +++ b/tgt-verilog/Makefile.in @@ -80,12 +80,14 @@ endif verilog.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -install: all installdirs $(libdir)/ivl/verilog.tgt \ - $(includedir)/vpi_user.h +install: all installdirs installfiles -$(libdir)/ivl/verilog.tgt: ./verilog.tgt +F = ./verilog.tgt \ + $(srcdir)/vpi_user.h + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt" - + $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl" From af152bec3206b02a2f73dd9e9dd0d92c10aa68aa Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:30:02 +0800 Subject: [PATCH 08/22] [8/20]tgt-stub/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-stub/Makefile.in | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index f00597ae3..8be486b2d 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -82,17 +82,16 @@ endif stub.tgt: $O $(TGTDEPLIBS) $(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 +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/stub.tgt: ./stub.tgt +F = ./stub.tgt \ + ./stub.conf \ + ./stub-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt" - -$(libdir)/ivl$(suffix)/stub.conf: stub.conf - $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" - -$(libdir)/ivl$(suffix)/stub-s.conf: stub-s.conf - $(INSTALL_DATA) $< "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" + $(INSTALL_DATA) ./stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" + $(INSTALL_DATA) ./stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" From b5a44195ff6ff66ca058cfca0520dab976edb5e9 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:30:44 +0800 Subject: [PATCH 09/22] [9/20]tgt-sizer/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-sizer/Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tgt-sizer/Makefile.in b/tgt-sizer/Makefile.in index 370198ad9..0da8f3f3b 100644 --- a/tgt-sizer/Makefile.in +++ b/tgt-sizer/Makefile.in @@ -81,18 +81,17 @@ endif sizer.tgt: $O $(TGTDEPLIBS) $(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -install: all installdirs $(libdir)/ivl$(suffix)/sizer.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/sizer.conf $(libdir)/ivl$(suffix)/sizer-s.conf +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/sizer.tgt: ./sizer.tgt +F = ./sizer.tgt \ + $(srcdir)/sizer.conf \ + $(srcdir)/sizer-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt" - -$(libdir)/ivl$(suffix)/sizer.conf: $(srcdir)/sizer.conf $(INSTALL_DATA) $(srcdir)/sizer.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.conf" - -$(libdir)/ivl$(suffix)/sizer-s.conf: $(srcdir)/sizer-s.conf $(INSTALL_DATA) $(srcdir)/sizer-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer-s.conf" - installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)" From d7e1df563868352b0a5a0cff8fb9ab62fd2623bc Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:34:43 +0800 Subject: [PATCH 10/22] [10/20]tgt-pcb/Makefile.in:Remove useless $(INSTALL_DOC) fix install timestamp check and Remove useless $(INSTALL_DOC) Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-pcb/Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in index 79fb9531f..8aa0fbc8f 100644 --- a/tgt-pcb/Makefile.in +++ b/tgt-pcb/Makefile.in @@ -105,18 +105,17 @@ endif pcb.tgt: $O $(TGTDEPLIBS) $(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -install: all installdirs $(libdir)/ivl$(suffix)/pcb.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/pcb.conf $(libdir)/ivl$(suffix)/pcb-s.conf +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/pcb.tgt: ./pcb.tgt +F = ./pcb.tgt \ + $(srcdir)/pcb.conf \ + $(srcdir)/pcb-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt" - -$(libdir)/ivl$(suffix)/pcb.conf: $(srcdir)/pcb.conf $(INSTALL_DATA) $(srcdir)/pcb.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.conf" - -$(libdir)/ivl$(suffix)/pcb-s.conf: $(srcdir)/pcb-s.conf $(INSTALL_DATA) $(srcdir)/pcb-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb-s.conf" - installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)" From 13137224388e5b5a301d2b20cb3ccbe7181e54c5 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:37:20 +0800 Subject: [PATCH 11/22] [11/20]tgt-pal/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-pal/Makefile.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in index f3b06cb81..56f2114d9 100644 --- a/tgt-pal/Makefile.in +++ b/tgt-pal/Makefile.in @@ -80,12 +80,13 @@ endif pal.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -lipal -install: all installdirs $(libdir)/ivl/pal.tgt +install: all installdirs installfiles -$(libdir)/ivl/pal.tgt: ./pal.tgt +F = ./pal.tgt + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt" - installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)/$(libdir)/ivl" From 5f0f186b5129fe382b8941bd4528e79d25d11df1 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:41:12 +0800 Subject: [PATCH 12/22] [12/20]tgt-null/Makefile.in:Remove useless $(INSTALL_DOC) fix install timestamp check and Remove useless $(INSTALL_DOC) Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-null/Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in index 0bf2434d9..3a1c6a529 100644 --- a/tgt-null/Makefile.in +++ b/tgt-null/Makefile.in @@ -81,18 +81,17 @@ endif null.tgt: $O $(TGTDEPLIBS) $(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 installfiles -$(libdir)/ivl$(suffix)/null.tgt: ./null.tgt +F = ./null.tgt \ + $(srcdir)/null.conf \ + $(srcdir)/null-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt" - -$(libdir)/ivl$(suffix)/null.conf: $(srcdir)/null.conf $(INSTALL_DATA) $(srcdir)/null.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf" - -$(libdir)/ivl$(suffix)/null-s.conf: $(srcdir)/null-s.conf $(INSTALL_DATA) $(srcdir)/null-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf" - installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)" From f517b5fc4ea2e90ae29ad73c55b439dc80f46eb8 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:55:14 +0800 Subject: [PATCH 13/22] [13/20]tgt-fpga/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-fpga/Makefile.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 2a3310246..6154cbe9d 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -93,38 +93,38 @@ iverilog-fpga.pdf: iverilog-fpga.ps ps2pdf iverilog-fpga.ps iverilog-fpga.pdf ifeq (@WIN32@,yes) -INSTALL_DOC = $(prefix)/iverilog-fpga$(suffix).pdf $(mandir)/man1/iverilog-fpga$(suffix).1 +INSTALL_DOC = installpdf installman INSTALL_DOCDIR = $(mandir)/man1 all: iverilog-fpga.pdf else -INSTALL_DOC = $(mandir)/man1/iverilog-fpga$(suffix).1 +INSTALL_DOC = installman INSTALL_DOCDIR = $(mandir)/man1 endif -install: all installdirs $(libdir)/ivl$(suffix)/fpga.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/fpga.conf $(libdir)/ivl$(suffix)/fpga-s.conf +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/fpga.tgt: ./fpga.tgt - $(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt" +F = ./fpga.tgt \ + $(srcdir)/fpga.conf \ + $(srcdir)/fpga-s.conf \ + $(INSTALL_DOC) -$(libdir)/ivl$(suffix)/fpga.conf: $(srcdir)/fpga.conf - $(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf" - -$(libdir)/ivl$(suffix)/fpga-s.conf: $(srcdir)/fpga-s.conf - $(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf" - - -$(mandir)/man1/iverilog-fpga$(suffix).1: $(srcdir)/iverilog-fpga.man +installman: installdirs $(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1" -$(prefix)/iverilog-fpga$(suffix).pdf: iverilog-fpga.pdf +installpdf: installdirs $(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" +installfiles: $(F) installdirs + $(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt" + $(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf" + $(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf" + installdirs: $(srcdir)/../mkinstalldirs - $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" + $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" "$(DESTDIR)$(INSTALL_DOCDIR)" uninstall: rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt" - rm -f "$(DESTDIR)$(INSTALL_DOC)" + rm -f "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1" rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf" rm -f "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf" From 93d2aa03d65690696fc51fc88193695522283697 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 14:58:34 +0800 Subject: [PATCH 14/22] [14/20]tgt-blif/Makefile.in:Remove useless $(INSTALL_DOC) fix install timestamp check and Remove useless $(INSTALL_DOC) Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- tgt-blif/Makefile.in | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tgt-blif/Makefile.in b/tgt-blif/Makefile.in index 51d204c78..0f9db00b3 100644 --- a/tgt-blif/Makefile.in +++ b/tgt-blif/Makefile.in @@ -83,18 +83,17 @@ endif blif.tgt: $O $(TGTDEPLIBS) $(CXX) @shared@ $(LDFLAGS) -o $@ $O $(TGTLDFLAGS) -install: all installdirs $(libdir)/ivl$(suffix)/blif.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/blif.conf $(libdir)/ivl$(suffix)/blif-s.conf +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/blif.tgt: ./blif.tgt +F = ./blif.tgt \ + $(srcdir)/blif.conf \ + $(srcdir)/blif-s.conf + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt" - -$(libdir)/ivl$(suffix)/blif.conf: $(srcdir)/blif.conf $(INSTALL_DATA) $(srcdir)/blif.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.conf" - -$(libdir)/ivl$(suffix)/blif-s.conf: $(srcdir)/blif-s.conf $(INSTALL_DATA) $(srcdir)/blif-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif-s.conf" - installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)/ivl$(suffix)" From 80bcd36cb8c78bd775615d3be3bbc7eb1b69a0ef Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:02:33 +0800 Subject: [PATCH 15/22] [15/20]libveriuser/Makefile.in:Remove useless $(INSTALL32) fix install timestamp check and Remove useless $(INSTALL32) Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- libveriuser/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index 461b4a526..32feff66b 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -103,9 +103,11 @@ libveriuser.a: libveriuser.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32) +install:: all installdirs installfiles -$(libdir)/libveriuser$(suffix).a: ./libveriuser.a +F = ./libveriuser.a + +installfiles: $(F) installdirs $(INSTALL_DATA) ./libveriuser.a "$(DESTDIR)$(libdir)/libveriuser$(suffix).a" installdirs: $(srcdir)/../mkinstalldirs From 593d5b5c8328f0d5edd351b0a10f0628030e6688 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:05:03 +0800 Subject: [PATCH 16/22] [16/20]ivlpp/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- ivlpp/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in index 2d8de7919..1b699c063 100644 --- a/ivlpp/Makefile.in +++ b/ivlpp/Makefile.in @@ -71,9 +71,11 @@ ivlpp@EXEEXT@: $O lexor.c: $(srcdir)/lexor.lex $(LEX) -t $< > $@ -install: all installdirs $(libdir)/ivl$(suffix)/ivlpp@EXEEXT@ +install: all installdirs installfiles -$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@: ivlpp@EXEEXT@ +F = ivlpp@EXEEXT@ + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@" installdirs: $(srcdir)/../mkinstalldirs From 0602ef46c6bbd8350597a678edb7e8f576906063 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:13:13 +0800 Subject: [PATCH 17/22] [17/20]driver/Makefile.in:fix install timestamp check Fix tgt-fpga/Makefile.in vvp/Makefile.in doc Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- driver/Makefile.in | 21 ++++++++++++--------- tgt-fpga/Makefile.in | 4 ++-- vvp/Makefile.in | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/driver/Makefile.in b/driver/Makefile.in index 7ec46f529..515e17e09 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -112,32 +112,35 @@ iverilog.pdf: iverilog.ps ifeq (@MINGW32@,yes) ifeq ($(MAN),none) -INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installman else ifeq ($(PS2PDF),none) -INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installman else -INSTALL_DOC = $(prefix)/iverilog$(suffix).pdf $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installpdf installman all: iverilog.pdf endif endif INSTALL_DOCDIR = $(mandir)/man1 else -INSTALL_DOC = $(mandir)/man1/iverilog$(suffix).1 +INSTALL_DOC = installman INSTALL_DOCDIR = $(mandir)/man1 endif -install: all installdirs $(bindir)/iverilog$(suffix)@EXEEXT@ $(INSTALL_DOC) +install: all installdirs installfiles -$(bindir)/iverilog$(suffix)@EXEEXT@: ./iverilog@EXEEXT@ - $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@" +F = ./iverilog@EXEEXT@ \ + $(INSTALL_DOC) -$(mandir)/man1/iverilog$(suffix).1: iverilog.man +installman: iverilog.man installdirs $(INSTALL_DATA) iverilog.man "$(DESTDIR)$(mandir)/man1/iverilog$(suffix).1" -$(prefix)/iverilog$(suffix).pdf: iverilog.pdf +installpdf: iverilog.pdf installdirs $(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf" +installfiles: $(F) installdirs + $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@" + installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(bindir)" "$(DESTDIR)$(INSTALL_DOCDIR)" diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 6154cbe9d..6170d4c28 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -108,10 +108,10 @@ F = ./fpga.tgt \ $(srcdir)/fpga-s.conf \ $(INSTALL_DOC) -installman: installdirs +installman: $(srcdir)/iverilog-fpga.man installdirs $(INSTALL_DATA) $(srcdir)/iverilog-fpga.man "$(DESTDIR)$(mandir)/man1/iverilog-fpga$(suffix).1" -installpdf: installdirs +installpdf: iverilog-fpga.pdf installdirs $(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" installfiles: $(F) installdirs diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 709d64456..64759e2e7 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -186,10 +186,10 @@ install: all installdirs installfiles F = ./vvp@EXEEXT@ $(INSTALL_DOC) -installman: installdirs +installman: vvp.man installdirs $(INSTALL_DATA) vvp.man "$(DESTDIR)$(mandir)/man1/vvp$(suffix).1" -installpdf: installdirs +installpdf: vvp.pdf installdirs $(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf" installfiles: $(F) installdirs From 9e8692fac5d56157d6749fa6826be452cbc4766f Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:19:04 +0800 Subject: [PATCH 18/22] [18/20]driver-vpi/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- driver-vpi/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index d93d5a207..25e4ff1b6 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -94,9 +94,11 @@ res.o: res.rc $(WINDRES) -i res.rc -o res.o # -install: all installdirs $(bindir)/iverilog-vpi$(suffix)@EXEEXT@ +install: all installdirs installfiles -$(bindir)/iverilog-vpi$(suffix)@EXEEXT@: ./iverilog-vpi@EXEEXT@ +F = ./iverilog-vpi@EXEEXT@ + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@" ifeq (@WIN32@,yes) ifneq ($(HOSTCC),$(CC)) From dd5a288567c3308b668b599d72e9517f7012b48f Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:22:03 +0800 Subject: [PATCH 19/22] [19/20]cadpli/Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- cadpli/Makefile.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index eac420b81..44c52b81b 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -79,9 +79,11 @@ endif cadpli.vpl: $O ../vpi/libvpi.a ../libveriuser/libveriuser.o $(CC) @shared@ $(LDFLAGS) -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS) -install: all installdirs $(vpidir)/cadpli.vpl +install: all installdirs installfiles -$(vpidir)/cadpli.vpl: ./cadpli.vpl +F = ./cadpli.vpl + +installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl" installdirs: $(srcdir)/../mkinstalldirs From 357d9ae6f0106c3134ce8ff83e6dcc69d8d6e2a3 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Sat, 18 Jan 2020 15:40:50 +0800 Subject: [PATCH 20/22] [20/20]Makefile.in:fix install timestamp check Fix bug: https://bugs.gentoo.org/705412 Fix bug: https://github.com/gentoo/gentoo/pull/14096 Related: https://github.com/steveicarus/iverilog/pull/294 Signed-off-by: Huang Rui --- Makefile.in | 67 +++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 36 deletions(-) diff --git a/Makefile.in b/Makefile.in index 95e0012b4..5a7e4c095 100644 --- a/Makefile.in +++ b/Makefile.in @@ -308,66 +308,61 @@ version_tag.h version: ifeq (@MINGW32@,yes) ifeq ($(MAN),none) -INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 +INSTALL_DOC = installman else ifeq ($(PS2PDF),none) -INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 +INSTALL_DOC = installman else -INSTALL_DOC = $(prefix)/iverilog-vpi$(suffix).pdf $(mandir)/man1/iverilog-vpi$(suffix).1 +INSTALL_DOC = installpdf installman all: dep iverilog-vpi.pdf endif endif INSTALL_DOCDIR = $(mandir)/man1 else -INSTALL_DOC = $(mandir)/man1/iverilog-vpi$(suffix).1 +INSTALL_DOC = installman INSTALL_DOCDIR = $(mandir)/man1 endif ifeq (@MINGW32@,yes) WIN32_INSTALL = else -WIN32_INSTALL = $(bindir)/iverilog-vpi$(suffix) +WIN32_INSTALL = installwin32 endif -install: all installdirs $(libdir)/ivl$(suffix)/ivl@EXEEXT@ $(libdir)/ivl$(suffix)/include/constants.vams $(libdir)/ivl$(suffix)/include/disciplines.vams $(includedir)/ivl_target.h $(includedir)/_pli_types.h $(includedir)/sv_vpi_user.h $(includedir)/vpi_user.h $(includedir)/acc_user.h $(includedir)/veriuser.h $(WIN32_INSTALL) $(INSTALL_DOC) +install: all installdirs installfiles $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true -$(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi installdirs +F = ./ivl@EXEEXT@ \ + $(srcdir)/constants.vams \ + $(srcdir)/disciplines.vams \ + $(srcdir)/ivl_target.h \ + ./_pli_types.h \ + $(srcdir)/sv_vpi_user.h \ + $(srcdir)/vpi_user.h \ + $(srcdir)/acc_user.h \ + $(srcdir)/veriuser.h \ + $(INSTALL_DOC) \ + $(WIN32_INSTALL) + +installwin32: ./iverilog-vpi installdirs $(INSTALL_SCRIPT) ./iverilog-vpi "$(DESTDIR)$(bindir)/iverilog-vpi$(suffix)" -$(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@ installdirs - $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" - -$(libdir)/ivl$(suffix)/include/constants.vams: $(srcdir)/constants.vams installdirs - $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" - -$(libdir)/ivl$(suffix)/include/disciplines.vams: $(srcdir)/disciplines.vams installdirs - $(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams" - -$(includedir)/ivl_target.h: $(srcdir)/ivl_target.h installdirs - $(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h" - -$(includedir)/_pli_types.h: _pli_types.h installdirs - $(INSTALL_DATA) $< "$(DESTDIR)$(includedir)/_pli_types.h" - -$(includedir)/sv_vpi_user.h: $(srcdir)/sv_vpi_user.h installdirs - $(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h" - -$(includedir)/vpi_user.h: $(srcdir)/vpi_user.h installdirs - $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h" - -$(includedir)/acc_user.h: $(srcdir)/acc_user.h installdirs - $(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h" - -$(includedir)/veriuser.h: $(srcdir)/veriuser.h installdirs - $(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h" - -$(mandir)/man1/iverilog-vpi$(suffix).1: iverilog-vpi.man installdirs +installman: iverilog-vpi.man installdirs $(INSTALL_DATA) iverilog-vpi.man "$(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1" -$(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf installdirs +installpdf: iverilog-vpi.pdf installdirs $(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf" +installfiles: $(F) installdirs + $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" + $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" + $(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams" + $(INSTALL_DATA) $(srcdir)/ivl_target.h "$(DESTDIR)$(includedir)/ivl_target.h" + $(INSTALL_DATA) ./_pli_types.h "$(DESTDIR)$(includedir)/_pli_types.h" + $(INSTALL_DATA) $(srcdir)/sv_vpi_user.h "$(DESTDIR)$(includedir)/sv_vpi_user.h" + $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h" + $(INSTALL_DATA) $(srcdir)/acc_user.h "$(DESTDIR)$(includedir)/acc_user.h" + $(INSTALL_DATA) $(srcdir)/veriuser.h "$(DESTDIR)$(includedir)/veriuser.h" installdirs: $(srcdir)/mkinstalldirs $(srcdir)/mkinstalldirs "$(DESTDIR)$(bindir)" \ From 969426a21e13921263cc9eeca0769d0192bbe6d3 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Wed, 12 Feb 2020 22:34:10 +0800 Subject: [PATCH 21/22] Fix install missing file bug in PR #300 When installing tgt-stub and tgt-vhdl, due to the wrong target path, the install scripts can't find the file to be installed. The missing file is: stub.conf, stub-s.conf, vhdl.conf, vhdl-s.conf Changed to right path fixed this problem. Thanks @minux help to fix. Signed-off-by: Huang Rui --- tgt-stub/Makefile.in | 8 ++++---- tgt-vhdl/Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index 8be486b2d..933407001 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -85,13 +85,13 @@ stub.tgt: $O $(TGTDEPLIBS) install: all installdirs installfiles F = ./stub.tgt \ - ./stub.conf \ - ./stub-s.conf + $(srcdir)/stub.conf \ + $(srcdir)/stub-s.conf installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt" - $(INSTALL_DATA) ./stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" - $(INSTALL_DATA) ./stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" + $(INSTALL_DATA) $(srcdir)/stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" + $(INSTALL_DATA) $(srcdir)/stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index c8ce6a855..3c7fdb303 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -93,13 +93,13 @@ vhdl_config.h: stamp-vhdl_config-h install: all installdirs installfiles F = ./vhdl.tgt \ - ./vhdl.conf \ - ./vhdl-s.conf + $(srcdir)/vhdl.conf \ + $(srcdir)/vhdl-s.conf installfiles: $(F) installdirs $(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt" - $(INSTALL_DATA) ./vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" - $(INSTALL_DATA) ./vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" + $(INSTALL_DATA) $(srcdir)/vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" + $(INSTALL_DATA) $(srcdir)/vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" installdirs: $(srcdir)/../mkinstalldirs $(srcdir)/../mkinstalldirs "$(DESTDIR)$(libdir)/ivl$(suffix)" From 11001f58d5a849416fe39745126cfb2ae90a232b Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Wed, 12 Feb 2020 22:42:04 +0800 Subject: [PATCH 22/22] Thoroughly fix parallel installation issues In PR #300, @xdch47 pointed out a stable way to fix parallel installation problems. This fix applied the method, thanks! Signed-off-by: Huang Rui --- Makefile.in | 2 +- cadpli/Makefile.in | 2 +- driver-vpi/Makefile.in | 2 +- driver/Makefile.in | 2 +- ivlpp/Makefile.in | 2 +- libveriuser/Makefile.in | 2 +- tgt-blif/Makefile.in | 2 +- tgt-fpga/Makefile.in | 2 +- tgt-null/Makefile.in | 2 +- tgt-pal/Makefile.in | 2 +- tgt-pcb/Makefile.in | 2 +- tgt-sizer/Makefile.in | 2 +- tgt-stub/Makefile.in | 2 +- tgt-verilog/Makefile.in | 2 +- tgt-vhdl/Makefile.in | 2 +- tgt-vlog95/Makefile.in | 2 +- tgt-vvp/Makefile.in | 2 +- vhdlpp/Makefile.in | 2 +- vpi/Makefile.in | 2 +- vvp/Makefile.in | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5a7e4c095..5ac5515ac 100644 --- a/Makefile.in +++ b/Makefile.in @@ -353,7 +353,7 @@ installman: iverilog-vpi.man installdirs installpdf: iverilog-vpi.pdf installdirs $(INSTALL_DATA) iverilog-vpi.pdf "$(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf" -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./ivl@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@" $(INSTALL_DATA) $(srcdir)/constants.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/constants.vams" $(INSTALL_DATA) $(srcdir)/disciplines.vams "$(DESTDIR)$(libdir)/ivl$(suffix)/include/disciplines.vams" diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index 44c52b81b..9c20daa00 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -83,7 +83,7 @@ install: all installdirs installfiles F = ./cadpli.vpl -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./cadpli.vpl "$(DESTDIR)$(vpidir)/cadpli.vpl" installdirs: $(srcdir)/../mkinstalldirs diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index 25e4ff1b6..74263b209 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -98,7 +98,7 @@ install: all installdirs installfiles F = ./iverilog-vpi@EXEEXT@ -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./iverilog-vpi@EXEEXT@ "$(bindir)/iverilog-vpi$(suffix)@EXEEXT@" ifeq (@WIN32@,yes) ifneq ($(HOSTCC),$(CC)) diff --git a/driver/Makefile.in b/driver/Makefile.in index 515e17e09..4d7144c5e 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -138,7 +138,7 @@ installman: iverilog.man installdirs installpdf: iverilog.pdf installdirs $(INSTALL_DATA) iverilog.pdf "$(DESTDIR)$(prefix)/iverilog$(suffix).pdf" -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./iverilog@EXEEXT@ "$(DESTDIR)$(bindir)/iverilog$(suffix)@EXEEXT@" installdirs: $(srcdir)/../mkinstalldirs diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in index 1b699c063..37cf8e0ac 100644 --- a/ivlpp/Makefile.in +++ b/ivlpp/Makefile.in @@ -75,7 +75,7 @@ install: all installdirs installfiles F = ivlpp@EXEEXT@ -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./ivlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/ivlpp@EXEEXT@" installdirs: $(srcdir)/../mkinstalldirs diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index 32feff66b..09c982268 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -107,7 +107,7 @@ install:: all installdirs installfiles F = ./libveriuser.a -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_DATA) ./libveriuser.a "$(DESTDIR)$(libdir)/libveriuser$(suffix).a" installdirs: $(srcdir)/../mkinstalldirs diff --git a/tgt-blif/Makefile.in b/tgt-blif/Makefile.in index 0f9db00b3..ecb1967f8 100644 --- a/tgt-blif/Makefile.in +++ b/tgt-blif/Makefile.in @@ -89,7 +89,7 @@ F = ./blif.tgt \ $(srcdir)/blif.conf \ $(srcdir)/blif-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./blif.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.tgt" $(INSTALL_DATA) $(srcdir)/blif.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif.conf" $(INSTALL_DATA) $(srcdir)/blif-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/blif-s.conf" diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index 6170d4c28..f4aff0205 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -114,7 +114,7 @@ installman: $(srcdir)/iverilog-fpga.man installdirs installpdf: iverilog-fpga.pdf installdirs $(INSTALL_DATA) iverilog-fpga.pdf "$(DESTDIR)$(prefix)/iverilog-fpga$(suffix).pdf" -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./fpga.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.tgt" $(INSTALL_DATA) $(srcdir)/fpga.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga.conf" $(INSTALL_DATA) $(srcdir)/fpga-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/fpga-s.conf" diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in index 3a1c6a529..90ffcf8bf 100644 --- a/tgt-null/Makefile.in +++ b/tgt-null/Makefile.in @@ -87,7 +87,7 @@ F = ./null.tgt \ $(srcdir)/null.conf \ $(srcdir)/null-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./null.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/null.tgt" $(INSTALL_DATA) $(srcdir)/null.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null.conf" $(INSTALL_DATA) $(srcdir)/null-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/null-s.conf" diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in index 56f2114d9..2f47e7f8b 100644 --- a/tgt-pal/Makefile.in +++ b/tgt-pal/Makefile.in @@ -84,7 +84,7 @@ install: all installdirs installfiles F = ./pal.tgt -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./pal.tgt "$(DESTDIR)$(libdir)/ivl/pal.tgt" installdirs: $(srcdir)/../mkinstalldirs diff --git a/tgt-pcb/Makefile.in b/tgt-pcb/Makefile.in index 8aa0fbc8f..a5f9b7d5b 100644 --- a/tgt-pcb/Makefile.in +++ b/tgt-pcb/Makefile.in @@ -111,7 +111,7 @@ F = ./pcb.tgt \ $(srcdir)/pcb.conf \ $(srcdir)/pcb-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./pcb.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.tgt" $(INSTALL_DATA) $(srcdir)/pcb.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb.conf" $(INSTALL_DATA) $(srcdir)/pcb-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/pcb-s.conf" diff --git a/tgt-sizer/Makefile.in b/tgt-sizer/Makefile.in index 0da8f3f3b..ab21f6e0b 100644 --- a/tgt-sizer/Makefile.in +++ b/tgt-sizer/Makefile.in @@ -87,7 +87,7 @@ F = ./sizer.tgt \ $(srcdir)/sizer.conf \ $(srcdir)/sizer-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./sizer.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.tgt" $(INSTALL_DATA) $(srcdir)/sizer.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer.conf" $(INSTALL_DATA) $(srcdir)/sizer-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/sizer-s.conf" diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index 933407001..57ee8cf36 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -88,7 +88,7 @@ F = ./stub.tgt \ $(srcdir)/stub.conf \ $(srcdir)/stub-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./stub.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.tgt" $(INSTALL_DATA) $(srcdir)/stub.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub.conf" $(INSTALL_DATA) $(srcdir)/stub-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/stub-s.conf" diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in index d1498ed17..cd32f1f08 100644 --- a/tgt-verilog/Makefile.in +++ b/tgt-verilog/Makefile.in @@ -85,7 +85,7 @@ install: all installdirs installfiles F = ./verilog.tgt \ $(srcdir)/vpi_user.h -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./verilog.tgt "$(DESTDIR)$(libdir)/ivl/verilog.tgt" $(INSTALL_DATA) $(srcdir)/vpi_user.h "$(DESTDIR)$(includedir)/vpi_user.h" diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index 3c7fdb303..844ba92c5 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -96,7 +96,7 @@ F = ./vhdl.tgt \ $(srcdir)/vhdl.conf \ $(srcdir)/vhdl-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./vhdl.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.tgt" $(INSTALL_DATA) $(srcdir)/vhdl.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl.conf" $(INSTALL_DATA) $(srcdir)/vhdl-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdl-s.conf" diff --git a/tgt-vlog95/Makefile.in b/tgt-vlog95/Makefile.in index 59239b174..4d936c900 100644 --- a/tgt-vlog95/Makefile.in +++ b/tgt-vlog95/Makefile.in @@ -87,7 +87,7 @@ F = ./vlog95.tgt \ $(srcdir)/vlog95.conf \ $(srcdir)/vlog95-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./vlog95.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.tgt" $(INSTALL_DATA) $(srcdir)/vlog95.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95.conf" $(INSTALL_DATA) $(srcdir)/vlog95-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vlog95-s.conf" diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index eb827d174..e1ae809e6 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -110,7 +110,7 @@ F = ./vvp.tgt \ ./vvp.conf \ ./vvp-s.conf -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./vvp.tgt "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt" $(INSTALL_DATA) ./vvp.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf" $(INSTALL_DATA) ./vvp-s.conf "$(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf" diff --git a/vhdlpp/Makefile.in b/vhdlpp/Makefile.in index bf4539443..53ae140ae 100644 --- a/vhdlpp/Makefile.in +++ b/vhdlpp/Makefile.in @@ -131,7 +131,7 @@ install: all installdirs installfiles F = vhdlpp@EXEEXT@ -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./vhdlpp@EXEEXT@ "$(DESTDIR)$(libdir)/ivl$(suffix)/vhdlpp@EXEEXT@" installdirs: $(srcdir)/../mkinstalldirs diff --git a/vpi/Makefile.in b/vpi/Makefile.in index b85b1016f..b08ba4244 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -198,7 +198,7 @@ F = ./libvpi.a \ ./vhdl_textio.vpi \ ./vpi_debug.vpi -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_DATA) ./libvpi.a "$(DESTDIR)$(libdir)/libvpi$(suffix).a" $(INSTALL_PROGRAM) ./system.vpi "$(DESTDIR)$(vpidir)/system.vpi" $(INSTALL_PROGRAM) ./va_math.vpi "$(DESTDIR)$(vpidir)/va_math.vpi" diff --git a/vvp/Makefile.in b/vvp/Makefile.in index 64759e2e7..bf04bd5b7 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -192,7 +192,7 @@ installman: vvp.man installdirs installpdf: vvp.pdf installdirs $(INSTALL_DATA) vvp.pdf "$(DESTDIR)$(prefix)/vvp$(suffix).pdf" -installfiles: $(F) installdirs +installfiles: $(F) | installdirs $(INSTALL_PROGRAM) ./vvp@EXEEXT@ "$(DESTDIR)$(bindir)/vvp$(suffix)@EXEEXT@" installdirs: $(srcdir)/../mkinstalldirs