Merge commit 'upstream/2.20'

[msp430-binutils.git] / opcodes / makefile.vms

diff --git a/opcodes/makefile.vms b/opcodes/makefile.vms
index fc8704831e05379e0e2dbbe248c0da1549b9ee6c..d11d54f665acb8a517e6579f2dc9ee79a24a8f64 100644 (file)
--- a/opcodes/makefile.vms
+++ b/opcodes/makefile.vms
@@ -1,42 +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),alpha)
-OBJS=alpha-dis.obj,alpha-opc.obj,dis-buf.obj,disassemble.obj
-FORMAT=OBJ_EVAX
+
+ifeq ($(ARCH),IA64)
+OBJS=ia64-dis.obj,ia64-opc.obj
+ARCHDEF="ARCH_ia64"
+endif
+ifeq ($(ARCH),ALPHA)
+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),"const=")
-CFLAGS=/noopt/debug/include=([],[-.include],[-.bfd])$(DEFS)\
-/warnings=disable=(missingreturn,implicitfunc,longextern)
+DEFS=/define=($(ARCHDEF))
+OPT=/noopt/debug
+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;