From 66f4b181218eac66d7cdfec33094d93bdf03ddfb Mon Sep 17 00:00:00 2001 From: yrutschle Date: Thu, 17 Mar 2022 21:51:01 +0100 Subject: [PATCH] ensure conf2struct is called early in the make --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2d9a988..1381e33 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,13 @@ CC ?= gcc CFLAGS ?=-Wall -DLIBPCRE -g $(CFLAGS_COV) LIBS=-lm -lpcre2-8 + +# making sslh-conf.o also makes sslh-conf.h with +# conf2struct, which may be required by other headers: it +# should be kept first OBJS=sslh-conf.o common.o log.o sslh-main.o probe.o tls.o argtable3.o collection.o gap.o -FORK_OBJS=sslh-fork.o $(OBJS) -SELECT_OBJS=sslh-select.o $(OBJS) processes.o udp-listener.o +FORK_OBJS=$(OBJS) sslh-fork.o +SELECT_OBJS=$(OBJS) sslh-select.o processes.o udp-listener.o EV_OBJS=sslh-ev.o $(OBJS) processes.o udp-listener.o CONDITIONAL_TARGETS=