diff options
| author | Joe Orton <jorton@apache.org> | 2009-03-24 16:30:56 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2009-03-24 16:30:56 +0000 |
| commit | 6f70ff7af962e2e433c468b1456637842d8bc0b8 (patch) | |
| tree | fa63fc8db36fc884579c345952c8e4210469d200 /Makefile.in | |
| parent | 745348bfedacd8333ec89c5c43096e31bf05a0cf (diff) | |
| download | apr-6f70ff7af962e2e433c468b1456637842d8bc0b8.tar.gz | |
APR->APU conversion of DSO buildfoo; rename --disable-util-dso to
--disable-modular-dso:
* configure.in, Makefile.in: Use APR_DSO_MODULES for set of DSOs to
build.
* util-misc/apu_dso.c, include/private/apu_internal.h: Use macro
APR_HAVE_MODULAR_DSO to determine whether modular DSO build is used.
* build/dso.m4 (APR_MODULAR_DSO): Renamed from APU_CHECK_UTIL_DSO.
Define APR_HAVE_MODULAR_DSO if modular DSO biuld is used.
Add to LIBS not APRUTIL_LIBS. Rename configure flag to
--disable-modular-dso to disable modular DSO build.
* ldap/*.c, dbm/*.c, dbd/*.c, crypto/*.c: Adjust to use
APR_HAVE_MODULAR_DSO.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@757884 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 30625fbba..b23dc359a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,7 +32,7 @@ APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -APR_MODULES = @APR_MODULES@ +APR_DSO_MODULES = @APR_DSO_MODULES@ LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR) APR_DSO_LIBDIR = @APR_DSO_LIBDIR@ @@ -40,7 +40,7 @@ APR_DSO_LIBDIR = @APR_DSO_LIBDIR@ # Rules for building specific targets, starting with 'all' for # building the entire package. # -TARGETS = $(TARGET_LIB) $(APR_MODULES) \ +TARGETS = $(TARGET_LIB) $(APR_DSO_MODULES) \ apr.exp apr-config.out build/apr_rules.out LT_VERSION = @LT_VERSION@ @@ -120,9 +120,9 @@ install-modules: install-modules-@APU_HAVE_MODULES@ install-modules-no: -install-modules-yes: $(APR_MODULES) +install-modules-yes: $(APR_DSO_MODULES) $(APR_MKDIR) $(DESTDIR)$(APR_DSO_LIBDIR) - @for m in $(APR_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APR_DSO_LIBDIR); done + @for m in $(APR_DSO_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APR_DSO_LIBDIR); done exports.c: $(HEADERS) $(APR_MKEXPORT) $(HEADERS) > $@ |