Wed Apr 29 22:22:55 1998 Geoffrey Noer <noer@cygnus.com>

        * configure.in: Stop appending EXEEXT to the end of
        SRCONV_PROG (wrong because that variable may contain multiple
        programs)
        * Makefile.am: instead, add EXEEXTs to each SRCONV_PROG
        program
        * Makefile.in: regenerate
        * configure: regenerate

3 files changed, 33 insertions, 26 deletions

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e4da544..7e436ba 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,10 +1,11 @@
-Wed Apr 29 18:05:52 1998  Geoffrey Noer <noer@cygnus.com>
+Wed Apr 29 22:22:55 1998  Geoffrey Noer <noer@cygnus.com>
 
 	* configure.in: Stop appending EXEEXT to the end of
 	SRCONV_PROG (wrong because that variable may contain multiple
 	programs)
-	* Makefile.in: instead, add EXEEXTs to each SRCONV_PROG
+	* Makefile.am: instead, add EXEEXTs to each SRCONV_PROG
 	program
+	* Makefile.in: regenerate
 	* configure: regenerate
 
 Tue Apr 28 19:14:34 1998  Tom Tromey  <tromey@cygnus.com>
diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 8be4f7b..56c67d9 100644
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -44,7 +44,7 @@ NLMCONV_PROG=nlmconv
 DLLTOOL_PROG=dlltool
 WINDRES_PROG=windres
 
-SRCONV_PROG=srconv sysdump coffdump 
+SRCONV_PROG=srconv$(EXEEXT) sysdump$(EXEEXT) coffdump$(EXEEXT) 
 
 man_MANS = ar.1 nm.1 objdump.1 ranlib.1 size.1 strings.1 strip.1 objcopy.1 \
 	addr2line.1 nlmconv.1 $(DEMANGLER_PROG).1
diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index 0cca246..dc910a4 100644
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -266,18 +266,24 @@ nlmconv_OBJECTS =  nlmconv.o nlmheader.o bucomm.o version.o filemode.o
 nlmconv_LDADD = $(LDADD)
 nlmconv_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
 nlmconv_LDFLAGS = 
-srconv_OBJECTS =  srconv.o coffgrok.o bucomm.o version.o filemode.o
-srconv_LDADD = $(LDADD)
-srconv_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-srconv_LDFLAGS = 
-sysdump_OBJECTS =  sysdump.o bucomm.o version.o filemode.o
-sysdump_LDADD = $(LDADD)
-sysdump_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-sysdump_LDFLAGS = 
-coffdump_OBJECTS =  coffdump.o coffgrok.o bucomm.o version.o filemode.o
-coffdump_LDADD = $(LDADD)
-coffdump_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
-coffdump_LDFLAGS = 
+srconv__EXEEXT__SOURCES = srconv$(EXEEXT).c
+srconv__EXEEXT__OBJECTS =  srconv$(EXEEXT).o
+srconv__EXEEXT__LDADD = $(LDADD)
+srconv__EXEEXT__DEPENDENCIES =  ../bfd/libbfd.la \
+../libiberty/libiberty.a
+srconv__EXEEXT__LDFLAGS = 
+sysdump__EXEEXT__SOURCES = sysdump$(EXEEXT).c
+sysdump__EXEEXT__OBJECTS =  sysdump$(EXEEXT).o
+sysdump__EXEEXT__LDADD = $(LDADD)
+sysdump__EXEEXT__DEPENDENCIES =  ../bfd/libbfd.la \
+../libiberty/libiberty.a
+sysdump__EXEEXT__LDFLAGS = 
+coffdump__EXEEXT__SOURCES = coffdump$(EXEEXT).c
+coffdump__EXEEXT__OBJECTS =  coffdump$(EXEEXT).o
+coffdump__EXEEXT__LDADD = $(LDADD)
+coffdump__EXEEXT__DEPENDENCIES =  ../bfd/libbfd.la \
+../libiberty/libiberty.a
+coffdump__EXEEXT__LDFLAGS = 
 dlltool_OBJECTS =  dlltool.o defparse.o deflex.o bucomm.o version.o \
 filemode.o
 dlltool_DEPENDENCIES =  ../bfd/libbfd.la ../libiberty/libiberty.a
