Attachment #777125 for bug #786102

View | Details | Raw Unified | Return to bug 786102
Collapse All | Expand All

Lines 97-103 define ADD_TARGET_RULE.la Link Here

(-)a/scripts/libtool.mk (-2 / +2 lines)
97	$(Q)$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))	97	$(Q)$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
98	@$(ECHO) LINK $${${1}_BUILD}/${1}	98	@$(ECHO) LINK $${${1}_BUILD}/${1}
99	$(Q)$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \	99	$(Q)$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \
100	$${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \	100	$${${1}_LDFLAGS} $${${1}_LTFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \
101	$${${1}_PRLIBS}	101	$${${1}_PRLIBS}
102	$(Q)$${${1}_POSTMAKE}	102	$(Q)$${${1}_POSTMAKE}
103		103
Lines 135-141 define ADD_LOCAL_RULE.la Link Here
135	$${${1}_BUILD}/$${${1}_LOCAL}: $${${1}_OBJS} $${${1}_LOCAL_PRLIBS}	135	$${${1}_BUILD}/$${${1}_LOCAL}: $${${1}_OBJS} $${${1}_LOCAL_PRLIBS}
136	$(Q)$(strip mkdir -p $${${1}_BUILD}/${LOCAL}/)	136	$(Q)$(strip mkdir -p $${${1}_BUILD}/${LOCAL}/)
137	$(Q)$${${1}_LINKER} -o $${${1}_BUILD}/$${LOCAL}${1} $${LOCAL_FLAGS} $${LDFLAGS} \	137	$(Q)$${${1}_LINKER} -o $${${1}_BUILD}/$${LOCAL}${1} $${LOCAL_FLAGS} $${LDFLAGS} \
138	$${${1}_LDFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \	138	$${${1}_LDFLAGS} $${${1}_LTFLAGS} $${${1}_OBJS} $${LDLIBS} $${${1}_LDLIBS} \
139	$${${1}_LOCAL_PRLIBS}	139	$${${1}_LOCAL_PRLIBS}
140	$(Q)$${${1}_POSTMAKE}	140	$(Q)$${${1}_POSTMAKE}
141		141

Lines 50-52 SRC_CFLAGS := -D_LIBRADIUS -I$(top_builddir)/src Link Here

(-)a/src/lib/all.mk (+1 lines)
50	# like pthread and the regexp libraries.	50	# like pthread and the regexp libraries.
51	TGT_LDLIBS := $(LIBS) $(PCAP_LIBS)	51	TGT_LDLIBS := $(LIBS) $(PCAP_LIBS)
52	TGT_LDFLAGS := $(LDFLAGS) $(PCAP_LDFLAGS)	52	TGT_LDFLAGS := $(LDFLAGS) $(PCAP_LDFLAGS)
		53	TGT_LTFLAGS :=

Lines 18-22 SOURCES := conffile.c \ Link Here

(-)a/src/main/libfreeradius-server.mk (-1 / +1 lines)
18	TGT_LDLIBS := $(OPENSSL_LIBS)	18	TGT_LDLIBS := $(OPENSSL_LIBS)
19		19
20	ifneq ($(MAKECMDGOALS),scan)	20	ifneq ($(MAKECMDGOALS),scan)
21	SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"	21	SRC_CFLAGS$ += -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\""
22	endif	22	endif

Lines 21-25 TGT_PREREQS += libfreeradius-eap.a Link Here

(-)a/src/main/unittest.mk (-1 / +1 lines)
21	endif	21	endif
22		22
23	ifneq ($(MAKECMDGOALS),scan)	23	ifneq ($(MAKECMDGOALS),scan)
24	SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"	24	SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\""
25	endif	25	endif

Lines 4-9 Link Here

(-)a/src/modules/all.mk (+5 lines)
4	#	4	#
5	CFLAGS += -DIS_MODULE=1	5	CFLAGS += -DIS_MODULE=1
6		6
		7	#
		8	# Build these as modules
		9	#
		10	TGT_LTFLAGS := -module
		11
7	#	12	#
8	# If we haven't run configure, ignore the modules which require it.	13	# If we haven't run configure, ignore the modules which require it.
9	# Otherwise, load in all of the module makefiles, including ones	14	# Otherwise, load in all of the module makefiles, including ones

Lines 23-29 SRC_CFLAGS += -DWITH_EAPCLIENT Link Here

(-)a/src/modules/rlm_eap/radeapclient.mk (-1 / +1 lines)
23	SRC_INCDIRS := ${top_srcdir}/src/modules/rlm_eap/libeap	23	SRC_INCDIRS := ${top_srcdir}/src/modules/rlm_eap/libeap
24		24
25	ifneq ($(MAKECMDGOALS),scan)	25	ifneq ($(MAKECMDGOALS),scan)
26	SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"	26	SRC_CFLAGS += -DBUILT_WITH_CPPFLAGS=\""$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS=\""$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS=\""$(LDFLAGS)\"" -DBUILT_WITH_LIBS=\""$(LIBS)\""
27	endif	27	endif
28		28
29	endif	29	endif

Return to bug 786102

Lines 368-373 define INCLUDE_SUBMAKEFILE Link Here

(-)a/scripts/boiler.mk (+2 lines)
368	ALL_TGTS += $${TGT}	368	ALL_TGTS += $${TGT}
369	$${TGT}_LDFLAGS := $${TGT_LDFLAGS}	369	$${TGT}_LDFLAGS := $${TGT_LDFLAGS}
370	$${TGT}_LDLIBS := $${TGT_LDLIBS}	370	$${TGT}_LDLIBS := $${TGT_LDLIBS}
		371	$${TGT}_LTFLAGS := $${TGT_LTFLAGS}
371	$${TGT}_LINKER := $${TGT_LINKER}	372	$${TGT}_LINKER := $${TGT_LINKER}
372	$${TGT}_POSTMAKE := $${TGT_POSTMAKE}	373	$${TGT}_POSTMAKE := $${TGT_POSTMAKE}
373	$${TGT}_POSTCLEAN := $${TGT_POSTCLEAN}	374	$${TGT}_POSTCLEAN := $${TGT_POSTCLEAN}
Lines 397-402 define INCLUDE_SUBMAKEFILE Link Here
397	# as determined by which target is at the top of the stack.	398	# as determined by which target is at the top of the stack.
398	TGT := $$(strip $$(call PEEK,$${TGT_STACK}))	399	TGT := $$(strip $$(call PEEK,$${TGT_STACK}))
399	$${TGT}_LDFLAGS += $${TGT_LDFLAGS}	400	$${TGT}_LDFLAGS += $${TGT_LDFLAGS}
		401	$${TGT}_LTFLAGS += $${TGT_LTFLAGS}
400	$${TGT}_LDLIBS += $${TGT_LDLIBS}	402	$${TGT}_LDLIBS += $${TGT_LDLIBS}
401	$${TGT}_POSTCLEAN += $${TGT_POSTCLEAN}	403	$${TGT}_POSTCLEAN += $${TGT_POSTCLEAN}
402	$${TGT}_POSTMAKE += $${TGT_POSTMAKE}	404	$${TGT}_POSTMAKE += $${TGT_POSTMAKE}