Re: make 3.81 MinGW port and testsuite working with MSYS

make-w32

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: make 3.81 MinGW port and testsuite working with MSYS

From:	J. Grant
Subject:	Re: make 3.81 MinGW port and testsuite working with MSYS
Date:	Sat, 26 Feb 2005 00:50:02 +0000
User-agent:	Mozilla/5.0 (X11; U; GNU/Linux i686; en; rv:1.5.0; hi) Gecko/20030604

Hi Paul,

Ok, attached is the uncompressed 31,174 bytes file, with md5sum:
8d7bf7d043711b4e16e7947c748b65d1  make-3.81beta2.MinGW.support.patch

Kind regards
JG

diff -uNr make-3.81beta2.base/configure.in make-3.81beta2.MinGW/configure.in
--- make-3.81beta2.base/configure.in    2005-02-16 05:03:42.000000000 +0000
+++ make-3.81beta2.MinGW/configure.in   2005-02-24 21:13:46.000000000 +0000
@@ -235,6 +235,17 @@
 # Tell automake about this, so it can include the right .c files.
 AM_CONDITIONAL(USE_CUSTOMS, test "$use_customs" = true)
 
+# See if we want case insensitive file system feature.
+
+AH_TEMPLATE(HAVE_CASE_INSENSITIVE_FS, [Use case insensitive file names])
+AC_MSG_CHECKING("case insensitive support")
+AC_ARG_ENABLE(case-insensitive-file-system,
+  AC_HELP_STRING([--enable-case-insensitive-file-system],
+                [enable case insensitive file system support]),
+  case_insensitive_fs="yes" AC_DEFINE(HAVE_CASE_INSENSITIVE_FS),
+  case_insensitive_fs="no")
+AC_MSG_RESULT($case_insensitive_fs)
+
 # See if we can handle the job server feature, and if the user wants it.
 
 AC_ARG_ENABLE(job-server,
@@ -331,6 +342,18 @@
 MAKE_HOST="$host"
 AC_SUBST(MAKE_HOST)
 
+win32_target_env=no
+AM_CONDITIONAL(WINDOWSENV, false)
+
+case "$host" in
+  *-*-mingw32)
+    AM_CONDITIONAL(WINDOWSENV, true)
+    win32_target_env=yes
+    AC_DEFINE([WINDOWS32], [1], [Use platform specific coding])
+    AC_DEFINE([HAVE_DOS_PATHS], [1], [Use platform specific coding])
+    ;;
+esac
+
 # Include the Maintainer's Makefile section, if it's here.
 
 MAINT_MAKEFILE=/dev/null
@@ -391,6 +414,11 @@
 # Specify what files are to be created.
 AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile 
doc/Makefile)
 
+# Only process if target is MS-Windows
+if test "$win32_target_env" == yes; then
+    AC_CONFIG_FILES(w32/Makefile)
+fi
+
 # OK, do it!
 
 AC_OUTPUT
diff -uNr make-3.81beta2.base/main.c make-3.81beta2.MinGW/main.c
--- make-3.81beta2.base/main.c  2005-02-16 05:03:42.000000000 +0000
+++ make-3.81beta2.MinGW/main.c 2005-02-24 20:10:28.000000000 +0000
@@ -1026,6 +1026,25 @@
       if (program == 0 && argv[0][1] == ':')
        program = argv[0] + 1;
 #endif
+
+#ifdef WINDOWS32
+      if(program == 0)
+      {
+        /* Extract program from full path */
+        char * p = strrchr (argv[0], '\\');
+        int argv0_len = strlen(p);
+        if(argv0_len > 4)
+        {
+          if(p[argv0_len - 4] == '.' && p[argv0_len - 3] == 'e' && p[argv0_len 
- 2] == 'x' && p[argv0_len - 1] == 'e')
+          {
+           /* Remove .exe extension */
+           p[argv0_len - 4] = '\0';
+           /* Increment past the initial '\' */
+           program = p + 1;
+          }
+        }
+      }
+#endif
       if (program == 0)
        program = argv[0];
       else
diff -uNr make-3.81beta2.base/Makefile.am make-3.81beta2.MinGW/Makefile.am
--- make-3.81beta2.base/Makefile.am     2004-11-30 20:58:55.000000000 +0000
+++ make-3.81beta2.MinGW/Makefile.am    2005-02-23 02:43:52.000000000 +0000
@@ -4,6 +4,12 @@
 ACLOCAL_AMFLAGS        =  -I config
 
 SUBDIRS =      glob config po doc
