Simplify STARTFILES definition.

* s/hpux10-20.h (START_FILES): Explicitly define here instead of
relying on Makefile.in to define it.
* s/cygwin.h (START_FILES): Likewise.
* Makefile.in (STARTFILES): Remove conditional code, not needed anymore.

4 files changed, 10 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6797b623db2..d108a969883 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2010-04-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Simplify STARTFILES definition.
+        * s/hpux10-20.h (START_FILES): Explicitly define here instead of
+        relying on Makefile.in to define it.
+        * s/cygwin.h (START_FILES): Likewise.
+        * Makefile.in (STARTFILES): Remove conditional code, not needed anymore.
+
         Clean up Solaris code.
         * s/sol2-6.h (LD_SWITCH_SYSTEM_TEMACS, C_SWITCH_X_SYSTEM)
         (LIB_MOTIF): Remove, configure takes care of this.
diff --git a/src/Makefile.in b/src/Makefile.in
index ab9272f5285..e0b7013c0ab 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -219,26 +219,8 @@ DEPFLAGS = -MMD -MF deps/$*.d
 #define LD_SWITCH_X_DEFAULT
 #endif
 
-#ifndef ORDINARY_LINK
-
-#ifndef START_FILES
-#ifdef NO_REMAP
-#define START_FILES pre-crt0.o /lib/crt0.o
-#else /* ! defined (NO_REMAP) */
-#define START_FILES ecrt0.o
-#endif /* ! defined (NO_REMAP) */
-#endif /* START_FILES */
 STARTFILES = START_FILES
 
-#else /* ORDINARY_LINK */
-
-/* config.h might want to force START_FILES anyway */
-#ifdef START_FILES
-STARTFILES = START_FILES
-#endif /* START_FILES */
-
-#endif /* not ORDINARY_LINK */
-
 
 #ifdef NS_IMPL_GNUSTEP
 /* Pull in stuff from GNUstep-make. */
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9f4669d6e3f..914f11f1bba 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -140,6 +140,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define LIB_MATH
 #define LIBS_DEBUG
 
+#define START_FILES ecrt0.o
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b
diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index c5dba525d64..0ac37cb3c87 100644
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -175,6 +175,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NO_REMAP
 
+#define START_FILES pre-crt0.o /lib/crt0.o
+
 /* Define VIRT_ADDR_VARIES if the virtual addresses of
    pure and impure space as loaded can vary, and even their
    relative order cannot be relied on.