From 704d8c321eafc33c1a8145c9c6bcb44d8827520a Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 11 Sep 2003 00:07:28 +0000 Subject: [PATCH] * Makefile.in: More fixups to adjust for the fact that mingw_getopt.o is no longer built. --- winsup/utils/ChangeLog | 5 +++++ winsup/utils/Makefile.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index bf98d79e7..76b740225 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2003-09-10 Christopher Faylor + + * Makefile.in: More fixups to adjust for the fact that mingw_getopt.o + is no longer built. + 2003-09-10 Christopher Faylor * Makefile.in: Remove references to getopt since it is now part of diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 2cfed0550..a4b204602 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -92,10 +92,10 @@ all: Makefile $(PROGS) strace.exe: strace.o path.o $(MINGW_DEP_LDLIBS) ifdef VERBOSE - $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) else @echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\ - $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) endif cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) @@ -103,7 +103,7 @@ ifeq "$(libz)" "" echo '*** Building cygcheck without package content checking due to missing mingw libz.a.' endif ifdef VERBOSE - $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) else @echo $(CXX) -o $@ ${wordlist 1,3,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)} $(libz);\ $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz)