Fix build for Solaris: "all" must be the first make target.

Broken-by: dfe7d917154a     Bug 1578

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index ff4a83e2cf729798c4c9998903f978d87ce7a63c..3f07396f6464bed71346a7e4d491fd98bcfe5a45 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -604,7 +604,7 @@ log.o:           $(HDRS) log.c
 lss.o:           $(HDRS) lss.c
 match.o:         $(HDRS) match.c
 moan.o:          $(HDRS) moan.c
 lss.o:           $(HDRS) lss.c
 match.o:         $(HDRS) match.c
 moan.o:          $(HDRS) moan.c

-os.o:            $(HDRS) os.c
+os.o:            $(HDRS) $(OS_C_INCLUDES) os.c

 parse.o:         $(HDRS) parse.c
 queue.o:         $(HDRS) queue.c
 rda.o:           $(HDRS) rda.c
 parse.o:         $(HDRS) parse.c
 queue.o:         $(HDRS) queue.c
 rda.o:           $(HDRS) rda.c

diff --git a/src/OS/Makefile-HP-UX b/src/OS/Makefile-HP-UX
index e00940f32fc48012e04e276a8cfe845b5e3045b9..ea35144bb2bf26947ede2da0c4d1ce856357198f 100644 (file)
--- a/src/OS/Makefile-HP-UX
+++ b/src/OS/Makefile-HP-UX
@@ -22,6 +22,6 @@ EXIMON_TEXTPOP=
 DBMLIB=-lndbm
 RANLIB=@true
 
 DBMLIB=-lndbm
 RANLIB=@true
 

-os.o: setenv.c
+OS_C_INCLUDES=setenv.c

 
 # End
 
 # End

diff --git a/src/OS/Makefile-SunOS5 b/src/OS/Makefile-SunOS5
index 351b43ad1af68045f145d0a2d06d150131725aa5..568e99f1c5c17dff4935594cb4bcd54388edac81 100644 (file)
--- a/src/OS/Makefile-SunOS5
+++ b/src/OS/Makefile-SunOS5
@@ -19,6 +19,6 @@ XINCLUDE=-I$(X11)/include
 XLFLAGS=-L$(X11)/lib -R$(X11)/lib
 X11LIB=$(X11)/lib
 
 XLFLAGS=-L$(X11)/lib -R$(X11)/lib
 X11LIB=$(X11)/lib
 

-os.o: setenv.c
+OS_C_INCLUDES=setenv.c

 
 # End
 
 # End

diff --git a/src/OS/os.c-HP-UX b/src/OS/os.c-HP-UX
index 1b78d7eb89c7a49dfc9b6f74c457b023c55dbf46..fdd8708a29c531b9ba696854f9f40ef34391a496 100644 (file)
--- a/src/OS/os.c-HP-UX
+++ b/src/OS/os.c-HP-UX
@@ -9,6 +9,8 @@
 /* HP-UX-specific code. This is concatenated onto the generic
 src/os.c file. */
 
 /* HP-UX-specific code. This is concatenated onto the generic
 src/os.c file. */
 

-#include "setenv.c"
+#ifndef COMPILE_UTILITY
+# include "setenv.c"
+#endif

 
 /* End of os.c-SunHP-UX */
 
 /* End of os.c-SunHP-UX */

diff --git a/src/OS/os.c-SunOS5 b/src/OS/os.c-SunOS5
index e298f6d5452dc1ebb7d3e91edc10aab57b766428..16248695812c452bdfe999ee637359be67e792b9 100644 (file)
--- a/src/OS/os.c-SunOS5
+++ b/src/OS/os.c-SunOS5
@@ -9,7 +9,7 @@
 /* Solaris-specific code. This is concatenated onto the generic
 src/os.c file. */
 
 /* Solaris-specific code. This is concatenated onto the generic
 src/os.c file. */
 

-#ifdef MISSING_UNSETENV_3
+#if defined(MISSING_UNSETENV_3) && !defined(COMPILE_UTILITY)

 # include "setenv.c"
 #endif
 
 # include "setenv.c"
 #endif