Build: Enable *GNU (Hurd) Bug 2476

[users/heiko/exim.git] / src / OS / Makefile-Base

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 0fbee9d0379c3286abec23befd3e542ffc93d57b..9ecde1d3e71737868ddc57d2658dbfac2116abdc 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -97,6 +97,7 @@ Makefile: ../OS/Makefile-Base ../OS/Makefile-Default \
 
 os.h:  $(SCRIPTS)/Configure-os.h \
        $(O)/os.h-FreeBSD       \
+       $(O)/os.h-GNU           \
        $(O)/os.h-Linux         \
        $(O)/os.h-OpenBSD       \
        $(O)/os.h-SunOS5
@@ -113,6 +114,7 @@ os.h:       $(SCRIPTS)/Configure-os.h \
 
 os.c:   ../src/os.c \
        $(SCRIPTS)/Configure-os.c \
+       $(O)/os.c-GNU           \
        $(O)/os.c-Linux
        $(SHELL) $(SCRIPTS)/Configure-os.c
 
@@ -123,7 +125,7 @@ config.h: Makefile buildconfig ../src/config.h.defaults $(EDITME)
 
 # Build the builtin-macros data struct
 
-MACRO_HSRC = macro_predef.h os.h globals.h config.h \
+MACRO_HSRC = macro_predef.h os.h globals.h config.h macros.h \
        routers/accept.h routers/dnslookup.h routers/ipliteral.h \
        routers/iplookup.h routers/manualroute.h routers/queryprogram.h \
        routers/redirect.h
@@ -158,7 +160,7 @@ macro-transport.o:  transport.c
 macro-drtables.o :     drtables.c
        @echo "$(CC) -DMACRO_PREDEF drtables.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ drtables.c
-macro-tls.o:   tls.c
+macro-tls.o:   tls.c tls-gnu.c tls-openssl.c
        @echo "$(CC) -DMACRO_PREDEF tls.c"
        $(FE)$(CC) -c $(CFLAGS) -DMACRO_PREDEF $(INCLUDE) -o $@ tls.c
 macro-appendfile.o :   transports/appendfile.c
@@ -623,11 +625,11 @@ OBJ_MONBIN = util-spool_in.o \
             util-string.o \
             util-queue.o \
             util-tod.o \
-            tree.o \
+            util-tree.o \
             $(MONBIN)
 
-eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
-            ../exim_monitor/em_version.c
+eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) ../exim_monitor/em_version.c \
+               mytypes.h store.h macros.h
        @echo "$(CC) exim_monitor/em_version.c"
        $(FE)$(CC) -o em_version.o -c \
          $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
@@ -757,6 +759,10 @@ util-tod.o:   $(HDRS) tod.c
        @echo "$(CC) -DCOMPILE_UTILITY tod.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tod.o tod.c
 
+util-tree.o:   $(HDRS) tree.c
+       @echo "$(CC) -DCOMPILE_UTILITY tree.c"
+       $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) -DCOMPILE_UTILITY -o util-tree.o tree.c
+
 util-os.o:       $(HDRS) os.c
        @echo "$(CC) -DCOMPILE_UTILITY os.c"
        $(FE)$(CC) -c $(CFLAGS) $(INCLUDE) \
@@ -770,7 +776,7 @@ util-os.o:       $(HDRS) os.c
 
 local_scan.o:    config local_scan.h ../$(LOCAL_SCAN_SOURCE)
        @echo "$(CC) local_scan.c"
-       $(FE)$(CC) -c $(CFLAGS) -I. $(INCLUDE) -o local_scan.o ../$(LOCAL_SCAN_SOURCE)
+       $(FE)$(CC) -DLOCAL_SCAN -c $(CFLAGS) -I. $(INCLUDE) -o local_scan.o ../$(LOCAL_SCAN_SOURCE)
 
 # Dependencies for the "ordinary" exim modules