diff options
| author | Kaspar Brand <kbrand@apache.org> | 2012-09-16 07:55:02 +0200 |
|---|---|---|
| committer | Kaspar Brand <kbrand@apache.org> | 2012-09-16 07:55:02 +0200 |
| commit | 3aaa0378b6be837b84cbcfdbffe13cecaa7e8446 (patch) | |
| tree | 67c396c812f33d30fec0b21864fda8d35bc810b7 /support/Makefile.in | |
| parent | revert r1358167, in preparation of the next commit (diff) | |
| download | apache2-3aaa0378b6be837b84cbcfdbffe13cecaa7e8446.tar.xz apache2-3aaa0378b6be837b84cbcfdbffe13cecaa7e8446.zip | |
Spin off module-specific build options into separate build vars.
Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).
Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.
Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.
Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1385214 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/Makefile.in')
| -rw-r--r-- | support/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/support/Makefile.in b/support/Makefile.in index 043fd147fa..cef8f00368 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -57,9 +57,13 @@ htdbm: $(htdbm_OBJECTS) $(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD) $(CRYPT_LIBS) ab_OBJECTS = ab.lo -ab_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS) $(MATH_LIBS) +ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS) +ab.lo: ab.c + $(LIBTOOL) --mode=compile $(CC) $(ab_CFLAGS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ + $(ALL_INCLUDES) $(PICFLAGS) $(LTCFLAGS) -c $< && touch $@ ab: $(ab_OBJECTS) - $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD) + $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \ + $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD) checkgid_OBJECTS = checkgid.lo checkgid: $(checkgid_OBJECTS) |