JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Christopher Faylor 2002-07-07 00:44:08 +00:00
parent 952460192a
commit 3fde1c5826
4 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/bz2lib/ChangeLog
View File

@ -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> Wed Apr 18 23:54:53 2001 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Add -U_WIN32 to CFLAGS compile line to avoid * Makefile.in: Add -U_WIN32 to CFLAGS compile line to avoid

17
winsup/bz2lib/Makefile.in
View File

@ -46,10 +46,6 @@ RANLIB:=@RANLIB@
include $(srcdir)/../Makefile.common 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 ZLIB:=zlib/libzcygw.a
BZ2LIB:=$(bupdir)/bz2lib/libbz2.a BZ2LIB:=$(bupdir)/bz2lib/libbz2.a
@ -98,19 +94,12 @@ install: all
%.o: %.c %.o: %.c
ifdef VERBOSE ifdef VERBOSE
$(CC) $(MINGW_CFLAGS) -c -o $@ $< $(CC) $c -o $(@D)/$(basename $@)$o -MD $(MINGW_CFLAGS) $<
else else
@echo $(CC) -c $(CFLAGS) ... $(<F) @echo $(CC) $c -o $(@D)/$(basename $@)$o $(MINGW_CFLAGS) ... $^;\
@$(CC) $(MINGW_CFLAGS) -c -o $@ $< $(CC) $c -o $(@D)/$(basename $@)$o -MD $(MINGW_CFLAGS) $<
endif 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) D=$(wildcard *.d)
ifneq ($D,) ifneq ($D,)

4
winsup/utils/ChangeLog
View File

@ -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> 2002-07-01 Corinna Vinschen <corinna@vinschen.de>
* mkgroup.c: Add function pointers for functions from advapi32.dll. * mkgroup.c: Add function pointers for functions from advapi32.dll.

13
winsup/utils/Makefile.in
View File

@ -36,17 +36,12 @@ override CXXFLAGS+=-fno-exceptions -fno-rtti -DHAVE_DECL_GETOPT=0
include $(srcdir)/../Makefile.common include $(srcdir)/../Makefile.common
MINGW_INCLUDES:=$(MINGW_INCLUDES) $(w32api_include) -I$(updir)
libbfd:=${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a} libbfd:=${shell $(CC) -B$(bupdir2)/bfd/ --print-file-name=libbfd.a}
libintl:=${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a} libintl:=${shell $(CC) -B$(bupdir2)/intl/ --print-file-name=libintl.a}
build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1} build_dumper:=${shell test -r $(libbfd) && test -r ${libintl} && echo 1}
DUMPER_INCLUDES:=-I$(bupdir2)/bfd -I$(updir1)/include 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 libcygwin:=$(cygwin_build)/libcygwin.a
libuser32:=$(w32api_lib)/libuser32.a libuser32:=$(w32api_lib)/libuser32.a
libkernel32:=$(w32api_lib)/libkernel32.a libkernel32:=$(w32api_lib)/libkernel32.a
@ -153,18 +148,18 @@ endif
cygcheck.o: cygcheck.cc cygcheck.o: cygcheck.cc
ifdef VERBOSE 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 else
@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ @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 endif
strace.o: strace.cc strace.o: strace.cc
ifdef VERBOSE 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 else
@echo $(CXX) $c -o $(@D)/$(basename $@)$o $(MINGW_CXXFLAGS) ... $^;\ @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 endif
kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o kill.exe: kill.o $(bupdir1)/libiberty/strsignal.o