diff options
author | Dave Korn <dave.korn.cygwin@gmail.com> | 2007-08-03 19:41:48 +0000 |
---|---|---|
committer | Dave Korn <dave.korn.cygwin@gmail.com> | 2007-08-03 19:41:48 +0000 |
commit | 64b94981dce92ddbdabe1e6d75ae3aa50350ed47 (patch) | |
tree | 4af65ae73950614339c036adf32926f012e91ce7 /winsup/utils/Makefile.in | |
parent | 6ddcdb9da510ddf2b6309006ded0827f467e23b4 (diff) | |
download | cygnal-64b94981dce92ddbdabe1e6d75ae3aa50350ed47.tar.gz cygnal-64b94981dce92ddbdabe1e6d75ae3aa50350ed47.tar.bz2 cygnal-64b94981dce92ddbdabe1e6d75ae3aa50350ed47.zip |
* Makefile.in (cygcheck.exe): Add bloda.o as prerequisite, adjusting
dependency-filtering $(wordlist ...) call appropriately. Link ntdll.
(bloda.o): New rule to build bloda.o
* cygcheck.cc (dump_sysinfo): Call bloda function dump_dodgy_apps().
* bloda.cc: New file implements detection of applications from the
Big List Of Dodgy Apps.
Diffstat (limited to 'winsup/utils/Makefile.in')
-rw-r--r-- | winsup/utils/Makefile.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in index 10f7d6550..b354f43d0 100644 --- a/winsup/utils/Makefile.in +++ b/winsup/utils/Makefile.in @@ -1,6 +1,6 @@ # Makefile for Cygwin utilities # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006 Red Hat, Inc. +# 2005, 2006, 2007 Red Hat, Inc. # This file is part of Cygwin. @@ -99,15 +99,15 @@ else $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,2,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) endif -cygcheck.exe: cygcheck.o path.o dump_setup.o $(MINGW_DEP_LDLIBS) +cygcheck.exe: cygcheck.o bloda.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,3,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) -lntdll else - @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) + @echo $(CXX) -o $@ ${wordlist 1,4,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)} $(libz) -lntdll;\ + $(CXX) $(MINGW_CXXFLAGS) -o $@ ${wordlist 1,4,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS) $(libz) -lntdll endif dumper.o: dumper.cc dumper.h @@ -150,6 +150,14 @@ else $(MINGW_CXX) $(zconf_h) $(zlib_h) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) $< endif +bloda.o: bloda.cc +ifdef VERBOSE + ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< +else + @echo $(MINGW_CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ + ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< +endif + cygcheck.o: cygcheck.cc ifdef VERBOSE ${MINGW_CXX} $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) -I$(updir) $< |