diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-09-22 13:57:13 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-09-24 16:49:52 +0200 |
| commit | a801d42c4637bbdf9664d0d8b913ffcab81b904e (patch) | |
| tree | 951d1f589e740879da3ba02104679bafed9b8d3d | |
| parent | e3c06950bdb0bee6df603b101b30b75ef38439a4 (diff) | |
| download | sssd-a801d42c4637bbdf9664d0d8b913ffcab81b904e.tar.gz sssd-a801d42c4637bbdf9664d0d8b913ffcab81b904e.tar.xz sssd-a801d42c4637bbdf9664d0d8b913ffcab81b904e.zip | |
BUILD: Do not build libsss_ad_common.la as library
libsss_ad_common.la was a dynamic library and was linked just with unit tests.
It was a workaroud because module libsss_ad.so cannot be linked with tests
without portability issues. But it was addted to pkglib_LTLIBRARIES
and therefore it was installed with other libraries.
This patch changed it and libsss_ad_test.la (old name libsss_ad_common.la)
will be compiled only for unit tests (check_LTLIBRARIES) and will not
be installed with command "make install".
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
| -rw-r--r-- | Makefile.am | 33 | ||||
| -rw-r--r-- | contrib/sssd.spec.in | 1 |
2 files changed, 15 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index b0edbf55f..c384a862e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1421,6 +1421,10 @@ check_LTLIBRARIES += \ libsss_nss_idmap_tests.la \ $(NULL) +if BUILD_SAMBA +check_LTLIBRARIES += libsss_ad_tests.la +endif + libdlopen_test_providers_la_SOURCES = \ $(sssd_be_SOURCES) libdlopen_test_providers_la_CFLAGS = \ @@ -1449,6 +1453,14 @@ libsss_nss_idmap_tests_la_LDFLAGS = \ dist_noinst_DATA += src/sss_client/idmap/sss_nss_idmap.unit_tests +libsss_ad_tests_la_SOURCES = $(libsss_ad_la_SOURCES) +libsss_ad_tests_la_CFLAGS = $(libsss_ad_la_CFLAGS) +libsss_ad_tests_la_LIBADD = $(libsss_ad_la_LIBADD) +libsss_ad_tests_la_LDFLAGS = \ + -shared \ + -rpath $(abs_top_builddir) \ + $(NULL) + dlopen_tests_SOURCES = \ src/tests/dlopen-tests.c dlopen_tests_CFLAGS = \ @@ -2168,7 +2180,7 @@ ad_access_filter_tests_LDADD = \ $(TEVENT_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ libsss_ldap_common.la \ - libsss_ad_common.la \ + libsss_ad_tests.la \ libsss_test_common.la \ libdlopen_test_providers.la \ $(NULL) @@ -2187,7 +2199,7 @@ ad_gpo_tests_LDADD = \ libsss_ldap_common.la \ libsss_idmap.la \ libsss_krb5_common.la \ - libsss_ad_common.la \ + libsss_ad_tests.la \ libsss_test_common.la \ libdlopen_test_providers.la \ $(NULL) @@ -2539,7 +2551,7 @@ test_ipa_subdom_server_LDADD = \ $(KRB5_LIBS) \ $(SSSD_INTERNAL_LTLIBS) \ libsss_ldap_common.la \ - libsss_ad_common.la \ + libsss_ad_tests.la \ libsss_test_common.la \ libdlopen_test_providers.la \ $(NULL) @@ -2838,21 +2850,6 @@ libsss_ldap_common_la_SOURCES += \ src/providers/ldap/sdap_async_autofs.c endif -if BUILD_SAMBA -pkglib_LTLIBRARIES += libsss_ad_common.la -endif -libsss_ad_common_la_SOURCES = \ - $(libsss_ad_la_SOURCES) -libsss_ad_common_la_LDFLAGS = \ - -avoid-version -libsss_ad_common_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(NDR_NBT_CFLAGS) \ - $(SMBCLIENT_CFLAGS) -libsss_ad_common_la_LIBADD = \ - $(NDR_NBT_LIBS) \ - $(SMBCLIENT_LIBS) - libsss_krb5_common_la_SOURCES = \ src/providers/krb5/krb5_utils.c \ src/providers/krb5/krb5_delayed_online_authentication.c \ diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 5ca26495b..63c107c1e 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -777,7 +777,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING %{_libdir}/%{name}/libsss_ad.so -%{_libdir}/%{name}/libsss_ad_common.so %{_libexecdir}/%{servicename}/gpo_child %{_mandir}/man5/sssd-ad.5* |