Paul Eggert wrote: > On 12/28/11 09:25, Paolo Bonzini wrote: >> I'm thinking of moving more code out of main.c, >> so that the #ifdefs will be only in one or two files. > > Here's the sort of thing I had in mind. It works fine on non-Windows > platforms but I don't know about Windows. The idea is to move the > Microsoft-specific stuff to a new directory lib/ms. I'd rather > keep it in a separate directory so that the mainline code is easier > to grep.
I guess that patch needs an added -Ilib/ms option. > A couple of other things. I assume we can remove m4/djgpp.m4 now? > It seems to be unused. Also, README.DOS is now wrong, no? > Shouldn't it be removed too, or rewritten from scratch, or > something? I agree. Thanks. I'm about to push this for you. >From 209bae502a2255aece67625641617335a911f211 Mon Sep 17 00:00:00 2001 From: Paul Eggert <[email protected]> Date: Wed, 28 Dec 2011 22:23:08 +0100 Subject: [PATCH] maint: remove now-unused/obsolete files * README.DOS: Remove file. * m4/djgpp.m4: Likewise. * .gitignore: Remove reference to m4/djgpp.m4. --- .gitignore | 1 - README.DOS | 82 ----------------------------------------------------------- m4/djgpp.m4 | 9 ------ 3 files changed, 0 insertions(+), 92 deletions(-) delete mode 100644 README.DOS delete mode 100644 m4/djgpp.m4 diff --git a/.gitignore b/.gitignore index 74cae17..e4c7b47 100644 --- a/.gitignore +++ b/.gitignore @@ -63,4 +63,3 @@ TAGS !/lib/Makefile.am !/lib/savedir.c !/lib/savedir.h -!/m4/djgpp.m4 diff --git a/README.DOS b/README.DOS deleted file mode 100644 index 5dcf658..0000000 --- a/README.DOS +++ /dev/null @@ -1,82 +0,0 @@ - Copyright (C) 1992, 1997-2002, 2004-2011 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. - -GREP DJGPP README -================= - -To compile the GNU grep package with DJGPP tools, you will need the -following tools (the names of the archives on DJGPP ftp sites where -these tools are available are in parentheses): - - - The basic DJGPP development environment, including the - GCC compiler and the libraries (v2gnu/gccNNNb.zip, - v2gnu/bnuNNNb.zip, v2/djdevNNN.zip). - - - GNU Make revision 3.75 or later (v2gnu/makNNNb.zip). - - - GNU Bash (v2gnu/bshNNNb.zip). - - - GNU Sed (v2gnu/sedNNNb.zip). - - - GNU M4 (v2gnu/m4-NNNb.zip). - - - GNU Fileutils (v2gnu/filNNNb.zip), Textutils - (v2gnu/txtNNNb.zip) and Diffutils (v2gnu/difNNNb.zip). - - - A (previous version of) GNU grep (v2gnu/grepNNb.zip). - -Running the tests ("make check" in the top-level directory) -additionally requires Gawk (v2gnu/gwkNNNb.zip). TAGS and ID targets -require `etags' (from the Emacs distribution) and `mkid' (from -ID-utils, v2gnu/iduNNb.zip), respectively. - -All of these tools are available from the DJGPP archive sites. - -To build grep: - sh autogen.sh - sh configure - make - - -Source distributions on DJGPP sites usually come pre-configured, so -all you need to do in order to build the programs is to say "make". -However, source distributions on GNU ftp sites, like ftp.gnu.org, -need to be configured by running sh configure. You will also need -to run it if you need to configure grep differently than for the -default configuration, for example if you want to install the programs -in a directory other than the bin subdirectory of your DJGPP -installation. - -To test that the package works, say "make check". If you don't have a -file named sh.exe somewhere on your PATH, "make check" will refuse to -run, as it needs a Unix-like shell. - -To install, either copy the executables and man pages to the -appropriate directories, or say "make install". To clean up, say -"make clean" or "make distclean". - -Please note the -u and -U options that specifically target MS-DOS and -MS-Windows environments. They are described in the grep man page in -this distribution. - -National Language Support doesn't work in this port, so don't expect -the programs to talk to you in any language but English. - -Please post any problems in the DOS version to the comp.os.msdos.djgpp -news group first, especially if they have something to do with the -DOS-specific aspects. - -To create the files required for the documentation package -perform the following in the docs directory: - make grep.dvi - make grep.ps - makeinfo --html grep.texi -o grep.html - - -2.5f ported by Andrew Cottrell <[email protected]> - -Enjoy, - Eli Zaretskii <[email protected]> diff --git a/m4/djgpp.m4 b/m4/djgpp.m4 deleted file mode 100644 index 0379452..0000000 --- a/m4/djgpp.m4 +++ /dev/null @@ -1,9 +0,0 @@ -dnl Check for DJGPP. we use DJ_GPP as the variable -dnl EXEEXXT -AC_DEFUN([AC_DJGPP], -[AC_CACHE_CHECK(for DJGPP environment, ac_cv_djgpp, -[AC_TRY_COMPILE(,[ return __DJGPP__;], -ac_cv_djgpp=yes, ac_cv_djgpp=no) -rm -f conftest*]) -DJ_GPP= -test "$ac_cv_djgpp" = yes && DJ_GPP=yes]) -- 1.7.8.1.391.g2c2ad
