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/bz2lib | |
| parent | 952460192af7d9b0f072e9279baa9138570a9c08 (diff) | |
* Makefile.in: Use MINGW stuff from Makefile.common.
Diffstat (limited to 'winsup/bz2lib')
| -rw-r--r-- | winsup/bz2lib/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/bz2lib/Makefile.in | 17 |
2 files changed, 7 insertions, 14 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,) |