diff options
| author | gstein <gstein@13f79535-47bb-0310-9956-ffa450edef68> | 2002-08-14 17:15:15 +0000 |
|---|---|---|
| committer | gstein <gstein@13f79535-47bb-0310-9956-ffa450edef68> | 2002-08-14 17:15:15 +0000 |
| commit | aede3be6e385893a9f7d4fe0dfd33ba31e3ed043 (patch) | |
| tree | e24d3720f5e9e798a1dbbf2fe3e6cbafeb44e154 /Makefile.in | |
| parent | 90cd604c6015cee28e942ecba37b33965ab96477 (diff) | |
| download | libapr-aede3be6e385893a9f7d4fe0dfd33ba31e3ed043.tar.gz | |
Various changes to clean up APR for a release.
* Add a version number to the library name to support parallel
installation.
See: http://www106.pair.com/rhp/parallel.html
(assuming the app uses apr-config to fetch linking information, then
users should not have anything to change)
* Get rid of APRVARS. Apps should be using apr-config by now.
* Add --version to apr-config so that apps can see what they're
building against.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63811 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index ace243bab..c52240ea7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ SUBDIRS=@SUBDIRS@ CLEAN_SUBDIRS= . test build INSTALL_SUBDIRS=@INSTALL_SUBDIRS@ -TARGET_LIB = libapr.la +TARGET_LIB = @APR_LIBNAME@.la # # Rules for building specific targets, starting with 'all' for @@ -31,7 +31,7 @@ TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.h apr.exp CLEAN_TARGETS = DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ - APRVARS libtool apr.exp apr-config + libtool apr.exp apr-config EXTRACLEAN_TARGETS = configure aclocal.m4 include/arch/unix/apr_private.h.in \ exports.c export_vars.h @@ -71,7 +71,6 @@ install: $(TARGET_LIB) $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir); \ fi; $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir) - $(LIBTOOL) --mode=install cp APRVARS $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install cp apr.exp $(DESTDIR)$(libdir) if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \ @@ -116,7 +115,7 @@ export_vars.h: $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@ apr.exp: exports.c export_vars.h - @echo "#! libapr.so" > $@ + @echo "#! @APR_LIBNAME@.so" > $@ @echo "* This file was AUTOGENERATED at build time." >> $@ @echo "* Please do not edit by hand." >> $@ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@ |