openieee: use .vhdl extension

18 files changed, 18 insertions, 18 deletions

diff --git a/libraries/Makefile.inc b/libraries/Makefile.inc
index 0f0615d0b..f8a0f09d7 100644
--- a/libraries/Makefile.inc
+++ b/libraries/Makefile.inc
@@ -77,7 +77,7 @@ IEEE08_BSRCS := \
   ieee2008/ieee_bit_context.vhdl ieee2008/ieee_std_context.vhdl
 
 IEEE87_BSRCS := $(addprefix ieee/v87/,$(IEEE_SRCS))
-IEEE93_BSRCS := $(addprefix ieee/v93/,$(IEEE_SRCS) $(MATH_SRCS))
+IEEE93_BSRCS := $(addprefix ieee/v93/,$(IEEE_SRCS)) $(addprefix ieee/,$(MATH_SRCS))
 
 else
 IEEE_SRCS := std_logic_1164.vhdl std_logic_1164-body.vhdl \
@@ -86,12 +86,12 @@ IEEE_SRCS := std_logic_1164.vhdl std_logic_1164-body.vhdl \
 MATH_SRCS := math_real.vhdl math_real-body.vhdl
 VITAL95_BSRCS :=
 VITAL2000_BSRCS :=
-IEEE08_BSRCS := openieee/std_logic_1164.v08 openieee/std_logic_1164-body.v08 \
- openieee/math_real.vhdl openieee/math_real-body.vhdl
+IEEE08_BSRCS := v08/std_logic_1164.vhdl v08/std_logic_1164-body.vhdl \
+ math_real.vhdl math_real-body.vhdl
 
 IEEE87_BSRCS := $(addprefix openieee/v87/,$(IEEE_SRCS))
-IEEE93_BSRCS := $(addprefix openieee/v93/,$(IEEE_SRCS) $(MATH_SRCS))
-
+IEEE93_BSRCS := $(addprefix openieee/v93/,$(IEEE_SRCS)) $(addprefix openieee/,$(MATH_SRCS))
+IEEE08_BSRCS := $(addprefix openieee/,$(IEEE08_BSRCS))
 endif
 
 ANALYZE=$(GHDL) -a $(GHDL_FLAGS)
@@ -165,7 +165,7 @@ $(STD87_DIR)/std-obj87.cf: $(ANALYZE_DEP) $(STD87_SRCS)
 $(LIBDST_DIR)/src/ieee/v87/%.vhdl: $(LIBSRC_DIR)/ieee/%.vhdl
 	$(SED_V87) < $< > $@
 
-$(LIBDST_DIR)/src/openieee/v87/%.vhdl: $(LIBSRC_DIR)/openieee/%.v87
+$(LIBDST_DIR)/src/openieee/v87/%.vhdl: $(LIBSRC_DIR)/openieee/v87/%.vhdl
 	$(CP) $< $@
 
 $(LIBDST_DIR)/src/vital95/%.vhdl: $(LIBSRC_DIR)/vital95/%.vhdl
@@ -229,7 +229,7 @@ $(LIBDST_DIR)/src/ieee/%.vhdl: $(LIBSRC_DIR)/ieee/%.vhdl
 $(LIBDST_DIR)/src/openieee/%.vhdl: $(LIBSRC_DIR)/openieee/%.vhdl
 	$(CP) $< $@
 
-$(LIBDST_DIR)/src/openieee/v93/%.vhdl: $(LIBSRC_DIR)/openieee/%.v93
+$(LIBDST_DIR)/src/openieee/v93/%.vhdl: $(LIBSRC_DIR)/openieee/v93/%.vhdl
 	$(CP) $< $@
 
 $(LIBDST_DIR)/src/vital2000/%.vhdl: $(LIBSRC_DIR)/vital2000/%.vhdl
@@ -307,7 +307,7 @@ $(STD08_DIR)/std-obj08.cf: $(ANALYZE_DEP) $(STD08_SRCS)
 $(LIBDST_DIR)/src/ieee2008/%.vhdl: $(LIBSRC_DIR)/ieee2008/%.vhdl
 	$(CP) $< $@
 
