From 3fde1c582673131cb83bffb4fcf27e2303675cce Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 7 Jul 2002 00:44:08 +0000
Subject: [PATCH] * Makefile.in: Use MINGW stuff from Makefile.common.

---
 winsup/bz2lib/ChangeLog   |  4 ++++
 winsup/bz2lib/Makefile.in | 17 +++--------------
 winsup/utils/ChangeLog    |  4 ++++
 winsup/utils/Makefile.in  | 13 ++++---------
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/winsup/bz2lib/ChangeLog b/winsup/bz2lib/ChangeLog
index c703a6e76..939dea3e8 100644
--- a/winsup/bz2lib/ChangeLog
+++ b/winsup/bz2lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-06  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Use MINGW stuff from Makefile.common.
+
 Wed Apr 18 23:54:53 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in: Add -U_WIN32 to CFLAGS compile line to avoid
diff --git a/winsup/bz2lib/Makefile.in b/winsup/bz2lib/Makefile.in
index 622445d23..a34b146a6 100644
--- a/winsup/bz2lib/Makefile.in
+++ b/winsup/bz2lib/Makefile.in
@@ -46,10 +46,6 @@ RANLIB:=@RANLIB@
 
 include $(srcdir)/../Makefile.common
 
-MINGW_INCLUDES:=-I. -I$(srcdir) -I$(mingw_source)/include -I$(w32api_include) -I$(updir)/bz2lib
-
-MINGW_CXXFLAGS:=-MMD $(CXXFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows -U_WIN32
-MINGW_CFLAGS:=-MMD $(CFLAGS) -mno-cygwin $(MINGW_INCLUDES) -mwindows -U_WIN32
 
 ZLIB:=zlib/libzcygw.a
 BZ2LIB:=$(bupdir)/bz2lib/libbz2.a
@@ -98,19 +94,12 @@ install: all
 
 %.o: %.c
 ifdef VERBOSE
-	$(CC) $(MINGW_CFLAGS) -c -o $@ $<
+	$(CC) $c -o $(@D)/$(basename $@)$o -MD $(MINGW_CFLAGS) $<
 else
-	@echo $(CC) -c $(CFLAGS) ... $(<F)
-	@$(CC) $(MINGW_CFLAGS) -c -o $@ $<
+	@echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\
+	$(CC) $c -o $(@D)/$(basename $@)$o -MD $(MINGW_CFLAGS) $<
 endif
 
-%.o: %.cc
-ifdef VERBOSE
-	$(CXX) $(MINGW_CXXFLAGS) -c -o $@ $<
-else
-	@echo $(CXX) -c $(CXXFLAGS) ... $(<F)
-	@$(CXX) $(MINGW_CXXFLAGS) -c -o $@ $<
-endif
 
 D=$(wildcard *.d)
 ifneq ($D,)
diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index ff7d66070..93051e5c2 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+2002-07-06  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Use MINGW stuff from Makefile.common.
+
 2002-07-01  Corinna Vinschen  <corinna@vinschen.de>
 
 	* mkgroup.c: Add function pointers for functions from advapi32.dll.
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 19346c474..0b747d7d5 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -36,17 +36,12 @@ override CXXFLAGS+=-fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0
 
 include $(srcdir)/../Makefile.common
 
-MINGW_INCLUDES:=$(MINGW_INCLUDES) $(w32api_include) -I$(updir)
-
 libbfd:=${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}
 libintl:=${shell $(CC) -B$(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_CXXFLAGS:=${filter-out $(newlib_source)/%,$(CXXFLAGS)} -mno-cygwin $(MINGW_INCLUDES)
-MINGW_CFLAGS:=-mno-cygwin $(MINGW_INCLUDES)
-
 libcygwin:=$(cygwin_build)/libcygwin.a
 libuser32:=$(w32api_lib)/libuser32.a
 libkernel32:=$(w32api_lib)/libkernel32.a
@@ -153,18 +148,18 @@ endif
 
 cygcheck.o: cygcheck.cc
 ifdef VERBOSE
-	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
+	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
 else
 	@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
-	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
+	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
 endif
 
 strace.o: strace.cc
 ifdef VERBOSE
-	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
+	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
 else
 	@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\
-	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $<
+	${filter-out -I$(newlib_source)/%,$(COMPILE_CXX)} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $<
 endif
 
 kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o