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

	* configure.com: Do not copy makefile.vms-in to makefile.vms
	* makefile.vms-in: Renamed to...
	* makefile.vms: ... this usual name as it is not processed anymore.
	Remove WRITE_DEBUG_OBJS (unused) and reorder object files for
	objdump.exe.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d56c00c..015519a 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-02  Tristan Gingold  <gingold@adacore.com>
+
+       * configure.com: Do not copy makefile.vms-in to makefile.vms
+       * makefile.vms-in: Renamed to...
+       * makefile.vms: ... this usual name as it is not processed anymore.
+       Remove WRITE_DEBUG_OBJS (unused) and reorder object files for
+       objdump.exe.
+
 2009-09-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * Makefile.am (arparse.o, arlex.o, sysroff.o, defparse.o)

diff --git a/binutils/configure.com b/binutils/configure.com
index fefa783..f199163 100644 (file)
--- a/binutils/configure.com
+++ b/binutils/configure.com
@@ -54,9 +54,6 @@ $ write tfile "#define TARGET """ + target + """"
 $ close tfile
 $ write sys$output "Created `config.h'"
 $!
-$ copy makefile.vms-in makefile.vms
-$ write sys$output "Created `makefile.vms'"
-$!
 $ write sys$output "Generate binutils build.com"
 $!
 $ create build.com

diff --git a/binutils/makefile.vms-in b/binutils/makefile.vms
similarity index 89%
rename from binutils/makefile.vms-in
rename to binutils/makefile.vms
index bea886a..d6f1857 100644 (file)
--- a/binutils/makefile.vms-in
+++ b/binutils/makefile.vms
@@ -28,8 +28,6 @@ OPCODES = [-.opcodes]libopcodes.olb/lib
 
 DEBUG_OBJS = rddbg.obj,debug.obj,stabs.obj,ieee.obj,rdcoff.obj,dwarf.obj
 
-WRITE_DEBUG_OBJS = $(DEBUG_OBJS),wrstabs.obj
-
 BULIBS = bucomm.obj,version.obj,filemode.obj
 
 ADDL_DEPS = $(BULIBS),$(LIBBFD_DEP),$(LIBIBERTY_DEP)
@@ -43,7 +41,7 @@ NMOBJS = $(ADDL_DEPS),nm.obj
 
 ADDR2LINEOBJS = $(ADDL_DEPS),addr2line.obj
 
-OBJDUMPOBJS = $(ADDL_DEPS),objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(OPCODES_DEP)
+OBJDUMPOBJS = objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(ADDL_DEPS),$(OPCODES_DEP)
 
 all: config.h size.exe strings.exe objdump.exe nm.exe addr2line.exe
 
@@ -60,7 +58,7 @@ addr2line.exe: $(ADDR2LINEOBJS)
        link/exe=$@ addr2line.obj,$(ADDL_LIBS)
 
 objdump.exe: $(OBJDUMPOBJS)
-       link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(LIBBFD),$(OPCODES),$(ADDL_LIBS)
+       link/exe=$@ objdump.obj,prdbg.obj,$(DEBUG_OBJS),$(ADDL_LIBS),$(LIBBFD),$(OPCODES)
 
 config.h:
        $$ @configure