-$(LIBDST_DIR)/src/openieee/v08/%.vhdl: $(LIBSRC_DIR)/openieee/%.v08
+$(LIBDST_DIR)/src/openieee/v08/%.vhdl: $(LIBSRC_DIR)/openieee/v08/%.vhdl
 	$(CP) $< $@
 
 ANALYZE_IEEE08=$(ANALYZE08) -P../.. --work=ieee
diff --git a/libraries/openieee/build_1164.py b/libraries/openieee/build_1164.py
index 042620d2f..36739f1ca 100755
--- a/libraries/openieee/build_1164.py
+++ b/libraries/openieee/build_1164.py
@@ -506,7 +506,7 @@ pats = {'  @TAB\n' : disp_tables,
         '  @NORM\n': disp_all_norm_funcs,
         '  @ISX\n' : disp_all_isx_funcs }
 
-spec_file='std_logic_1164.vhdl'
+spec_file='std_logic_1164.proto'
 proto_file='std_logic_1164-body.proto'
 
 def gen_body(filename, version):
@@ -553,15 +553,15 @@ def copy_spec(dest, version):
     out.close()
 
 # Copy spec
-copy_spec('std_logic_1164.v87', V87)
-copy_spec('std_logic_1164.v93', V93)
-copy_spec('std_logic_1164.v08', V08)
+copy_spec('v87/std_logic_1164.vhdl', V87)
+copy_spec('v93/std_logic_1164.vhdl', V93)
+copy_spec('v08/std_logic_1164.vhdl', V08)
 
 # Generate bodies
-gen_body('std_logic_1164-body.v87', V87)
+gen_body('v87/std_logic_1164-body.vhdl', V87)
 
 binary_funcs.append("xnor")
-gen_body('std_logic_1164-body.v93', V93)
+gen_body('v93/std_logic_1164-body.vhdl', V93)
 
 vec_types = ['ulogic']
-gen_body('std_logic_1164-body.v08', V08)
+gen_body('v08/std_logic_1164-body.vhdl', V08)
diff --git a/libraries/openieee/build_numeric.py b/libraries/openieee/build_numeric.py
index c00e74e5c..43bb04b67 100755
--- a/libraries/openieee/build_numeric.py
+++ b/libraries/openieee/build_numeric.py
@@ -1125,7 +1125,7 @@ def gen_body(proto_file):
 # Copy spec
 for log in logics:
     for std in ['87', '93']:
-        out=open('numeric_' + log + '.v' + std, 'w')
+        out=open('v' + std + '/numeric_' + log + '.vhdl', 'w')
         for line in open('numeric_' + log + '.proto'):
             if line == '  @COMMON\n':
                 for lcom in open('numeric_common.proto'):
@@ -1147,7 +1147,7 @@ for log in logics:
 v93=False
 for l in logics:
     logic = l
-    out=open('numeric_{0}-body.v87'.format(l), 'w')
+    out=open('v87/numeric_{0}-body.vhdl'.format(l), 'w')
     gen_body('numeric_{0}-body.proto'.format(l))
     out.close()
 
@@ -1155,6 +1155,6 @@ v93=True
 binary_funcs.append("xnor")
 for l in logics:
     logic = l
-    out=open('numeric_{0}-body.v93'.format(l), 'w')
+    out=open('v93/numeric_{0}-body.vhdl'.format(l), 'w')
     gen_body('numeric_{0}-body.proto'.format(l))
     out.close()
