From: Alan T. DeKok Date: Wed, 5 Sep 2012 14:50:10 +0000 (+0200) Subject: CFLAGS now includes OPENSSL_INCLUDE X-Git-Tag: release_3_0_0_beta0~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4bfc87dfdaef47b126adee1b964008993a02721d;p=thirdparty%2Ffreeradius-server.git 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 86bce54291d..373fb9a9810 100644 --- 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 dc0674632ed..33a7efbbe47 100644 --- 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 ba396b086b0..bad5c0f8c05 100644 --- 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 10347e5c5da..79f11efdedc 100644 --- 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 ff48e67e2a6..2ff4da8edd7 100644 --- 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 d74a4ea1bd4..52feb34d994 100644 --- 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 c890d41dfa8..d259444899d 100644 --- 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 d727d5c203f..488d8065702 100644 --- 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 41240eaa7d8..a2c3e62a14c 100644 --- 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 5a8d6888885..6f86d0e66ef 100644 --- 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 c09443ef905..4a78273d506 100644 --- 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 d76a72cf846..374a48d01a1 100644 --- 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 c79e6f93439..33c666264cb 100644 --- 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 75e923e4bde..a7133e261d5 100644 --- 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 fce147ffd1d..3d17b2a1adf 100644 --- 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)