+# Only process if target is MS-Windows
+if WINDOWSENV
+    SUBDIRS += w32
+    W32INC       :=    -I $(top_srcdir)/w32/include
+    W32LIB       :=    -Lw32 -lw32
+endif
 
 bin_PROGRAMS = make
 
@@ -26,12 +32,22 @@
 
 make_LDADD =   @LIBOBJS@ @ALLOCA@ $(GLOBLIB) @GETLOADAVG_LIBS@ @LIBINTL@
 
+# Only process if target is MS-Windows
+if WINDOWSENV
+    make_LDADD += $(W32LIB)
+endif
+
 man_MANS =     make.1
 
 DEFS =         -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"$(libdir)\" 
-DINCLUDEDIR=\"$(includedir)\" @DEFS@
 
 AM_CPPFLAGS =  $(GLOBINC)
 
+# Only process if target is MS-Windows
+if WINDOWSENV
+    AM_CPPFLAGS +=     $(W32INC)
+endif
+
 
 # Extra stuff to include in the distribution.
 # Note we need all the glob stuff here, rather than in glob/Makefile.am,
diff -uNr make-3.81beta2.base/tests/run_make_tests.pl 
make-3.81beta2.MinGW/tests/run_make_tests.pl
--- make-3.81beta2.base/tests/run_make_tests.pl 2005-02-10 00:10:58.000000000 
+0000
+++ make-3.81beta2.MinGW/tests/run_make_tests.pl        2005-02-24 
20:12:00.000000000 +0000
@@ -145,7 +145,14 @@
         || die "Can't rename $log to $tn: $!\n";
       ++$purify_errors;
     } else {
-      unlink($pure_log);
+      if ($osname =~ /MINGW32/i)
+      {
+        print "not unlinking $pure_log because using mingw\n" if($debug);
+      }
+      else
+      {
+        unlink($pure_log);
+      }
     }
   }
 
@@ -218,6 +225,9 @@
    if ($osname =~ /Windows/i) {
      $port_type = 'W32';
    }
+   elsif ($osname =~ /MINGW32/i) {
+     $port_type = 'W32';
+   }
    # Bleah, the osname is so variable on DOS.  This kind of bites.
    # Well, as far as I can tell if we check for some text at the
    # beginning of the line with either no spaces or a single space, then
@@ -243,11 +253,20 @@
    #
    $wtime = $port_type eq 'UNIX' ? 1 : $port_type eq 'OS/2' ? 2 : 4;
 
+
+   print "Port type: $port_type\n" if $debug;
+   print "Make path: $make_path\n" if $debug;
+
+
    # Find the full pathname of Make.  For DOS systems this is more
    # complicated, so we ask make itself.
 
-   $make_path = `sh -c 'echo "all:;address@hidden \\\$(MAKE)" | $make_path 
-f-'`;
-   chop $make_path;
+   # do not change the make_path on W32 (MinGW/MSYS), because the following 
shell code does not work
+   if ($port_type =~ !/W32/)
+   {
+      $make_path = `sh -c 'echo "all:;address@hidden \\\$(MAKE)" | $make_path 
-f-'`;
+      chop $make_path;
+   }
    print "Make\t= `$make_path'\n" if $debug;
 
    $string = `$make_path -v -f /dev/null 2> /dev/null`;
