Wed Oct 18 15:53:56 1995 steve chamberlain <sac@slash.cygnus.com>

	* winsup. New directory.
	* Makefile.in: Build winsup.
	* configure.in: Winsup is configured when target is win32.
	Can only build win32 target GDB when native.

3 files changed, 43 insertions, 22 deletions

diff --git a/.Sanitize b/.Sanitize
index 01d6eb9..79f0664 100644
--- a/.Sanitize
+++ b/.Sanitize
@@ -53,7 +53,7 @@ keep_these_too="${keep_these_too} .cvsignore CYGNUS autoconf
 	libio librx libstdc++ m4 make mmalloc move-if-change newlib opcodes
 	pagas patch prms rcs readline sed send-pr shellutils sim textutils
 	texinfo tgas utils uudecode wdiff xiberty
-	configure.bat makeall.bat
+	configure.bat makeall.bat winsup
 	mpw-README mpw-configure mpw-config.in mpw-build.in"
 
 lose_these_too="${lose_these_too} testsuite"
diff --git a/Makefile.in b/Makefile.in
index 96d5f30..d963ec6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -135,7 +135,7 @@ OTHERS =
 
 # This is set by the configure script to the list of directories which
 # should be built using the target tools.
-TARGET_CONFIGDIRS = xiberty libgloss newlib libio librx libstdc++ libg++
+TARGET_CONFIGDIRS = xiberty libgloss newlib libio librx libstdc++ libg++ winsup
 
 # This is set by the configure script to the arguments passed to configure.
 CONFIG_ARGUMENTS = 
@@ -548,6 +548,7 @@ ALL_TARGET_MODULES = \
 	all-librx \
 	all-libg++ \
 	all-newlib \
+	all-winsup \
 	all-libgloss \
 	all-xiberty
 
@@ -559,6 +560,7 @@ CONFIGURE_TARGET_MODULES = \
 	configure-librx \
 	configure-libg++ \
 	configure-newlib \
+	configure-winsup \
 	configure-libgloss \
 	configure-xiberty
 
@@ -569,6 +571,7 @@ CHECK_TARGET_MODULES = \
 	check-libstdc++ \
 	check-libg++ \
 	check-newlib \
+	check-winsup \
 	check-xiberty
 
 # This is a list of the install targets for all of the modules which are
@@ -578,12 +581,13 @@ INSTALL_TARGET_MODULES = \
 	install-libstdc++ \
 	install-libg++ \
 	install-newlib \
+	install-winsup \
 	install-libgloss \
 	install-xiberty
 
 # This is a shell case of all modules which are compiled using
 # $(TARGET_FLAGS_TO_PASS), used in the do-X rule.
-TARGET_LIBS = libio | libstdc++ | librx | libg++ | newlib | xiberty
+TARGET_LIBS = libio | libstdc++ | librx | libg++ | newlib | xiberty | winsup
 
 # The first rule in the file had better be this one.  Don't put any above it.
 all: all.normal
@@ -816,19 +820,23 @@ $(CONFIGURE_TARGET_MODULES):
 	if [ -f ./$${dir}/Makefile ] ; then \
 	  true; \
 	elif echo " $(TARGET_CONFIGDIRS) " | grep " $${dir} " >/dev/null 2>&1; then \
-	  if [ -d ./$${dir} ]; then true; else mkdir $${dir}; fi; \
-	  r=`pwd`; export r; \
-	  srcroot=`cd $(srcdir); pwd`; export srcroot; \
-	  AR="$(AR_FOR_TARGET)"; export AR; \
-	  AS="$(AS_FOR_TARGET)"; export AS; \
-	  CC="$(CC_FOR_TARGET)"; export CC; \
-	  CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-	  CXX="$(CXX_FOR_TARGET)"; export CXX; \
-	  CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
-	  NM="$(NM_FOR_TARGET)"; export NM; \
-	  RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
-	  cd $${dir}; \
-	  $${srcroot}/configure $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${dir}; \
+	  if [ -d $(srcdir)/$${dir} ]; then \
+	    if [ -d ./$${dir} ]; then true; else mkdir $${dir}; fi; \
+	    r=`pwd`; export r; \
+	    srcroot=`cd $(srcdir); pwd`; export srcroot; \
+	    AR="$(AR_FOR_TARGET)"; export AR; \
+	    AS="$(AS_FOR_TARGET)"; export AS; \
+	    CC="$(CC_FOR_TARGET)"; export CC; \
+	    CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+	    CXX="$(CXX_FOR_TARGET)"; export CXX; \
+	    CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
+	    NM="$(NM_FOR_TARGET)"; export NM; \
+	    RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
+	    cd $${dir}; \
+	    $${srcroot}/configure $(CONFIG_ARGUMENTS) --srcdir=$${srcroot}/$${dir}; \
+	  else \
+	    true; \
+	  fi \
 	else \
 	  true; \
 	fi
@@ -1027,6 +1035,8 @@ all-textutils:
 all-tgas: all-libiberty all-bfd
 all-time:
 all-wdiff:
+all-winsup: all-newlib 
+configure-winsup: configure-newlib
 all-uudecode: all-libiberty
 configure-xiberty: all-gcc
 all-xiberty: configure-xiberty all-gcc all-ld all-newlib
diff --git a/configure.in b/configure.in
index bdf3a6c..9329be3 100644
--- a/configure.in
+++ b/configure.in
@@ -322,10 +322,18 @@ done
 # Configure extra directories which are host specific
 
 case "${host}" in
-  i[345]86-*-go32*|i[345]86-*-win32*)
+  i[345]86-*-win32* | i[345]86-*-go32*)
 	  configdirs="$configdirs dosrel" ;;
 esac
 
+
+# Configure extra directories which are target specific
+
+case "${target}" in
+  i[345]86-*-win32*)
+	  configdirs="$configdirs winsup" ;;
+esac
+
 # Remove more programs from consideration, based on the host or 
 # target this usually means that a port of the program doesn't
 # exist yet.
@@ -340,7 +348,7 @@ case "${host}" in
     noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff"
 	;;
   i[345]86-*-win32)
-     noconfigdirs="tk tcl expect diff make texinfo bison flex send-pr gprof gdb readline"
+     noconfigdirs="tk tcl expect dejagnu texinfo bison send-pr gprof rcs"
     ;;
 esac
 
@@ -396,10 +404,12 @@ case "${target}" in
     ;;
 
   i[345]86-*-win32)
-    # Can't build gdb for win32 target
-    noconfigdirs="$noconfigdirs gdb tk"
-    # but put newlib back
-    skipdirs=`echo " ${skipdirs} " | sed -e 's/ newlib / /'`
+
+    noconfigdirs="$noconfigdirs tk"
+    # Can't build gdb for win32 if not native.
+    if [ x${is_cross_compiler} = xyes ]; then
+	    noconfigdirs="$noconfigdirs gdb"
+    fi
     ;;    
   i[345]86-*-pe)
     noconfigdirs="$noconfigdirs libg++ libstdc++ libio librx"
@@ -500,6 +510,7 @@ esac
 # Remove the entries in $skipdirs and $noconfigdirs from $configdirs and
 # $target_configdirs.
 # If we have the source for $noconfigdirs entries, add them to $notsupp.
+
 notsupp=""
 for dir in . $skipdirs $noconfigdirs ; do
   if [ $dir != . ]  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then