diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-07-07 04:44:08 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-07-07 04:44:08 +0400 |
| commit | 3fde1c582673131cb83bffb4fcf27e2303675cce (patch) | |
| tree | 0a62cc1393ddadc6596ce0dc27a10937209925fb /winsup/utils | |
| parent | 952460192af7d9b0f072e9279baa9138570a9c08 (diff) | |
* Makefile.in: Use MINGW stuff from Makefile.common.
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/utils/Makefile.in | 13 |
2 files changed, 8 insertions, 9 deletions
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 |