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

(-)native/common/Makefile.in (-1 / +1 lines)
Lines 31-37 Link Here
31
OEXT=.lo
31
OEXT=.lo
32
include list.mk
32
include list.mk
33
33
34
CFLAGS=@apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
34
CFLAGS=-I. @apache_include@ @CFLAGS@ ${APXSCFLAGS} ${APXSCPPFLAGS}
35
35
36
include @top_srcdir@/scripts/build/rules.mk
36
include @top_srcdir@/scripts/build/rules.mk
37
37
(-)native/apache-2.0/Makefile.in.~1~ (-5 / +11 lines)
Lines 15-20 Link Here
15
15
16
##
16
##
17
17
18
srcdir=@srcdir@
19
top_srcdir=@top_srcdir@
20
top_builddir=@top_builddir@
18
APXS=@APXS@
21
APXS=@APXS@
19
CP=@CP@
22
CP=@CP@
20
APACHE_DIR=@APACHE_DIR@
23
APACHE_DIR=@APACHE_DIR@
Lines 36-55 Link Here
36
include @APACHE_CONFIG_VARS@
39
include @APACHE_CONFIG_VARS@
37
40
38
# Local settings ( overriding/appending to Apache's )
41
# Local settings ( overriding/appending to Apache's )
39
COMMON=../common
42
COMMON=common
40
JK_INCL=-DUSE_APACHE_MD5 -I ${COMMON}
43
JK_INCL=-DUSE_APACHE_MD5 -I${top_builddir}/${COMMON} -I ${top_srcdir}/${COMMON}
41
CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
44
CFLAGS=@apache_include@ @CFLAGS@ ${JK_INCL} ${APXSCPPFLAGS} ${APXSCFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CPPFLAGS}
42
45
43
46
44
# Implicit rules
47
# Implicit rules
45
include ../scripts/build/rules.mk
48
include @top_srcdir@/scripts/build/rules.mk
46
49
47
OEXT=.lo
50
OEXT=.lo
48
51
49
all: Makefile @LIB_JK_TYPE@
52
all: Makefile @LIB_JK_TYPE@
50
install: @INSTALL_TYPE@
53
install: @INSTALL_TYPE@
51
54
52
Makefile: Makefile.in
55
Makefile: ${srcdir}/Makefile.in
53
	echo Regenerating Makefile
56
	echo Regenerating Makefile
54
	( cd ..; ./config.status )
57
	( cd ..; ./config.status )
55
58
Lines 74-84 Link Here
74
#################### Dynamic .so file ####################
77
#################### Dynamic .so file ####################
75
# APXS will compile every file, this is derived from apxs
78
# APXS will compile every file, this is derived from apxs
76
79
80
mod_jk.lo: ${srcdir}/mod_jk.c
81
	${LT_COMPILE}
82
77
mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
83
mod_jk.la: mod_jk.lo $(APACHE_OBJECTS)
78
	$(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
84
	$(LIBTOOL) --mode=link ${COMPILE} $(APXSLDFLAGS) -o $@ -module -rpath ${libexecdir} -avoid-version mod_jk.lo $(APACHE_OBJECTS)
79
85
80
mod_jk.so: mod_jk.la
86
mod_jk.so: mod_jk.la
81
	../scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
87
	@top_srcdir@/scripts/build/instdso.sh SH_LIBTOOL='$(LIBTOOL)' mod_jk.la `pwd`
82
88
83
install_dynamic:
89
install_dynamic:
84
	@echo ""
90
	@echo ""

Return to bug 57060