CFLAGS now includes OPENSSL_INCLUDE

So we can remove it from all sub-makefiles

diff --git a/Make.inc.in b/Make.inc.in
index 86bce54291daaac27d4866d4a3b59499ba8fdd56..373fb9a9810f9de3c6ace343c77de9e025516c8e 100644 (file)
--- a/Make.inc.in
+++ b/Make.inc.in
@@ -65,6 +65,7 @@ STATIC_MODULES        = @STATIC_MODULES@
 
 OPENSSL_LIBS   = @OPENSSL_LIBS@
 OPENSSL_INCLUDE = @OPENSSL_INCLUDE@
+CFLAGS         += $(OPENSSL_INCLUDE)
 
 LIBREADLINE    = @LIBREADLINE@
 

diff --git a/src/main/Makefile.in b/src/main/Makefile.in
index dc0674632edefe6859976994ffe25afd01c42bd3..33a7efbbe47ea0d7e1855de7a23b92b5c40064c1 100644 (file)
--- a/src/main/Makefile.in
+++ b/src/main/Makefile.in
@@ -23,7 +23,6 @@ CFLAGS                += -I$(top_builddir)/src
 CFLAGS         += -DHOSTINFO=\"${HOSTINFO}\"
 CFLAGS         += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
 CFLAGS         += $(SNMP_INCLUDE)
-CFLAGS         += $(OPENSSL_INCLUDE)
 VFLAGS         = -DRADIUSD_MAJOR_VERSION=$(RADIUSD_MAJOR_VERSION)
 VFLAGS         += -DRADIUSD_MINOR_VERSION=$(RADIUSD_MINOR_VERSION)
 MODULE_LIBS    = $(STATIC_MODULES)

diff --git a/src/main/radiusd.mk b/src/main/radiusd.mk
index ba396b086b0820f11d9f7b910d218914e206375c..bad5c0f8c05da352c624b09ab2af4fde87382832 100644 (file)
--- a/src/main/radiusd.mk
+++ b/src/main/radiusd.mk
@@ -9,7 +9,6 @@ endif
 
 SRC_CFLAGS     := -DHOSTINFO=\"${HOSTINFO}\"
 SRC_CFLAGS     += -DRADIUSD_VERSION=\"${RADIUSD_VERSION}\"
-SRC_CFLAGS     += $(OPENSSL_INCLUDE)
 TGT_INSTALLDIR  := ${sbindir}
 TGT_LDLIBS     := $(OPENSSL_LIBS)
 TGT_LDFLAGS     := $(LIBS) $(LCRYPT)

diff --git a/src/modules/rlm_eap/libeap/Makefile b/src/modules/rlm_eap/libeap/Makefile
index 10347e5c5da85d7862ac82ec4a4e63256cbf0a54..79f11efdedcc136e7827b4ab87aace4d85a6989c 100644 (file)
--- a/src/modules/rlm_eap/libeap/Makefile
+++ b/src/modules/rlm_eap/libeap/Makefile
@@ -12,7 +12,7 @@ SRCS          += eap_tls.c mppe_keys.c
 endif
 LT_OBJS                = $(SRCS:.c=.lo)
 INCLUDES       = eap_types.h eap_tls.h
-CFLAGS         += -DEAPLIB -I. -I.. -I$(top_builddir)/src $(OPENSSL_INCLUDE)
+CFLAGS         += -DEAPLIB -I. -I.. -I$(top_builddir)/src
 ifeq ($(USE_SHARED_LIBS),yes)
 LINK_MODE      = -export-dynamic
 else

diff --git a/src/modules/rlm_eap/libeap/all.mk b/src/modules/rlm_eap/libeap/all.mk
index ff48e67e2a64fed40b8dca94a11b34270e26131e..2ff4da8edd71732516823ef16f8e0275b3248c4e 100644 (file)
--- a/src/modules/rlm_eap/libeap/all.mk
+++ b/src/modules/rlm_eap/libeap/all.mk
@@ -5,6 +5,6 @@ ifneq (${OPENSSL_LIBS},)
 SOURCES                += eap_tls.c mppe_keys.c
 endif
 
-SRC_CFLAGS     := -DEAPLIB $(OPENSSL_INCLUDE)
+SRC_CFLAGS     := -DEAPLIB
 
 SRC_INCDIRS    := . ..

diff --git a/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in
index d74a4ea1bd434e75d1e16d66e6ac8e4e0119b147..52feb34d994976f0354a32e882b68c4068789137 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_ikev2/Makefile.in
@@ -2,7 +2,7 @@ TARGET      = @targetname@
 SRCS        = logging_impl.c \
              rlm_eap_ikev2.c \
              ike_conf.c
-RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_ikev2_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap @eap_ikev2_cflags@
 RLM_LDFLAGS = @LDFLAGS@  @LIBS@ $(OPENSSL_LIBS)
 HEADERS     = eap_ikev2.h logging_impl.h ike_conf.h
 RLM_INSTALL = 

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
index c890d41dfa8ff36eb810a1f78e3af5f25c5b591c..d259444899d7c7a8670f1a6cea27dce211108bfb 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/Makefile.in
@@ -5,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_peap.c peap.c
 HEADERS     = eap_peap.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_peap_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap @eap_peap_cflags@
 RLM_LIBS    = @eap_peap_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/all.mk b/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
