Remove some src/s files that are now empty

* configure.ac (opsysfile): Set to empty on gnu, cygwin.

* src/s/bsd-common, src/s/cygwin.h: Remove empty files.
* src/s/freebsd.h, src/s/netbsd.h: Do not include bsd-common.h.

7 files changed, 7 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index 27a65e562e4..b71e3cbad46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-13  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (opsysfile): Set to empty on gnu, cygwin.
+
         * configure.ac (BSD4_2, BSD_SYSTEM, USG, USG5, _AIX, CYGWIN)
         (DARWIN_OS, GNU_LINUX, HPUX, IRIX6_5, SOLARIS2):
         Move "system type" macros here from src/s.
diff --git a/configure.ac b/configure.ac
index 35866fd40a2..b59da4ff02e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3615,6 +3615,7 @@ case $opsys in
     ;;
 
   cygwin)
+    opsysfile=
     AC_DEFINE(CYGWIN, 1, [Define if the system is Cygwin.])
     ;;
 
@@ -3687,7 +3688,7 @@ case $opsys in
       using GTK.])
     ;;
 
-  gnu) opsysfile="s/bsd-common.h" ;;
+  gnu) opsysfile= ;;
 
   gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 8baa986fc5c..5d19ea0c782 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-13  Glenn Morris  <rgm@gnu.org>
 
+        * s/bsd-common, s/cygwin.h: Remove empty files.
+        * s/freebsd.h, s/netbsd.h: Do not include bsd-common.h.
+
         * s/usg5-4-common.h (USG, USG5):
         * s/template.h (USG5, USG, HPUX, BSD4_2, BSD_SYSTEM):
         * s/sol2-6.h (SOLARIS2):
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h
deleted file mode 100644
index 9e8c9ba4726..00000000000
--- a/src/s/bsd-common.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Definitions file for GNU Emacs running on bsd 4.3
-
-Copyright (C) 1985-1986, 2001-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/>.  */
-
-
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
deleted file mode 100644
index 1295083cd8e..00000000000
--- a/src/s/cygwin.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* System description header file for Cygwin.
-
-Copyright (C) 1985-1986, 1992, 1999, 2002-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/>.  */
-
-
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index f5838266143..ff31f073427 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -20,9 +20,6 @@ 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/>.  */
 
-/* Get most of the stuff from bsd-common */
-#include "bsd-common.h"
-
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index cbcd54f3988..b0e298f2c2e 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -17,10 +17,6 @@ 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/>.  */
 
-
-/* Get most of the stuff from bsd-common.  */
-#include "bsd-common.h"
-
 /* Greg A. Woods <woods@weird.com> says we must include signal.h
    before syssignal.h is included, to work around interface conflicts
    that are handled with CPP __RENAME() macro in signal.h.  */