--- a/libiberty/makefile.vms	Sun Feb 07 18:28:00 2010 +0900
+++ b/libiberty/makefile.vms	Fri Feb 12 23:39:51 2010 +0900
@@ -1,5 +1,5 @@
 #
-# Makefile for libiberty under openVMS/Alpha
+# Makefile for libiberty under openVMS
 #
 # For use with gnu-make for vms
 #
@@ -7,27 +7,29 @@
 #
 #
 
-OBJS=bcopy.obj,bcmp.obj,getopt.obj,obstack.obj,xexit.obj,xmalloc.obj,hex.obj,\
-   getopt1.obj,cplus-dem.obj,strncasecmp.obj,strcasecmp.obj,strdup.obj,\
-   concat.obj,getruntime.obj,getpagesize.obj,alloca.obj,xstrerror.obj,\
-   xmemdup.obj,xstrdup.obj,xatexit.obj,choose-temp.obj,fnmatch.obj,objalloc.obj
+OBJS=getopt.obj,obstack.obj,xexit.obj,xmalloc.obj,hex.obj,\
+    getopt1.obj,cplus-dem.obj,cp-demangle.obj,cp-demint.obj,\
+    asprintf.obj vasprintf.obj,mkstemps.obj,\
+    concat.obj,getruntime.obj,getpagesize.obj,getpwd.obj,xstrerror.obj,\
+    xmemdup.obj,xstrdup.obj,xatexit.obj,choose-temp.obj,fnmatch.obj,\
+    objalloc.obj,safe-ctype.obj,hashtab.obj,lbasename.obj,argv.obj,\
+    lrealpath.obj,make-temp-file.obj,stpcpy.obj,unlink-if-ordinary.obj
 
 ifeq ($(CC),gcc)
 CFLAGS=/include=([],[-.include])
 else
 # assume dec c
-CFLAGS=/noopt/debug/include=([],[-.include])/define=("const=")/warnings=disable=(missingreturn,implicitfunc)
+OPT=/noopt/debug/warnings=disable=(missingreturn)
+CFLAGS=$(OPT)/include=([],[-.include])/name=(as_is,shortened)\
+ /define=(HAVE_CONFIG_H=1)\
+ /prefix=(all,except=("getopt","optarg","optopt","optind","opterr"))
 endif
 
-libiberty.olb: config.h alloca-conf.h $(OBJS)
+libiberty.olb: $(OBJS)
 	purge
 	lib/create libiberty *.obj
 
-config.h: config.h-vms
-	$(CP) $< $@
-
 clean:
 	$$ purge
-	$(RM) config.h;
 	$(RM) *.obj;
 	$(RM) libiberty.olb;