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

winsup:

Browse Source 
* Makefile.common (zlib_source): Remove.
	(zlib_build): Remove.
	(bz2lib_source): Remove.
	(bz2lib_build): Remove.
	(w32api_source): Remove.
	(w32api_build): Remove.
	(w32api_lib): Remove.
	(mingw_build): Remove.
	(mingw_source): Remove.
	($(w32api_lib)/%.a): Remove rule.
	* Makefile.in (ZLIB): Remove.
	($(SUBDIRS)): Drop mingw check.
	(mingw): Remove rule.
	(install_mingw): Ditto.
	* configure.in: Remove support for mingw as build target.
	* configure: Regenerate.

utils:

	* Makefile.in ($(MINGW_BINS)): Drop -B$(mingw_build)/ from build
	expression.
This commit is contained in:
Corinna Vinschen 2012-11-07 16:32:08 +00:00
parent 4d586ac09e
commit 5b31f27f6d
6 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/Makefile.common
View File

@ -50,19 +50,10 @@ else
endif
endif
zlib_source:=$(updir)/zlib
zlib_build:=$(bupdir)/zlib
bz2lib_source:=$(updir)/bz2lib
bz2lib_build:=$(bupdir)/bz2lib
w32api_source:=$(updir)/w32api
w32api_build:=$(bupdir)/w32api
w32api_lib:=$(w32api_build)/lib
newlib_source:=$(updir1)/newlib
newlib_build:=$(bupdir1)/newlib
cygwin_build:=$(bupdir)/cygwin
cygwin_source:=$(updir)/cygwin
mingw_build:=$(bupdir)/mingw
mingw_source:=$(updir)/mingw
utils_build:=$(bupdir)/utils
utils_source:=$(updir)/utils
ifeq (,${findstring $(newlib_source)/libc/include,$(CFLAGS) $(CXXFLAGS) $(CXX) $(CC)})
@ -157,15 +148,6 @@ endif
$(bupdir1)/libiberty/%.o: $(updir1)/libiberty/%.c
@$(MAKE) -C $(@D) $(@F)
$(w32api_lib)/%.a: $(w32api_lib)/Makefile
@$(MAKE) --no-print-dir -C $(@D) $(@F)
$(bz2lib)/%.a: $(bz2lib)/Makefile
@$(MAKE) --no-print-dir -C $(@D) $(@F)
$(zlib)/%.a: $(zlib)/Makefile
@$(MAKE) --no-print-dir -C $(@D) $(@F)
all:
# For auto-rebuilding the Makefile

6
winsup/Makefile.in
View File

@ -45,7 +45,6 @@ INSTALL_DATA:=@INSTALL_DATA@
SUBDIRS=@subdirs@
INSTALL_SUBDIRS=${patsubst %,install_%,$(SUBDIRS)}
CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)}
ZLIB=${findstring zlib,$(SUBDIRS)}
INSTALL_LICENSE:=@INSTALL_LICENSE@
@ -82,7 +81,6 @@ info:
$(SUBDIRS):
@if cd $@ 2>/dev/null; then \
test "$@" = "mingw" && export DISTCC_HOSTS=localhost;\
$(MAKE) all || exit 1; \
fi || exit 0
@ -123,16 +121,12 @@ check: cygwin
utils: cygwin
mingw: w32api
cygwin:
cygserver: cygwin
install_utils: cygwin
install_mingw: w32api
install_cygwin:
install_cygserver: cygwin

15
winsup/configure vendored
View File

@ -646,9 +646,7 @@ CPPFLAGS
CXX
CXXFLAGS
CCC'
ac_subdirs_all='cygwin cygserver lsaauth utils doc
mingw
w32api'
ac_subdirs_all='cygwin cygserver lsaauth utils doc'
# Initialize some variables set by options.
ac_init_help=
@ -3398,17 +3396,6 @@ subdirs="$subdirs cygwin cygserver lsaauth utils doc"
INSTALL_LICENSE="install-license"
;;
*mingw*)
if ! test -d $srcdir/mingw; then
as_fn_error $? "\"No mingw dir. Can't build Mingw. Exiting...\"" "$LINENO" 5
fi
subdirs="$subdirs mingw"
if test -d $srcdir/w32api; then
subdirs="$subdirs w32api"
fi
;;
esac

9
winsup/configure.in
View File

@ -35,15 +35,6 @@ case "$target" in
AC_CONFIG_SUBDIRS(cygwin cygserver lsaauth utils doc)
INSTALL_LICENSE="install-license"
;;
*mingw*)
if ! test -d $srcdir/mingw; then
AC_MSG_ERROR("No mingw dir. Can't build Mingw. Exiting...")
fi
AC_CONFIG_SUBDIRS(mingw)
if test -d $srcdir/w32api; then
AC_CONFIG_SUBDIRS(w32api)
fi
;;
esac
AC_SUBST(INSTALL_LICENSE)

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2012-11-07 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in ($(MINGW_BINS)): Drop -B$(mingw_build)/ from build
expression.
2012-11-05 Corinna Vinschen <corinna@vinschen.de>
* Makefile.in (MINGW_CXX): Attach $(CFLAGS) to allow providing

4
winsup/utils/Makefile.in
View File

@ -138,10 +138,10 @@ endif
# how to link a MinGW binary
$(MINGW_BINS): %.exe: %.o
ifdef VERBOSE
$(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
$(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} $(MINGW_LDFLAGS)
else
@echo $(MINGW_CXX) -o $@ ${filter %.o,$^} ${filter-out -B%, $(MINGW_CXXFLAGS) $(MINGW_LDFLAGS)};\
$(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} -B$(mingw_build)/ $(MINGW_LDFLAGS)
$(MINGW_CXX) $(MINGW_CXXFLAGS) -o $@ ${filter %.o,$^} $(MINGW_LDFLAGS)
endif
# how to link a Cygwin binary