Changeset eb34ac4 in mod_gnutls


Ignore:
Timestamp:
May 27, 2016, 2:56:21 PM (3 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
0bda20f
Parents:
eda8686
Message:

Let Automake handle module installation

Using a custom pkglib directory sets the correct rpath for libtool,
getting rid of the "multiple '-rpath's" warning:

libtool: warning: ignoring multiple '-rpath's for a libtool library

Making Automake aware of the actual installation directory also means
that we can drop the custom install rule, and get a proper uninstall
rule for free.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/Makefile.am

    reda8686 reb34ac4  
    1 CLEANFILES = .libs/libmod_gnutls *~
     1# installation directory for Apache modules
     2apmodpkglibdir = ${AP_LIBEXECDIR}
    23
    3 libmod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c
    4 libmod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS}
    5 libmod_gnutls_la_LDFLAGS = -rpath ${AP_LIBEXECDIR} -module -avoid-version ${MODULE_LIBS}
     4mod_gnutls_la_SOURCES = mod_gnutls.c gnutls_io.c gnutls_cache.c gnutls_config.c gnutls_hooks.c
     5mod_gnutls_la_CFLAGS = -Wall ${MODULE_CFLAGS}
     6mod_gnutls_la_LDFLAGS = -module -avoid-version ${MODULE_LIBS}
    67
    7 lib_LTLIBRARIES = libmod_gnutls.la
    8 
    9 make_so: $(lib_LTLIBRARIES)
    10         @if test ! -L mod_gnutls.so ; then ln -s .libs/libmod_gnutls.so mod_gnutls.so ; fi
    11 
    12 clean:
    13         rm -f mod_gnutls.so
    14         rm -f *.o *.lo *.la
    15         rm -fr .libs
    16 
    17 install: make_so
    18         @${APXS_BIN} -i -n gnutls mod_gnutls.so
    19         @echo ""
    20         @echo ""
    21         @echo "***********************************************"
    22         @echo ""
    23         @echo "  Please read the manual in the doc/ directory for"
    24         @echo "  details on the configuration of this module"
    25         @echo ""
    26         @echo "***********************************************"
    27         @echo ""
     8apmodpkglib_LTLIBRARIES = mod_gnutls.la
  • test/base_apache.conf

    reda8686 reb34ac4  
    1616
    1717DocumentRoot ${srcdir}/data
    18 LoadModule gnutls_module ../src/.libs/libmod_gnutls.so
     18LoadModule gnutls_module ../src/.libs/mod_gnutls.so
Note: See TracChangeset for help on using the changeset viewer.