@@ -316,13 +335,16 @@
 {
   $makefile = &get_tmpfile;
   if (-f $makefile) {
+    print "unlink($makefile)\n" if($debug);
     unlink $makefile;
   }
 
   # Get rid of any Purify logs.
   if ($pure_log) {
+    print "pure_log: $pure_log\n" if($debug);
     ($pure_testname = $testname) =~ tr,/,_,;
     $pure_testname = "$pure_log.$pure_testname";
+    print "testname: $testname)\n" if($debug);
     system("rm -f $pure_testname*");
     print("Purify testfiles are: $pure_testname*\n") if $debug;
   }
diff -uNr make-3.81beta2.base/tests/test_driver.pl 
make-3.81beta2.MinGW/tests/test_driver.pl
--- make-3.81beta2.base/tests/test_driver.pl    2004-09-21 06:39:04.000000000 
+0100
+++ make-3.81beta2.MinGW/tests/test_driver.pl   2005-02-24 16:14:34.000000000 
+0000
@@ -412,6 +412,7 @@
     &setup_for_test;          # suite-defined
 
     $output = "........................................................ ";
+    print "\n" if($debug);
 
     substr($output,0,length($testname)) = "$testname ";
 
@@ -440,10 +441,11 @@
     }
     elsif ($code == -1) {
       $suite_passed = 0;
+         print "error: code $code" if $debug;
     }
     elsif ($code != 1 && $code != -1) {
       $suite_passed = 0;
-      warn "\n*** Test returned $code\n";
+      print "\nerror:*** Test returned $code\n" if $debug;
     }
 
     if ($suite_passed) {
@@ -613,7 +615,15 @@
   local($answer,$logfile) = @_;
   local($slurp);
 
-  print "Comparing Output ........ " if $debug;
+  print "Comparing Output ........\n" if $debug;
+  print "logfile: $logfile\n" if $debug;
+
+  # All reference output is LF format, so convert CRLF to LF if we are testing 
W32
+  if ($osname =~ /MINGW32/i)
+  {
+     print "mingw matched, will run dos2unix on output log\n" if($debug);
+     run_command("dos2unix $logfile");
+  }
 
   $slurp = &read_file_into_string ($logfile);
 
diff -uNr make-3.81beta2.base/w32/Makefile.am 
make-3.81beta2.MinGW/w32/Makefile.am
--- make-3.81beta2.base/w32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ make-3.81beta2.MinGW/w32/Makefile.am        2003-04-11 19:34:58.000000000 
+0100
@@ -0,0 +1,8 @@
+# Makefile.am to create libw32.a for mingw32 host.
+
+noinst_LIBRARIES = libw32.a
+
+libw32_a_SOURCES =  subproc/misc.c subproc/sub_proc.c subproc/w32err.c \
+                   pathstuff.c
+
+libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir)
diff -uNr make-3.81beta2.base/w32/Makefile.in 
make-3.81beta2.MinGW/w32/Makefile.in
--- make-3.81beta2.base/w32/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ make-3.81beta2.MinGW/w32/Makefile.in        2005-02-23 15:00:50.000000000 
+0000
@@ -0,0 +1,481 @@
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
address@hidden@
+
+# Makefile.am to create libw32.a for mingw32 host.
+
+SOURCES = $(libw32_a_SOURCES)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = w32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/config/dospaths.m4 \
+       $(top_srcdir)/config/gettext.m4 $(top_srcdir)/config/iconv.m4 \
+       $(top_srcdir)/config/lib-ld.m4 \
+       $(top_srcdir)/config/lib-link.m4 \
+       $(top_srcdir)/config/lib-prefix.m4 $(top_srcdir)/config/nls.m4 \
+       $(top_srcdir)/config/po.m4 $(top_srcdir)/config/progtest.m4 \
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libw32_a_AR = $(AR) $(ARFLAGS)
+libw32_a_LIBADD =
+am_libw32_a_OBJECTS = libw32_a-misc.$(OBJEXT) \
+       libw32_a-sub_proc.$(OBJEXT) libw32_a-w32err.$(OBJEXT) \
+       libw32_a-pathstuff.$(OBJEXT)
+libw32_a_OBJECTS = $(am_libw32_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libw32_a_SOURCES)
+DIST_SOURCES = $(libw32_a_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
+GLOBINC = @GLOBINC@
+GLOBLIB = @GLOBLIB@
+GMSGFMT = @GMSGFMT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+KMEM_GROUP = @KMEM_GROUP@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MAKE_HOST = @MAKE_HOST@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NEED_SETGID = @NEED_SETGID@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
+POSUB = @POSUB@
+RANLIB = @RANLIB@
+REMOTE = @REMOTE@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+U = @U@
+USE_CUSTOMS_FALSE = @USE_CUSTOMS_FALSE@
+USE_CUSTOMS_TRUE = @USE_CUSTOMS_TRUE@
+USE_LOCAL_GLOB_FALSE = @USE_LOCAL_GLOB_FALSE@
+USE_LOCAL_GLOB_TRUE = @USE_LOCAL_GLOB_TRUE@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WINDOWSENV_FALSE = @WINDOWSENV_FALSE@
+WINDOWSENV_TRUE = @WINDOWSENV_TRUE@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+noinst_LIBRARIES = libw32.a
+libw32_a_SOURCES = subproc/misc.c subproc/sub_proc.c subproc/w32err.c \
+                   pathstuff.c
+
+libw32_a_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/subproc -I$(top_srcdir)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+               && exit 0; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  w32/Makefile'; \
+       cd $(top_srcdir) && \
+         $(AUTOMAKE) --gnu  w32/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ 
$(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure 
$(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+clean-noinstLIBRARIES:
+       -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+libw32.a: $(libw32_a_OBJECTS) $(libw32_a_DEPENDENCIES) 
+       -rm -f libw32.a
+       $(libw32_a_AR) libw32.a $(libw32_a_OBJECTS) $(libw32_a_LIBADD)
+       $(RANLIB) libw32.a
+
+mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
+
+distclean-compile:
+       -rm -f *.tab.c
+
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
address@hidden@@am__include@ @address@hidden/$(DEPDIR)/address@hidden@
+
+.c.o:
address@hidden@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ 
$<; \
address@hidden@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f 
"$(DEPDIR)/$*.Tpo"; exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='$<' object='$@' libtool=no 
@AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(COMPILE) -c $<
+
+.c.obj:
address@hidden@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ 
`$(CYGPATH_W) '$<'`; \
address@hidden@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f 
"$(DEPDIR)/$*.Tpo"; exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='$<' object='$@' libtool=no 
@AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+libw32_a-misc.o: subproc/misc.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libw32_a-misc.o -MD 
-MP -MF "$(DEPDIR)/libw32_a-misc.Tpo" -c -o libw32_a-misc.o `test -f 
'subproc/misc.c' || echo '$(srcdir)/'`subproc/misc.c; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-misc.Tpo" 
"$(DEPDIR)/libw32_a-misc.Po"; else rm -f "$(DEPDIR)/libw32_a-misc.Tpo"; exit 1; 
fi
address@hidden@@am__fastdepCC_FALSE@    source='subproc/misc.c' 
object='libw32_a-misc.o' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libw32_a-misc.o 
`test -f 'subproc/misc.c' || echo '$(srcdir)/'`subproc/misc.c
+
+libw32_a-misc.obj: subproc/misc.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libw32_a-misc.obj 
-MD -MP -MF "$(DEPDIR)/libw32_a-misc.Tpo" -c -o libw32_a-misc.obj `if test -f 
'subproc/misc.c'; then $(CYGPATH_W) 'subproc/misc.c'; else $(CYGPATH_W) 
'$(srcdir)/subproc/misc.c'; fi`; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-misc.Tpo" 
"$(DEPDIR)/libw32_a-misc.Po"; else rm -f "$(DEPDIR)/libw32_a-misc.Tpo"; exit 1; 
fi
address@hidden@@am__fastdepCC_FALSE@    source='subproc/misc.c' 
object='libw32_a-misc.obj' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libw32_a-misc.obj 
`if test -f 'subproc/misc.c'; then $(CYGPATH_W) 'subproc/misc.c'; else 
$(CYGPATH_W) '$(srcdir)/subproc/misc.c'; fi`
+
+libw32_a-sub_proc.o: subproc/sub_proc.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libw32_a-sub_proc.o 
-MD -MP -MF "$(DEPDIR)/libw32_a-sub_proc.Tpo" -c -o libw32_a-sub_proc.o `test 
-f 'subproc/sub_proc.c' || echo '$(srcdir)/'`subproc/sub_proc.c; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-sub_proc.Tpo" 
"$(DEPDIR)/libw32_a-sub_proc.Po"; else rm -f "$(DEPDIR)/libw32_a-sub_proc.Tpo"; 
exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='subproc/sub_proc.c' 
object='libw32_a-sub_proc.o' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libw32_a-sub_proc.o `test -f 'subproc/sub_proc.c' || echo 
'$(srcdir)/'`subproc/sub_proc.c
+
+libw32_a-sub_proc.obj: subproc/sub_proc.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libw32_a-sub_proc.obj -MD -MP -MF "$(DEPDIR)/libw32_a-sub_proc.Tpo" -c -o 
libw32_a-sub_proc.obj `if test -f 'subproc/sub_proc.c'; then $(CYGPATH_W) 
'subproc/sub_proc.c'; else $(CYGPATH_W) '$(srcdir)/subproc/sub_proc.c'; fi`; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-sub_proc.Tpo" 
"$(DEPDIR)/libw32_a-sub_proc.Po"; else rm -f "$(DEPDIR)/libw32_a-sub_proc.Tpo"; 
exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='subproc/sub_proc.c' 
object='libw32_a-sub_proc.obj' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libw32_a-sub_proc.obj `if test -f 'subproc/sub_proc.c'; then $(CYGPATH_W) 
'subproc/sub_proc.c'; else $(CYGPATH_W) '$(srcdir)/subproc/sub_proc.c'; fi`
+
+libw32_a-w32err.o: subproc/w32err.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libw32_a-w32err.o 
-MD -MP -MF "$(DEPDIR)/libw32_a-w32err.Tpo" -c -o libw32_a-w32err.o `test -f 
'subproc/w32err.c' || echo '$(srcdir)/'`subproc/w32err.c; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-w32err.Tpo" 
"$(DEPDIR)/libw32_a-w32err.Po"; else rm -f "$(DEPDIR)/libw32_a-w32err.Tpo"; 
exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='subproc/w32err.c' 
object='libw32_a-w32err.o' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libw32_a-w32err.o 
`test -f 'subproc/w32err.c' || echo '$(srcdir)/'`subproc/w32err.c
+
+libw32_a-w32err.obj: subproc/w32err.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libw32_a-w32err.obj 
-MD -MP -MF "$(DEPDIR)/libw32_a-w32err.Tpo" -c -o libw32_a-w32err.obj `if test 
-f 'subproc/w32err.c'; then $(CYGPATH_W) 'subproc/w32err.c'; else $(CYGPATH_W) 
'$(srcdir)/subproc/w32err.c'; fi`; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-w32err.Tpo" 
"$(DEPDIR)/libw32_a-w32err.Po"; else rm -f "$(DEPDIR)/libw32_a-w32err.Tpo"; 
exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='subproc/w32err.c' 
object='libw32_a-w32err.obj' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libw32_a-w32err.obj `if test -f 'subproc/w32err.c'; then $(CYGPATH_W) 
'subproc/w32err.c'; else $(CYGPATH_W) '$(srcdir)/subproc/w32err.c'; fi`
+
+libw32_a-pathstuff.o: pathstuff.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libw32_a-pathstuff.o -MD -MP -MF "$(DEPDIR)/libw32_a-pathstuff.Tpo" -c -o 
libw32_a-pathstuff.o `test -f 'pathstuff.c' || echo '$(srcdir)/'`pathstuff.c; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-pathstuff.Tpo" 
"$(DEPDIR)/libw32_a-pathstuff.Po"; else rm -f 
"$(DEPDIR)/libw32_a-pathstuff.Tpo"; exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='pathstuff.c' 
object='libw32_a-pathstuff.o' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libw32_a-pathstuff.o `test -f 'pathstuff.c' || echo '$(srcdir)/'`pathstuff.c
+
+libw32_a-pathstuff.obj: pathstuff.c
address@hidden@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT 
libw32_a-pathstuff.obj -MD -MP -MF "$(DEPDIR)/libw32_a-pathstuff.Tpo" -c -o 
libw32_a-pathstuff.obj `if test -f 'pathstuff.c'; then $(CYGPATH_W) 
'pathstuff.c'; else $(CYGPATH_W) '$(srcdir)/pathstuff.c'; fi`; \
address@hidden@ then mv -f "$(DEPDIR)/libw32_a-pathstuff.Tpo" 
"$(DEPDIR)/libw32_a-pathstuff.Po"; else rm -f 
"$(DEPDIR)/libw32_a-pathstuff.Tpo"; exit 1; fi
address@hidden@@am__fastdepCC_FALSE@    source='pathstuff.c' 
object='libw32_a-pathstuff.obj' libtool=no @AMDEPBACKSLASH@
address@hidden@@am__fastdepCC_FALSE@    DEPDIR=$(DEPDIR) $(CCDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
address@hidden@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libw32_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o 
libw32_a-pathstuff.obj `if test -f 'pathstuff.c'; then $(CYGPATH_W) 
'pathstuff.c'; else $(CYGPATH_W) '$(srcdir)/pathstuff.c'; fi`
+uninstall-info-am:
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+         test -n "$$unique" || unique=$$empty_fix; \
+         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+           $$tags $$unique; \
+       fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+               $(TAGS_FILES) $(LISP)
+       tags=; \
+       here=`pwd`; \
+       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+       unique=`for i in $$list; do \
+           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+         done | \
+         $(AWK) '    { files[$$0] = 1; } \
+              END { for (i in files) print i; }'`; \
+       test -z "$(CTAGS_ARGS)$$tags$$unique" \
+         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+            $$tags $$unique
+
+GTAGS:
+       here=`$(am__cd) $(top_builddir) && pwd` \
+         && cd $(top_srcdir) \
+         && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+       @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+       list='$(DISTFILES)'; for file in $$list; do \
+         case $$file in \
+           $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+           $(top_srcdir)/*) file=`echo "$$file" | sed 
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+         esac; \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+         dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+         if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+           dir="/$$dir"; \
+           $(mkdir_p) "$(distdir)$$dir"; \
+         else \
+           dir=''; \
+         fi; \
+         if test -d $$d/$$file; then \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+           fi; \
+           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+         else \
+           test -f $(distdir)/$$file \
+           || cp -p $$d/$$file $(distdir)/$$file \
+           || exit 1; \
+         fi; \
+       done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LIBRARIES)
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+
+distclean: distclean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+       distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+       -rm -rf ./$(DEPDIR)
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+       clean-noinstLIBRARIES ctags distclean distclean-compile \
+       distclean-generic distclean-tags distdir dvi dvi-am html \
+       html-am info info-am install install-am install-data \
+       install-data-am install-exec install-exec-am install-info \
+       install-info-am install-man install-strip installcheck \
+       installcheck-am installdirs maintainer-clean \
+       maintainer-clean-generic mostlyclean mostlyclean-compile \
+       mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+       uninstall-am uninstall-info-am
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr make-3.81beta2.base/w32/subproc/sub_proc.c 
make-3.81beta2.MinGW/w32/subproc/sub_proc.c
--- make-3.81beta2.base/w32/subproc/sub_proc.c  2004-02-23 06:25:54.000000000 
+0000
+++ make-3.81beta2.MinGW/w32/subproc/sub_proc.c 2005-02-24 20:18:28.000000000 
+0000
@@ -664,7 +664,7 @@
        DWORD wait_return;
        HANDLE ready_hand;
        bool_t child_dead = FALSE;
-
+       BOOL GetExitCodeResult;
 
        /*
         *  Create stdin thread, if needed
@@ -761,8 +761,8 @@
                        stderr_eof = TRUE;
 
                } else if (ready_hand == childhand) {
-
-                       if (GetExitCodeProcess(childhand, &pproc->exit_code) == 
FALSE) {
+            GetExitCodeResult = GetExitCodeProcess(childhand, 
(DWORD*)&pproc->exit_code);
+                       if (GetExitCodeResult == FALSE) {
                                pproc->last_err = GetLastError();
                                pproc->lerrno = E_SCALL;
                                goto done;
@@ -809,6 +809,7 @@
        sub_process *pproc;
        HANDLE childhand;
        DWORD wait_return;
+       BOOL GetExitCodeResult;
 
        if (proc == NULL)
                pproc = process_wait_for_any_private();
@@ -852,7 +853,8 @@
                goto done2;
        }
 
-       if (GetExitCodeProcess(childhand, &pproc->exit_code) == FALSE) {
+    GetExitCodeResult = GetExitCodeProcess(childhand, 
(DWORD*)&pproc->exit_code);
+       if (GetExitCodeResult == FALSE) {
                pproc->last_err = GetLastError();
                pproc->lerrno = E_SCALL;
        }
diff -uNr make-3.81beta2.base/w32/subproc/w32err.c 
make-3.81beta2.MinGW/w32/subproc/w32err.c
--- make-3.81beta2.base/w32/subproc/w32err.c    2004-02-23 06:25:54.000000000 
+0000
+++ make-3.81beta2.MinGW/w32/subproc/w32err.c   2005-02-23 14:03:32.000000000 
+0000
@@ -11,9 +11,12 @@
  */
 char *
 map_windows32_error_to_string (DWORD ercode) {
-/* __declspec (thread) necessary if you will use multiple threads */
+/* __declspec (thread) necessary if you will use multiple threads on MSVC */
+#ifdef _MSC_VER
 __declspec (thread) static char szMessageBuffer[128];
-
+#else
+static char szMessageBuffer[128];
+#endif
        /* Fill message buffer with a default message in
         * case FormatMessage fails
         */

[Prev in Thread]

Current Thread

[Next in Thread]

Re: Building with case-insensitivity, (continued)

Prev by Date: Re: make 3.81 MinGW port and testsuite working with MSYS
Next by Date: Re: make 3.81 MinGW port and testsuite working with MSYS
Previous by thread: Re: make 3.81 MinGW port and testsuite working with MSYS
Next by thread: Re: make 3.81 MinGW port and testsuite working with MSYS
Index(es):
- Date
- Thread