diff src/Makefile.in @ 108274:8416c8d075e3

Define LIB_STANDARD and START_FILES using autoconf. * s/usg5-4.h (LIB_STANDARD): * s/netbsd.h (START_FILES): * s/irix6-5.h (LIB_STANDARD): * s/hpux10-20.h (LIB_STANDARD, START_FILES): * s/gnu-linux.h (START_FILES, LIB_STANDARD): * s/freebsd.h (START_FILES): * s/darwin.h (START_FILES): * s/cygwin.h (START_FILES): * s/aix4-2.h (LIB_STANDARD): * m/ibmrs6000.h (START_FILES): Remove, move logic to configure.in. * Makefile.in (STARTFILES): Rename to START_FILES, define using autoconf, not cpp. Define START_FILES and LIB_STANDARD using autoconf. * configure.in (START_FILES, LIB_STANDARD): New definitions, moved here from src/s/*.h. (HAVE_CRTIN): Remove, inline logic in the netbsd START_FILES/LIB_STANDARD computation.

--- a/src/Makefile.in	Thu May 06 12:46:47 2010 -0700
+++ b/src/Makefile.in	Thu May 06 17:30:56 2010 -0700
@@ -150,6 +150,8 @@
 
 RUN_TEMACS = `/bin/pwd`/temacs
 
+START_FILES = @START_FILES@
+
 # ========================== start of cpp stuff =======================
 /* From here on, comments must be done in C syntax.  */
 
@@ -182,17 +184,6 @@
    do not let it interfere with this file.  */
 #undef register
 
-/* Some machines do not find the standard C libraries in the usual place.  */
-#ifndef LIB_STANDARD
-#define LIB_STANDARD
-#endif
-
-/* Under GNUstep, putting libc on the link line causes problems. */
-#ifdef NS_IMPL_GNUSTEP
-#undef LIB_STANDARD
-#define LIB_STANDARD
-#endif
-
 /* Some s/SYSTEM.h files define this to request special libraries.  */
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
@@ -212,12 +203,6 @@
 #define LD_SWITCH_X_SITE
 #endif
 
-#ifdef START_FILES
-STARTFILES = START_FILES
-#else
-STARTFILES =
-#endif
-
 #ifdef NS_IMPL_GNUSTEP
 /* Pull in stuff from GNUstep-make. */
 FOUNDATION_LIB=gnu
@@ -691,7 +676,7 @@
    $(RSVG_LIBS) $(DBUS_LIBS) @LIBGPM@ @LIBRESOLV@ LIBS_SYSTEM LIBS_TERMCAP \
    $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
    @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @LIBOTF_LIBS@ @M17N_FLT_LIBS@ \
-   $(GNULIB_VAR) @LIB_MATH@ LIB_STANDARD $(GNULIB_VAR)
+   $(GNULIB_VAR) @LIB_MATH@ @LIB_STANDARD@ $(GNULIB_VAR)
 
 all: emacs${EXEEXT} $(OTHER_FILES)
 
@@ -733,7 +718,7 @@
 	echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h
 
 /* FIXME LOCALCPP not defined or mentioned anywhere.  */
-temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
+temacs${EXEEXT}: $(LOCALCPP) $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} prefix-args${EXEEXT}
 #ifdef NS_IMPL_GNUSTEP
 	$(CC) -rdynamic YMF_PASS_LDFLAGS ( ${TEMACS_LDFLAGS} \
 	-L@GNUSTEP_SYSTEM_LIBRARIES@ -lgnustep-gui -lgnustep-base \
@@ -741,7 +726,7 @@
 	${obj} ${otherobj} ${LIBES}
 #else
 	$(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
-    -o temacs ${STARTFILES} ${obj} ${otherobj}  \
+    -o temacs ${START_FILES} ${obj} ${otherobj}  \
     ${LIBES}
 #endif
 
@@ -1181,6 +1166,6 @@
 	cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe}
 
 #ifdef AUTO_DEPEND
-ALLOBJS=$(STARTFILES) ${obj} ${otherobj} prefix-args.o
+ALLOBJS=$(START_FILES) ${obj} ${otherobj} prefix-args.o
 -include $(ALLOBJS:%.o=deps/%.d)
 #endif