* Makefile.in: Use MINGW stuff from Makefile.common.

diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index ff7d660..93051e5 100644 (file)
--- 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 19346c4..0b747d7 100644 (file)
--- 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