diff options
| -rw-r--r-- | admin/CPP-DEFINES | 1 | ||||
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 23 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/s/cygwin.h | 1 |
5 files changed, 11 insertions, 24 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index af379c4774..25fbc598dd 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -237,7 +237,6 @@ LIB_GCC LIB_MATH LIB_MOTIF LIB_STANDARD -LIB_STANDARD_LIBSRC LINKER LINK_CRTL_SHARE LINUX_SBRK_BUG diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 05bfc1934e..4efe4a374f 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2008-07-17 Andreas Schwab <[email protected]> + + * Makefile.in (INSTALL_SCRIPT): Remove duplicate definition. + (LIB_STANDARD_LIBSRC): Don't define. + (LOADLIBES): Remove LIB_STANDARD_LIBSRC. + 2008-07-16 Adrian Robert <[email protected]> * Makefile.in: Change GNUSTEP to NS_IMPL_GNUSTEP, COCOA to diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 482103ddeb..03e0f4d1e2 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -151,27 +151,6 @@ CFLAGS := $(CFLAGS) -universal 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 @@ LIBS_MAIL=-lmail #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 diff --git a/src/ChangeLog b/src/ChangeLog index 205a6a108f..e360dc48ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-07-17 Andreas Schwab <[email protected]> + + * s/cygwin.h (LIB_STANDARD_LIBSRC): Don't define. + 2008-07-17 Stefan Monnier <[email protected]> Use SDATA. Follow coding convention of placing operators at diff --git a/src/s/cygwin.h b/src/s/cygwin.h index aa696b4037..b1172e622b 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h @@ -112,7 +112,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 |