• Eli Zaretskii's avatar
    Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and... · f915f0f7
    Eli Zaretskii authored
    Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de.
    
     lib/makefile.w32-in:
     lib/getopt_.h: New files.
     src/s/ms-w32.h (HAVE_MKTIME): Remove.
     src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
     (GNULIB): New variable.
     (LIBS): Add $(GNULIB).
     $(TEMACS): Depend on $(GNULIB).
     <top-level>: Fix font-lock disrupted by a lone `"'.
     src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
     (GETOPTOBJS, GETOPTDEPS): Remove targets.
     (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
     ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
     (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
     and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
     (clean): Don't remove getopt.h.
     (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
     ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
     $(EMACS_ROOT)/lib/getopt.h.
     nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
     (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
     (bootstrap-clean-gmake, clean-other-dirs-nmake)
     (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
     (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
     (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
     (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
     nt/configure.bat: Create lib/makefile.
     nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
     (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
     (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
     (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
    f915f0f7
ChangeLog 269 KB