From d34d6ffc97bea4bc246b1f764f9d9ecdf169e0c2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 29 Jul 2012 23:18:28 -0700 Subject: [PATCH] Remove some empty src/s files. * configure.ac (opsysfile): Set to empty on freebsd, gnu-linux, gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware. * src/s/freebsd.h, src/s/gnu-linux.h, src/s/sol2-6.h, src/s/unixware.h: Remove empty files. --- ChangeLog | 5 +++++ configure.ac | 6 ++++-- src/ChangeLog | 5 +++++ src/s/freebsd.h | 22 ---------------------- src/s/gnu-linux.h | 22 ---------------------- src/s/sol2-6.h | 21 --------------------- src/s/unixware.h | 20 -------------------- 7 files changed, 14 insertions(+), 87 deletions(-) delete mode 100644 src/s/freebsd.h delete mode 100644 src/s/gnu-linux.h delete mode 100644 src/s/sol2-6.h delete mode 100644 src/s/unixware.h diff --git a/ChangeLog b/ChangeLog index 872cf56a82f..9bb6e8a62b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-07-30 Glenn Morris + + * configure.ac (opsysfile): Set to empty on freebsd, gnu-linux, + gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware. + 2012-07-30 Paul Eggert Merge from gnulib, incorporating: diff --git a/configure.ac b/configure.ac index b43087a0aa3..cd730251ba4 100644 --- a/configure.ac +++ b/configure.ac @@ -3677,6 +3677,7 @@ case $opsys in ;; freebsd) + opsysfile= AC_DEFINE(BSD4_2, []) dnl Hack to avoid calling AC_PREPROC_IFELSE multiple times. dnl Would not be needed with autoconf >= 2.67, where the @@ -3694,6 +3695,7 @@ case $opsys in ;; gnu-linux | gnu-kfreebsd ) + opsysfile= AC_DEFINE(USG, []) AC_DEFINE(GNU_LINUX, [], [Define if ths system is compatible with GNU/Linux.]) ;; @@ -3711,12 +3713,14 @@ case $opsys in ;; sol2*) + opsysfile="s/usg5-4-common.h" AC_DEFINE(USG, []) AC_DEFINE(USG5, []) AC_DEFINE(SOLARIS2, [], [Define if the system is Solaris.]) ;; unixware) + opsysfile="s/usg5-4-common.h" AC_DEFINE(USG, []) AC_DEFINE(USG5, []) ;; @@ -3736,8 +3740,6 @@ case $opsys in gnu) opsysfile= ;; - gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; - hpux11) dnl See comments in sysdep.c:sys_signal. dnl SA_RESTART resets the timeout of `select' on hpux11. diff --git a/src/ChangeLog b/src/ChangeLog index 6825a22c08a..913c3bc865d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-07-30 Glenn Morris + + * s/freebsd.h, s/gnu-linux.h, s/sol2-6.h, s/unixware.h: + Remove empty files. + 2012-07-30 Paul Eggert Export to GDB most of lisp.h's remaining object-like macros. diff --git a/src/s/freebsd.h b/src/s/freebsd.h deleted file mode 100644 index 9177403f426..00000000000 --- a/src/s/freebsd.h +++ /dev/null @@ -1,22 +0,0 @@ -/* System description header for FreeBSD systems. - -Copyright (C) 1994-2012 Free Software Foundation, Inc. - -Author: Shawn M. Carey -(according to authors.el) - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h deleted file mode 100644 index 2847fd6d19c..00000000000 --- a/src/s/gnu-linux.h +++ /dev/null @@ -1,22 +0,0 @@ -/* This file is the configuration file for Linux-based GNU systems - -Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2012 - Free Software Foundation, Inc. - -This file was put together by Michael K. Johnson and Rik Faith. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h deleted file mode 100644 index 3bed55598b7..00000000000 --- a/src/s/sol2-6.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Definitions file for GNU Emacs running on Solaris 2.6. - -Copyright (C) 1999-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -#include "usg5-4-common.h" - diff --git a/src/s/unixware.h b/src/s/unixware.h deleted file mode 100644 index 59c74a56f4e..00000000000 --- a/src/s/unixware.h +++ /dev/null @@ -1,20 +0,0 @@ -/* s/ file for Unixware. - -Copyright (C) 1999-2012 Free Software Foundation, Inc. - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see . */ - -#include "usg5-4-common.h" -- 2.39.2