diff options
| author | Christopher Faylor <me@cgf.cx> | 2003-09-11 01:55:59 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2003-09-11 01:55:59 +0400 |
| commit | 4a6890e76e1842230ea969f79e47b1b7a24d2218 (patch) | |
| tree | be63a2a5c8b116394a997f2ceb34f6acabda4f10 /winsup/utils | |
| parent | 0efafbfb8cfd1fedfb5361c98544545c1c648733 (diff) | |
* Makefile.in: Remove references to getopt since it is now part of mingwex.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 16 |
2 files changed, 9 insertions, 12 deletions
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index 699dd2714..bf98d79e7 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +2003-09-10 Christopher Faylor <cgf@redhat.com> + + * Makefile.in: Remove references to getopt since it is now part of + mingwex. + 2003-09-08 Christopher Faylor <cgf@redhat.com> * Makefile.in: Rename libz.h -> zlib.h. diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index f7fe3fe0e..2cfed0550 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -90,7 +90,7 @@ endif all: Makefile $(PROGS) -strace.exe: strace.o path.o mingw_getopt.o $(MINGW_DEP_LDLIBS) +strace.exe: strace.o path.o $(MINGW_DEP_LDLIBS) ifdef VERBOSE $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) else @@ -98,15 +98,15 @@ else $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) endif -cygcheck.exe: cygcheck.o mingw_getopt.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) +cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) 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) else - @echo $(CXX) -o $@ ${wordlist 1,2,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)} $(libz);\ - $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) + @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) endif dumper.o: dumper.cc dumper.h @@ -133,14 +133,6 @@ else ${filter-out -nostdinc,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $< endif -mingw_getopt.o: $(cygwin_source)/lib/getopt.c -ifdef VERBOSE - ${filter-out -I$(newlib_source)/%,$(COMPILE_CC)} $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $< -else - @echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\ - ${filter-out -I$(newlib_source)/%,$(COMPILE_CC)} $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) $< -endif - path.o: path.cc ifdef VERBOSE ${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< |