changeset 96762:7124d8656633

* s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define. * Makefile.in (INSTALL_SCRIPT): Remove duplicate definition. (LIB_STANDARD_LIBSRC): Don't define. (LOADLIBES): Remove LIB_STANDARD_LIBSRC.
author Andreas Schwab <schwab@suse.de>
date Thu, 17 Jul 2008 10:53:02 +0000
parents b117e2fe7552
children a27390a84360
files admin/CPP-DEFINES lib-src/ChangeLog lib-src/Makefile.in src/ChangeLog src/s/cygwin.h
diffstat 5 files changed, 11 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/admin/CPP-DEFINES	Thu Jul 17 08:44:20 2008 +0000
+++ b/admin/CPP-DEFINES	Thu Jul 17 10:53:02 2008 +0000
@@ -237,7 +237,6 @@
 LIB_MATH
 LIB_MOTIF
 LIB_STANDARD
-LIB_STANDARD_LIBSRC
 LINKER
 LINK_CRTL_SHARE
 LINUX_SBRK_BUG
--- a/lib-src/ChangeLog	Thu Jul 17 08:44:20 2008 +0000
+++ b/lib-src/ChangeLog	Thu Jul 17 10:53:02 2008 +0000
@@ -1,3 +1,9 @@
+2008-07-17  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.in (INSTALL_SCRIPT): Remove duplicate definition.
+	(LIB_STANDARD_LIBSRC): Don't define.
+	(LOADLIBES): Remove LIB_STANDARD_LIBSRC.
+
 2008-07-16  Adrian Robert <Adrian.B.Robert@gmail.com>
 
 	* Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to
--- a/lib-src/Makefile.in	Thu Jul 17 08:44:20 2008 +0000
+++ b/lib-src/Makefile.in	Thu Jul 17 10:53:02 2008 +0000
@@ -151,27 +151,6 @@
 INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} b2m${EXEEXT} ebrowse${EXEEXT} mac-fix-env${EXEEXT}
 #endif
 
-/* Some platforms that the GNUstep port runs on put strip options in
-   INSTALL_PROGRAM which cause errors.  But, not being sure all other
-   platforms are setting this, we will only use the alternative
-   INSTALL_SCRIPT variable on GNUstep/Cocoa builds. */
-#ifndef HAVE_NS
-INSTALL_SCRIPT = @INSTALL_PROGRAM@
-#else
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-#endif
-
-/* Some machines don\'t find the standard C libraries in the usual place.  */
-#ifndef ORDINARY_LINK
-#ifndef LIB_STANDARD_LIBSRC
-#define LIB_STANDARD_LIBSRC -lc
-#endif
-#else
-#ifndef LIB_STANDARD_LIBSRC
-#define LIB_STANDARD_LIBSRC
-#endif
-#endif
-
 /* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
@@ -252,7 +231,7 @@
 #endif
 #endif
 
-LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
+LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
 
 /* We need to #define emacs to get the right versions of some files.
    Some other files - those shared with other GNU utilities - need
--- a/src/ChangeLog	Thu Jul 17 08:44:20 2008 +0000
+++ b/src/ChangeLog	Thu Jul 17 10:53:02 2008 +0000
@@ -1,3 +1,7 @@
+2008-07-17  Andreas Schwab  <schwab@suse.de>
+
+	* s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define.
+
 2008-07-17  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Use SDATA.  Follow coding convention of placing operators at
--- a/src/s/cygwin.h	Thu Jul 17 08:44:20 2008 +0000
+++ b/src/s/cygwin.h	Thu Jul 17 10:53:02 2008 +0000
@@ -112,7 +112,6 @@
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 #define GETPGRP_NO_ARG 1
 #define SYSV_SYSTEM_DIR 1
-#define LIB_STANDARD_LIBSRC
 #define UNEXEC unexcw.o
 #define POSIX_SIGNALS 1
 /* force the emacs image to start high in memory, so dll relocation