@@ -, +, @@ Fix build with slibtool --- a/scripts/boiler.mk +++ a/scripts/boiler.mk @@ -368,6 +368,7 @@ define INCLUDE_SUBMAKEFILE ALL_TGTS += $${TGT} $${TGT}_LDFLAGS := $${TGT_LDFLAGS} $${TGT}_LDLIBS := $${TGT_LDLIBS} + $${TGT}_LTFLAGS := $${TGT_LTFLAGS} $${TGT}_LINKER := $${TGT_LINKER} $${TGT}_POSTMAKE := $${TGT_POSTMAKE} $${TGT}_POSTCLEAN := $${TGT_POSTCLEAN} @@ -397,6 +398,7 @@ define INCLUDE_SUBMAKEFILE # as determined by which target is at the top of the stack. TGT := $$(strip $$(call PEEK,$${TGT_STACK})) $${TGT}_LDFLAGS += $${TGT_LDFLAGS} + $${TGT}_LTFLAGS += $${TGT_LTFLAGS} $${TGT}_LDLIBS += $${TGT_LDLIBS} $${TGT}_POSTCLEAN += $${TGT_POSTCLEAN} $${TGT}_POSTMAKE += $${TGT_POSTMAKE} --- a/scripts/libtool.mk +++ a/scripts/libtool.mk @@ -97,7 +97,7 @@ define ADD_TARGET_RULE.la $(Q)$(strip mkdir -p $(dir $${${1}_BUILD}/${1})) @$(ECHO) LINK $${${1}_BUILD}/${1} $(Q)$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \ - $${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \ + $${${1}_LDFLAGS} $${${1}_LTFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \ $${${1}_PRLIBS} $(Q)$${${1}_POSTMAKE} @@ -135,7 +135,7 @@ define ADD_LOCAL_RULE.la $${${1}_BUILD}/$${${1}_LOCAL}: $${${1}_OBJS} $${${1}_LOCAL_PRLIBS} $(Q)$(strip mkdir -p $${${1}_BUILD}/${LOCAL}/) $(Q)$${${1}_LINKER} -o $${${1}_BUILD}/$${LOCAL}${1} $${LOCAL_FLAGS} $${LDFLAGS} \ - $${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \ + $${${1}_LDFLAGS} $${${1}_LTFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \ $${${1}_LOCAL_PRLIBS} $(Q)$${${1}_POSTMAKE} --- a/src/lib/all.mk +++ a/src/lib/all.mk @@ -50,3 +50,4 @@ SRC_CFLAGS := -D_LIBRADIUS -I$(top_builddir)/src # like pthread and the regexp libraries. TGT_LDLIBS := $(LIBS) $(PCAP_LIBS) TGT_LDFLAGS := $(LDFLAGS) $(PCAP_LDFLAGS) +TGT_LTFLAGS := --- a/src/main/libfreeradius-server.mk +++ a/src/main/libfreeradius-server.mk @@ -18,5 +18,5 @@ SOURCES := conffile.c \ TGT_LDLIBS := $(OPENSSL_LIBS) ifneq ($(MAKECMDGOALS),scan) -SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\" +SRC_CFLAGS$ += -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\"" endif --- a/src/main/unittest.mk +++ a/src/main/unittest.mk @@ -21,5 +21,5 @@ TGT_PREREQS += libfreeradius-eap.a endif ifneq ($(MAKECMDGOALS),scan) -SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\" +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\"" endif --- a/src/modules/all.mk +++ a/src/modules/all.mk @@ -4,6 +4,11 @@ # CFLAGS += -DIS_MODULE=1 +# +# Build these as modules +# +TGT_LTFLAGS := -module + # # If we haven't run configure, ignore the modules which require it. # Otherwise, load in all of the module makefiles, including ones --- a/src/modules/rlm_eap/radeapclient.mk +++ a/src/modules/rlm_eap/radeapclient.mk @@ -23,7 +23,7 @@ SRC_CFLAGS += -DWITH_EAPCLIENT SRC_INCDIRS := ${top_srcdir}/src/modules/rlm_eap/libeap ifneq ($(MAKECMDGOALS),scan) -SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\" +SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\"" endif endif