diff options
| author | umarcor <unai.martinezcorral@ehu.eus> | 2021-01-16 08:35:38 +0100 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2021-01-16 13:53:13 +0100 |
| commit | e5c609f31d485dcb5796103d5b8b0cf332960070 (patch) | |
| tree | 40aae76e24c05da8aad0f93d63d72fe5b6cdee0d /Makefile.in | |
| parent | 173171d2b31111452446c6ee3e4ee21768cf41cf (diff) | |
| download | ghdl-e5c609f31d485dcb5796103d5b8b0cf332960070.tar.gz ghdl-e5c609f31d485dcb5796103d5b8b0cf332960070.tar.bz2 ghdl-e5c609f31d485dcb5796103d5b8b0cf332960070.zip | |
libraries: unuse 'openieee', rename enable_openieee to enable_gplcompat
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in index c1967c606..cd9e8c954 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,7 +37,7 @@ ghdl_version=@ghdl_version@ libghdl_version=@libghdl_version@ enable_werror=@enable_werror@ enable_checks=@enable_checks@ -enable_openieee=@enable_openieee@ +enable_gplcompat=@enable_gplcompat@ enable_libghdl=@enable_libghdl@ default_pic=@default_pic@ @@ -118,7 +118,7 @@ LIBDST_DIR:=$(libdirsuffix) LIBVHDL_FLAGS_TO_PASS=\ LIBSRC_DIR="$(LIBSRC_DIR)" \ LIBDST_DIR="$(LIBDST_DIR)" \ - enable_openieee="$(enable_openieee)" \ + enable_gplcompat="$(enable_gplcompat)" \ LN="$(LN)" CP="$(CP)" MKDIR="$(MKDIR)" # Object files from grt for the synthesis. @@ -533,21 +533,27 @@ install.vpi.local: all.vpi ################ Libraries ############################################### -VHDLLIB_SUBDIRS_COMMON= src/std src/std/v87 src/std/v93 src/std/v08 \ - src/synopsys src/synopsys/v08 \ - std/v87 ieee/v87 \ - std/v93 ieee/v93 \ - std/v08 ieee/v08 \ - src/openieee - -VHDLLIB_SUBDIRS_FULL= src/ieee src/vital95 src/vital2000 \ - src/ieee/v87 src/ieee/v93 src/ieee2008 - -ifeq ($(enable_openieee),false) -VHDLLIB_SUBDIRS=$(VHDLLIB_SUBDIRS_COMMON) $(VHDLLIB_SUBDIRS_FULL) -else -VHDLLIB_SUBDIRS=$(VHDLLIB_SUBDIRS_COMMON) \ - src/openieee/v87 src/openieee/v93 src/openieee/v08 +VHDLLIB_SUBDIRS= \ + ieee/v87 \ + ieee/v93 \ + ieee/v08 \ + std/v87 \ + std/v93 \ + std/v08 \ + src/ieee \ + src/ieee/v87 \ + src/ieee/v93 \ + src/ieee2008 \ + src/std \ + src/std/v87 \ + src/std/v93 \ + src/std/v08 \ + src/synopsys \ + src/synopsys/v08 \ + src/upf + +ifeq ($(enable_gplcompat),false) +VHDLLIB_SUBDIRS+=src/vital95 src/vital2000 endif install.dirs: @@ -610,8 +616,7 @@ create-dirs: force # Remove non GPL compatible source files clean-pure-gpl: -# IEEE 1164 or vital libraries aren't GPL compatible - $(RM) -rf libraries/ieee libraries/ieee2008 +# Vital libraries aren't GPL compatible $(RM) -rf libraries/vital95 libraries/vital2000 # The GNA testsuite contains open-source reproducer that may not be GPL. $(RM) -rf testsuite/gna |