2009-09-01 Tristan Gingold <gingold@adacore.com>

	* makefile.vms: Ported to Itanium VMS.  Remove useless targets and
	dependencies.  Remove unused FORMAT variable.
	* configure.com: New file to create build.com DCL script for
	Itanium VMS or Alpha VMS.

3 files changed, 74 insertions, 17 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 96c3036..6eb2be4 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-01  Tristan Gingold  <gingold@adacore.com>
+
+	* makefile.vms: Ported to Itanium VMS.  Remove useless targets and
+	dependencies.  Remove unused FORMAT variable.
+	* configure.com: New file to create build.com DCL script for
+	Itanium VMS or Alpha VMS.
+
 2009-08-29  Martin Thuresson  <martin@mtme.org>
 
 	* cris-dis.c (bytes_to_skip): Update code to use new name.
diff --git a/opcodes/configure.com b/opcodes/configure.com
new file mode 100644
index 0000000..a97bd9b
--- /dev/null
+++ b/opcodes/configure.com
@@ -0,0 +1,51 @@
+$!
+$! This file configures the opcodes library for use with openVMS.
+$!
+$! We do not use the configure script, since we do not have /bin/sh
+$! to execute it.
+$!
+$! Written by Tristan Gingold (gingold@adacore.com)
+$!
+$ arch=F$GETSYI("ARCH_NAME")
+$ arch=F$EDIT(arch,"LOWERCASE")
+
+$!
+$ write sys$output "Generate opcodes/build.com"
+$!
+$ if arch.eqs."ia64"
+$ then
+$   create build.com
+$DECK
+$ FILES="ia64-dis,ia64-opc"
+$ DEFS="""ARCH_ia64"""
+$EOD
+$ endif
+$ if arch.eqs."alpha"
+$ then
+$   create build.com
+$DECK
+$ FILES="alpha-dis,alpha-opc"
+$ DEFS="""ARCH_alpha"""
+$EOD
+$ endif
+$!
+$ append sys$input build.com
+$DECK
+$ FILES=FILES + ",dis-init,dis-buf,disassemble"
+$ OPT="/noopt/debug"
+$ CFLAGS=OPT + "/include=([],""../include"",[-.bfd])/name=(as_is,shortened)" + -
+  "/define=(" + DEFS + ")"
+$ write sys$output "CFLAGS=",CFLAGS
+$ NUM = 0
+$ LOOP:
+$   F = F$ELEMENT(NUM,",",FILES)
+$   IF F.EQS."," THEN GOTO END
+$   write sys$output "Compiling ", F, ".c"
+$   cc 'CFLAGS 'F.c
+$   NUM = NUM + 1
+$   GOTO LOOP
+$ END:
+$ purge
+$ lib/create libopcodes 'FILES
+$EOD
+$exit
diff --git a/opcodes/makefile.vms b/opcodes/makefile.vms
index 41599d9..d11d54f 100644
--- a/opcodes/makefile.vms
+++ b/opcodes/makefile.vms
@@ -1,43 +1,42 @@
 #
-# Makefile for libopcodes under openVMS VAX and Alpha
+# Makefile for libopcodes under openVMS
 #
 # For use with gnu-make for vms
 #
 # Created by Klaus K"ampf, kkaempf@progis.de
 #
 #
+
+ifeq ($(ARCH),IA64)
+OBJS=ia64-dis.obj,ia64-opc.obj
+ARCHDEF="ARCH_ia64"
+endif
 ifeq ($(ARCH),ALPHA)
-OBJS=alpha-dis.obj,alpha-opc.obj,dis-init.obj,dis-buf.obj,disassemble.obj
-FORMAT=OBJ_EVAX
+OBJS=alpha-dis.obj,alpha-opc.obj
 ARCHDEF="ARCH_alpha"
-else
-OBJS=vax-dis.obj,dis-buf.obj,disassemble.obj
-FORMAT=OBJ_VAX
+endif
+ifeq ($(ARCH),VAX)
+OBJS=vax-dis.obj
 ARCHDEF="ARCH_vax"
 endif
 
+OBJS:=$(OBJS),dis-init.obj,dis-buf.obj,disassemble.obj
+
 ifeq ($(CC),gcc)
-DEFS=/define=($(FORMAT))
+DEFS=/define=($(ARCHDEF))
 CFLAGS=/include=([],[-.include],[-.bfd])$(DEFS)
 else
-DEFS=/define=($(FORMAT))
+DEFS=/define=($(ARCHDEF))
 OPT=/noopt/debug
-CFLAGS=$(OPT)/include=([],[-.include],[-.bfd])$(DEFS)\
+CFLAGS=$(OPT)/include=([],"../include",[-.bfd])$(DEFS)\
  /name=(as_is,shortened)
 endif
 
-libopcodes.olb: sysdep.h $(OBJS)
+libopcodes.olb: $(OBJS)
 	purge
 	lib/create libopcodes *.obj
 
-disassemble.obj: disassemble.c
-	$(CC)$(CFLAGS)/define=($(ARCHDEF)) $<
-
-sysdep.h: [-.bfd.hosts]$(ARCH)vms.h
-	$(CP) $< $@
-
 clean:
 	$$ purge
 	$(RM) *.obj;
-	$(RM) sysdep.h;
 	$(RM) libopcodes.olb;