@@ -359,8 +365,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-SOURCES = $(nlmconv_SOURCES) $(srconv_SOURCES) $(sysdump_SOURCES) $(coffdump_SOURCES) $(dlltool_SOURCES) $(windres_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(c__filt_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES)
-OBJECTS = $(nlmconv_OBJECTS) $(srconv_OBJECTS) $(sysdump_OBJECTS) $(coffdump_OBJECTS) $(dlltool_OBJECTS) $(windres_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(c__filt_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS)
+SOURCES = $(nlmconv_SOURCES) srconv$(EXEEXT).c sysdump$(EXEEXT).c coffdump$(EXEEXT).c $(dlltool_SOURCES) $(windres_SOURCES) $(size_SOURCES) $(objdump_SOURCES) $(ar_SOURCES) $(strings_SOURCES) $(ranlib_SOURCES) $(c__filt_SOURCES) $(objcopy_SOURCES) $(addr2line_SOURCES) $(nm_new_SOURCES) $(strip_new_SOURCES)
+OBJECTS = $(nlmconv_OBJECTS) srconv$(EXEEXT).o sysdump$(EXEEXT).o coffdump$(EXEEXT).o $(dlltool_OBJECTS) $(windres_OBJECTS) $(size_OBJECTS) $(objdump_OBJECTS) $(ar_OBJECTS) $(strings_OBJECTS) $(ranlib_OBJECTS) $(c__filt_OBJECTS) $(objcopy_OBJECTS) $(addr2line_OBJECTS) $(nm_new_OBJECTS) $(strip_new_OBJECTS)
 
 all: all-recursive-am all-am
 
@@ -478,17 +484,17 @@ nlmconv$(EXEEXT): $(nlmconv_OBJECTS) $(nlmconv_DEPENDENCIES)
 	@rm -f nlmconv$(EXEEXT)
 	$(LINK) $(nlmconv_LDFLAGS) $(nlmconv_OBJECTS) $(nlmconv_LDADD) $(LIBS)
 
-srconv$(EXEEXT): $(srconv_OBJECTS) $(srconv_DEPENDENCIES)
-	@rm -f srconv$(EXEEXT)
-	$(LINK) $(srconv_LDFLAGS) $(srconv_OBJECTS) $(srconv_LDADD) $(LIBS)
+srconv1002 1002 0EXEEXT)$(EXEEXT): $(srconv__EXEEXT__OBJECTS) $(srconv__EXEEXT__DEPENDENCIES)
+	@rm -f srconv1002 1002 0EXEEXT)$(EXEEXT)
+	$(LINK) $(srconv__EXEEXT__LDFLAGS) $(srconv__EXEEXT__OBJECTS) $(srconv__EXEEXT__LDADD) $(LIBS)
 
-sysdump$(EXEEXT): $(sysdump_OBJECTS) $(sysdump_DEPENDENCIES)
-	@rm -f sysdump$(EXEEXT)
-	$(LINK) $(sysdump_LDFLAGS) $(sysdump_OBJECTS) $(sysdump_LDADD) $(LIBS)
+sysdump1002 1002 0EXEEXT)$(EXEEXT): $(sysdump__EXEEXT__OBJECTS) $(sysdump__EXEEXT__DEPENDENCIES)
+	@rm -f sysdump1002 1002 0EXEEXT)$(EXEEXT)
+	$(LINK) $(sysdump__EXEEXT__LDFLAGS) $(sysdump__EXEEXT__OBJECTS) $(sysdump__EXEEXT__LDADD) $(LIBS)
 
-coffdump$(EXEEXT): $(coffdump_OBJECTS) $(coffdump_DEPENDENCIES)
-	@rm -f coffdump$(EXEEXT)
-	$(LINK) $(coffdump_LDFLAGS) $(coffdump_OBJECTS) $(coffdump_LDADD) $(LIBS)
+coffdump1002 1002 0EXEEXT)$(EXEEXT): $(coffdump__EXEEXT__OBJECTS) $(coffdump__EXEEXT__DEPENDENCIES)
+	@rm -f coffdump1002 1002 0EXEEXT)$(EXEEXT)
+	$(LINK) $(coffdump__EXEEXT__LDFLAGS) $(coffdump__EXEEXT__OBJECTS) $(coffdump__EXEEXT__LDADD) $(LIBS)
 
 dlltool$(EXEEXT): $(dlltool_OBJECTS) $(dlltool_DEPENDENCIES)
 	@rm -f dlltool$(EXEEXT)