Update of /cvsroot/mingw/msys/rt/src/winsup/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv7903
Modified Files:
ChangeLog.MSYS Makefile.in
Log Message:
* Makefile.in (dumper): Remove including dependency parts.
(EXEEXT): Set explicitly to .exe.
Index: ChangeLog.MSYS
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/utils/ChangeLog.MSYS,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog.MSYS 27 Oct 2002 17:16:10 -0000 1.3
--- ChangeLog.MSYS 12 Feb 2003 15:54:43 -0000 1.4
***************
*** 1,2 ****
--- 1,7 ----
+ 2003.02.12 Earnie Boyd <earnie@...>
+
+ * Makefile.in (dumper): Remove including dependency parts.
+ (EXEEXT): Set explicitly to .exe.
+
2002.10.27 Earnie Boyd <earnie@...>
Index: Makefile.in
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/utils/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.in 27 Oct 2002 17:16:13 -0000 1.4
--- Makefile.in 12 Feb 2003 15:54:44 -0000 1.5
***************
*** 23,27 ****
INSTALL_DATA:=@INSTALL_DATA@
! EXEEXT:=@EXEEXT@
EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@
--- 23,27 ----
INSTALL_DATA:=@INSTALL_DATA@
! EXEEXT:=.exe
EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@
***************
*** 40,46 ****
libbfd:=${shell $(CC) -L$(bupdir2)/bfd --print-file-name=libbfd.a}
libintl:=${shell $(CC) -L$(bupdir2)/intl --print-file-name=libintl.a}
- build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1}
- DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include
MINGW_CC := mingw32-gcc
MINGW_CXX := mingw32-g++
--- 40,44 ----
***************
*** 59,63 ****
MINGW_LIB:=
- DUMPER_LIB:=-L$(bupdir2)/bfd -lbfd -L$(bupdir1)/libiberty -liberty -L$(bupdir2)/intl -lintl
MINGW_LDLIBS:=
MINGW_DEP_LDLIBS:=
--- 57,60 ----
***************
*** 65,69 ****
$(LDFLAGS) $(ALL_LDLIBS)
MINGW_LDFLAGS:=-B/usr/lib/mingw $(MINGW_LIB)
- DUMPER_LDFLAGS:=$(ALL_LDFLAGS) $(DUMPER_LIB)
PROGS:=mount$(EXEEXT) ps$(EXEEXT) \
--- 62,65 ----
***************
*** 72,86 ****
CLEAN_PROGS:=$(PROGS)
- ifdef build_dumper
- PROGS+=dumper$(EXEEXT)
- else
- PROGS:=warn_dumper $(PROGS)
- CLEAN_PROGS+=dumper.exe
- endif
.SUFFIXES:
.NOEXPORT:
! .PHONY: all install clean realclean warn_dumper
all: Makefile $(PROGS)
--- 68,76 ----
CLEAN_PROGS:=$(PROGS)
.SUFFIXES:
.NOEXPORT:
! .PHONY: all install clean realclean
all: Makefile $(PROGS)
***************
*** 94,122 ****
endif
- dumper.o: dumper.cc dumper.h
- ifdef VERBOSE
- $(COMPILE_CXX) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
- else
- @echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
- $(COMPILE_CXX) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
- endif
-
-
- module_info.o: module_info.cc
- ifdef VERBOSE
- $(COMPILE_CXX) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
- else
- @echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
- $(COMPILE_CXX) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
- endif
-
- parse_pe.o: parse_pe.cc dumper.h
- ifdef VERBOSE
- $(COMPILE_CXX) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
- else
- @echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
- $(COMPILE_CXX) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
- endif
-
mingw_getopt.o: $(cygwin_source)/lib/getopt.c
ifdef VERBOSE
--- 84,87 ----
***************
*** 142,160 ****
$(cygwin_build)/libmsys-1.0.dll.a: $(cygwin_build)/Makefile
@$(MAKE) -C $(@D) $(@F)
-
- warn_dumper:
- @echo '*** Not building dumper.exe since some required libraries are'
- @echo '*** missing: libbfd.a and libintl.a.'
- @echo '*** If you need this program, check out the naked-bfd and naked-intl'
- @echo '*** sources from sources.redhat.com. Then, configure and build these'
- @echo '*** libraries. Otherwise, you can safely ignore this warning.'
-
- dumper.exe: module_info.o parse_pe.o dumper.o $(ALL_DEP_LDLIBS)
- ifdef VERBOSE
- $(CXX) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
- else
- @echo $(CXX) -o $@ ${wordlist 1,3,$^} ${filter-out -B%, $(DUMPER_LDFLAGS)};\
- $(CXX) -o $@ ${wordlist 1,3,$^} -B$(cygwin_build)/ $(DUMPER_LDFLAGS)
- endif
%.exe: %.o $(ALL_DEP_LDLIBS)
--- 107,110 ----
|