diff --git a/libraries/openieee/std_logic_1164.vhdl b/libraries/openieee/std_logic_1164.proto
index f5828ec6e..f5828ec6e 100644
--- a/libraries/openieee/std_logic_1164.vhdl
+++ b/libraries/openieee/std_logic_1164.proto
diff --git a/libraries/openieee/std_logic_1164-body.v08 b/libraries/openieee/v08/std_logic_1164-body.vhdl
index 25e219c2e..25e219c2e 100644
--- a/libraries/openieee/std_logic_1164-body.v08
+++ b/libraries/openieee/v08/std_logic_1164-body.vhdl
diff --git a/libraries/openieee/std_logic_1164.v08 b/libraries/openieee/v08/std_logic_1164.vhdl
index 8271b1b93..8271b1b93 100644
--- a/libraries/openieee/std_logic_1164.v08
+++ b/libraries/openieee/v08/std_logic_1164.vhdl
diff --git a/libraries/openieee/numeric_bit-body.v87 b/libraries/openieee/v87/numeric_bit-body.vhdl
index 3bdc634ac..3bdc634ac 100644
--- a/libraries/openieee/numeric_bit-body.v87
+++ b/libraries/openieee/v87/numeric_bit-body.vhdl
diff --git a/libraries/openieee/numeric_bit.v87 b/libraries/openieee/v87/numeric_bit.vhdl
index 6a6dcc393..6a6dcc393 100644
--- a/libraries/openieee/numeric_bit.v87
+++ b/libraries/openieee/v87/numeric_bit.vhdl
diff --git a/libraries/openieee/numeric_std-body.v87 b/libraries/openieee/v87/numeric_std-body.vhdl
index c716b19f3..c716b19f3 100644
--- a/libraries/openieee/numeric_std-body.v87
+++ b/libraries/openieee/v87/numeric_std-body.vhdl
diff --git a/libraries/openieee/numeric_std.v87 b/libraries/openieee/v87/numeric_std.vhdl
index e1fa946ca..e1fa946ca 100644
--- a/libraries/openieee/numeric_std.v87
+++ b/libraries/openieee/v87/numeric_std.vhdl
diff --git a/libraries/openieee/std_logic_1164-body.v87 b/libraries/openieee/v87/std_logic_1164-body.vhdl
index b6dd265d0..b6dd265d0 100644
--- a/libraries/openieee/std_logic_1164-body.v87
+++ b/libraries/openieee/v87/std_logic_1164-body.vhdl
diff --git a/libraries/openieee/std_logic_1164.v87 b/libraries/openieee/v87/std_logic_1164.vhdl
index 67e63dac5..67e63dac5 100644
--- a/libraries/openieee/std_logic_1164.v87
+++ b/libraries/openieee/v87/std_logic_1164.vhdl
diff --git a/libraries/openieee/numeric_bit-body.v93 b/libraries/openieee/v93/numeric_bit-body.vhdl
index 869b0d2b2..869b0d2b2 100644
--- a/libraries/openieee/numeric_bit-body.v93
+++ b/libraries/openieee/v93/numeric_bit-body.vhdl
diff --git a/libraries/openieee/numeric_bit.v93 b/libraries/openieee/v93/numeric_bit.vhdl
index eb21bbc2f..eb21bbc2f 100644
--- a/libraries/openieee/numeric_bit.v93
+++ b/libraries/openieee/v93/numeric_bit.vhdl
diff --git a/libraries/openieee/numeric_std-body.v93 b/libraries/openieee/v93/numeric_std-body.vhdl
index 0625a49f0..0625a49f0 100644
--- a/libraries/openieee/numeric_std-body.v93
+++ b/libraries/openieee/v93/numeric_std-body.vhdl
diff --git a/libraries/openieee/numeric_std.v93 b/libraries/openieee/v93/numeric_std.vhdl
index 8f58221ee..8f58221ee 100644
--- a/libraries/openieee/numeric_std.v93
+++ b/libraries/openieee/v93/numeric_std.vhdl
diff --git a/libraries/openieee/std_logic_1164-body.v93 b/libraries/openieee/v93/std_logic_1164-body.vhdl
index af43ba306..af43ba306 100644
--- a/libraries/openieee/std_logic_1164-body.v93
+++ b/libraries/openieee/v93/std_logic_1164-body.vhdl
diff --git a/libraries/openieee/std_logic_1164.v93 b/libraries/openieee/v93/std_logic_1164.vhdl
index 879a7870b..879a7870b 100644
--- a/libraries/openieee/std_logic_1164.v93
+++ b/libraries/openieee/v93/std_logic_1164.vhdl