index d727d5c203f126b442a8913f13dd672a02a1fbfd..488d8065702b117dbdd74d08189da3841d6dc322 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/all.mk
@@ -1,6 +1,5 @@
 TARGET      = rlm_eap_peap.a
 SOURCES        = rlm_eap_peap.c peap.c
 SRC_INCDIRS  = ../.. ../../libeap
-TGT_LDLIBS = $(OPENSSL_INCLUDE) 
 TGT_LDLIBS    =  $(OPENSSL_LIBS)
 #TGT_PREREQS = libfreeradius-eap.a

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
index 41240eaa7d80c59541e166944c0cae704ef8baab..a2c3e62a14c29f7897a7f89534bef339a90e15a6 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/Makefile.in
@@ -5,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_tls.c
 HEADERS     = rlm_eap_tls.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_tls_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap @eap_tls_cflags@
 RLM_LIBS    = @eap_tls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/all.mk b/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
index 5a8d688888543a627fd53ac51a64ba83d97072d1..6f86d0e66ef30febc2cabb6e20f7538a9e72b3d3 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/all.mk
@@ -1,6 +1,5 @@
 TARGET      = rlm_eap_tls.a
 SOURCES     = rlm_eap_tls.c
 SRC_INCDIRS  = ../.. ../../libeap 
-SRC_CFLAGS = $(OPENSSL_INCLUDE) 
 TGT_LDLIBS    =  $(OPENSSL_LIBS)
 #TGT_PREREQS  = libfreeradius-eap.a

diff --git a/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
index c09443ef90560e12d571ed9a50c93a934ec1d793..4a78273d506d3e021d57d847decc5bf86731dac3 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_tnc/Makefile.in
@@ -5,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_tnc.c eap_tnc.c tncs_connect.c 
 HEADERS     = eap_tnc.h tncs.h tncs_connect.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_tnc_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap @eap_tnc_cflags@
 RLM_LIBS    = @eap_tnc_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
index d76a72cf846eab1a4090f58f828c2c81a56b11d9..374a48d01a1065e9b187af385a2744600f9b9a88 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/Makefile.in
@@ -5,7 +5,7 @@
 TARGET      = @targetname@
 SRCS        = rlm_eap_ttls.c ttls.c
 HEADERS     = eap_ttls.h ../../eap.h ../../rlm_eap.h
-RLM_CFLAGS  = -I../.. -I../../libeap $(OPENSSL_INCLUDE) @eap_ttls_cflags@
+RLM_CFLAGS  = -I../.. -I../../libeap @eap_ttls_cflags@
 RLM_LIBS    = @eap_ttls_ldflags@ ../../libeap/$(LIBPREFIX)freeradius-eap.la $(OPENSSL_LIBS)
 RLM_INSTALL =
 

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk b/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
index c79e6f93439d713648fd1f651c747f65d7cf6cca..33c666264cb5c47734016a6fd8bd4feeabb07a07 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/all.mk
@@ -1,6 +1,5 @@
 TARGET      = rlm_eap_ttls.a
 SOURCES        = rlm_eap_ttls.c ttls.c
 SRC_INCDIRS  = ../.. ../../libeap
-TGT_LDLIBS = $(OPENSSL_INCLUDE) 
 TGT_LDLIBS    =  $(OPENSSL_LIBS)
 #TGT_PREREQS = libfreeradius-eap.a

diff --git a/src/modules/rlm_otp/Makefile.in b/src/modules/rlm_otp/Makefile.in
index 75e923e4bdedb5b4314190d30ed3844f1485e95d..a7133e261d58c9f5c1aa4de3f3f5f7f309ce5da5 100644 (file)
--- a/src/modules/rlm_otp/Makefile.in
+++ b/src/modules/rlm_otp/Makefile.in
@@ -24,7 +24,7 @@ TARGET         = @targetname@
 SRCS           = otp_rlm.c otp_radstate.c otp_pwe.c otp_pw_valid.c
 SRCS          += otp_util.c otp_mppe.c
 HEADERS        = extern.h otp_pw_valid.h otp_mppe.h
-RLM_CFLAGS     = @otp_cflags@ $(OPENSSL_INCLUDE)
+RLM_CFLAGS     = @otp_cflags@
 RLM_LIBS       = @otp_ldflags@ $(OPENSSL_LIBS)
 
 ## this uses the RLM_CFLAGS and RLM_LIBS and SRCS defs to make TARGET.

diff --git a/src/modules/rlm_otp/all.mk b/src/modules/rlm_otp/all.mk
index fce147ffd1dbead9776f80c6db9c5ed9ab1ab246..3d17b2a1adfbe43adb9d514cda5d052714613e47 100644 (file)
--- a/src/modules/rlm_otp/all.mk
+++ b/src/modules/rlm_otp/all.mk
@@ -3,6 +3,5 @@
 TARGET         =
 SOURCES           = otp_rlm.c otp_radstate.c otp_pwe.c otp_pw_valid.c
 SOURCES          += otp_util.c otp_mppe.c
-SRC_CFLAGS     =  $(OPENSSL_INCLUDE)
 TGT_LDLIBS       =  $(OPENSSL_LIBS)