Merge branch 'tls-kdh' of https://github.com/arpa2/tlspool into tls-kdh

[tlspool] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 2907f96..a564a57 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -5,11 +5,11 @@ OBJS = daemon.o config.o manage.o service.o cache.o pinentry.o lidentry.o \
        validate.o online.o pgp.o trust.o
 
 CFLAGS += -pthread -I ../include -std=gnu11
-CFLAGS += $(GNUTLS_CFLAGS) $(P11KIT_CFLAGS) $(BDB_CFLAGS) $(TASN1_CFLAGS) $(UNBOUND_CFLAGS) $(KERBEROS_CFLAGS) $(QUICKDER_CFLAGS)
+CFLAGS += $(GNUTLS_CFLAGS) $(P11KIT_CFLAGS) $(BDB_CFLAGS) $(TASN1_CFLAGS) $(UNBOUND_CFLAGS) $(QUICKDER_CFLAGS)
 
 LDFLAGS += -std=gnu11
 
-LIBS = $(GNUTLS_LIBS) $(P11KIT_LIBS) $(BDB_LIBS) $(TASN1_LIBS) $(UNBOUND_LIBS) $(KERBEROS_LIBS) $(QUICKDER_LIBS)
+LIBS = $(GNUTLS_LIBS) $(P11KIT_LIBS) $(BDB_LIBS) $(TASN1_LIBS) $(UNBOUND_LIBS) $(QUICKDER_LIBS)
 LIBS += -lldap -lldns -lpthread
 
 ifdef WITH_SYSTEMD
@@ -17,6 +17,11 @@ CFLAGS += -DHAVE_SYSTEMD
 LIBS   += -lsystemd-daemon
 endif
 
+ifndef WITHOUT_KERBEROS
+CFLAGS += -DHAVE_TLS_KDH $(KERBEROS_CFLAGS)
+LIBS += $(KERBEROS_LIBS)
+endif
+
 GNUTLS_CFLAGS = $(shell $(PKG_CONFIG) --cflags gnutls)
 GNUTLS_LIBS   = $(shell $(PKG_CONFIG) --libs   gnutls)
 GNUTLS_CFLAGS += $(shell $(PKG_CONFIG) --cflags gnutls-dane)
@@ -29,6 +34,17 @@ TASN1_LIBS   = $(shell $(PKG_CONFIG) --libs   libtasn1)
 #HOWTOUSE# UNBOUND_LIBS  = $(shell $(PKG_CONFIG) --libs   libunbound)
 QUICKDER_CFLAGS = $(shell $(PKG_CONFIG) --cflags quick-der)
 QUICKDER_LIBS   = $(shell $(PKG_CONFIG) --libs   quick-der)
+KERBEROS_CFLAGS = $(shell krb5-config --cflags)
+KERBEROS_LIBS = $(shell krb5-config --libs)
+
+ifdef WINVER
+CFLAGS += -D_WIN32_WINNT=0x0600 -DATTRIBUTE_UNUSED="" -I ../include/windows
+OBJS += windows/syslog.o windows/windows.o windows/getopt.o
+LIBS += -lkernel32 -ladvapi32 -lmsvcrt -lwsock32 -lws2_32
+EXE = .exe
+endif
+
+PKG_CONFIG ?= pkg-config
 
 ifdef WINVER
 CFLAGS += -D_WIN32_WINNT=0x0600 -DATTRIBUTE_UNUSED="" -I ../include/windows
@@ -47,6 +63,7 @@ BDB_LIBS   = -ldb-6.1
 else
 BDB_LIBS   = -ldb # this is the default
 endif
+
 TASN1_CFLAGS = $(shell pkg-config --cflags libtasn1)
 TASN1_LIBS   = $(shell pkg-config --libs   libtasn1)
 #HOWTOUSE# UNBOUND_FLAGS = $(shell pkg-config --cflags libunbound)
@@ -62,9 +79,12 @@ all: $(TARGETS)
 tlspool$(EXE): $(OBJS)
        $(CC) $(LDFLAGS) -o "$@" $(OBJS) $(LIBS)
 
-.c.o:
+%.o: %.c
        $(CC) -c $(CFLAGS) -o "$@" "$<"
 
+%.pre: %.c
+       $(CC) -E $(CFLAGS) -o "$@" "$<"
+
 .PHONY: clean
 clean:
        rm -f $(OBJS) $(TARGETS)