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.

diff --git a/ChangeLog b/ChangeLog
index 872cf56..9bb6e8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+       * 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  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:

diff --git a/configure.ac b/configure.ac
index b43087a..cd73025 100644 (file)
--- 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 6825a22..913c3bc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30  Glenn Morris  <rgm@gnu.org>
+
+       * s/freebsd.h, s/gnu-linux.h, s/sol2-6.h, s/unixware.h:
+       Remove empty files.
+
 2012-07-30  Paul Eggert  <eggert@cs.ucla.edu>
 
        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 (file)
index 9177403..0000000
--- 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 <http://www.gnu.org/licenses/>.  */
-

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
deleted file mode 100644 (file)
index 2847fd6..0000000
--- 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 <http://www.gnu.org/licenses/>.  */
-

diff --git a/src/s/sol2-6.h b/src/s/sol2-6.h
deleted file mode 100644 (file)
index 3bed555..0000000
--- 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 <http://www.gnu.org/licenses/>.  */
-
-#include "usg5-4-common.h"
-

diff --git a/src/s/unixware.h b/src/s/unixware.h
deleted file mode 100644 (file)
index 59c74a5..0000000
--- 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 <http://www.gnu.org/licenses/>.  */
-
-#include "usg5-4-common.h"