diff options
| author | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 16:09:38 -0800 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@ubuntu.com> | 2019-01-03 16:09:38 -0800 |
| commit | 03398c56c56ed427818d2ce879d45d1009f7d46b (patch) | |
| tree | 9a7bc0d7d15ac988ac9ad31ad18a769030faced7 /Linux-PAM/modules/pam_selinux | |
| parent | e78677298d54010c3a62b932baefdae152fd0fed (diff) | |
| parent | 281e859131adad49301befbc50cfc5cd282c6937 (diff) | |
| download | pam-03398c56c56ed427818d2ce879d45d1009f7d46b.tar.gz pam-03398c56c56ed427818d2ce879d45d1009f7d46b.tar.bz2 pam-03398c56c56ed427818d2ce879d45d1009f7d46b.zip | |
merge upstream version 0.99.9.0
Diffstat (limited to 'Linux-PAM/modules/pam_selinux')
| -rw-r--r-- | Linux-PAM/modules/pam_selinux/Makefile.am | 12 | ||||
| -rw-r--r-- | Linux-PAM/modules/pam_selinux/Makefile.in | 17 |
2 files changed, 15 insertions, 14 deletions
diff --git a/Linux-PAM/modules/pam_selinux/Makefile.am b/Linux-PAM/modules/pam_selinux/Makefile.am index ee2773e9..d11b507c 100644 --- a/Linux-PAM/modules/pam_selinux/Makefile.am +++ b/Linux-PAM/modules/pam_selinux/Makefile.am @@ -19,15 +19,15 @@ secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -I$(top_srcdir)/libpam_misc/include -AM_LDFLAGS = -no-undefined \ - -L$(top_builddir)/libpam -lpam @LIBSELINUX@ -pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/libpam_misc -lpam_misc +pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) \ + -L$(top_builddir)/libpam -lpam \ + -L$(top_builddir)/libpam_misc -lpam_misc -pam_selinux_la_LDFLAGS = $(AM_LDFLAGS) +pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ +pam_selinux_la_LDFLAGS = -no-undefined -avoid-version -module if HAVE_VERSIONING - pam_selinux_la_LDFLAGS += -avoid-version -module \ - -Wl,--version-script=$(srcdir)/../modules.map + pam_selinux_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map endif if HAVE_LIBSELINUX diff --git a/Linux-PAM/modules/pam_selinux/Makefile.in b/Linux-PAM/modules/pam_selinux/Makefile.in index 05321ab8..5868eb56 100644 --- a/Linux-PAM/modules/pam_selinux/Makefile.in +++ b/Linux-PAM/modules/pam_selinux/Makefile.in @@ -38,9 +38,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@HAVE_VERSIONING_TRUE@am__append_1 = -avoid-version -module \ -@HAVE_VERSIONING_TRUE@ -Wl,--version-script=$(srcdir)/../modules.map - +@HAVE_VERSIONING_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/../modules.map @HAVE_LIBSELINUX_TRUE@noinst_PROGRAMS = pam_selinux_check$(EXEEXT) subdir = modules/pam_selinux DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@ -68,7 +66,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(securelibdir)" "$(DESTDIR)$(man8dir)" securelibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(securelib_LTLIBRARIES) -pam_selinux_la_LIBADD = +pam_selinux_la_DEPENDENCIES = pam_selinux_la_SOURCES = pam_selinux.c pam_selinux_la_OBJECTS = pam_selinux.lo pam_selinux_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -190,6 +188,7 @@ POSUB = @POSUB@ RANLIB = @RANLIB@ SCONFIGDIR = @SCONFIGDIR@ SECUREDIR = @SECUREDIR@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ @@ -271,11 +270,13 @@ secureconfdir = $(SCONFIGDIR) AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include \ -I$(top_srcdir)/libpam_misc/include -AM_LDFLAGS = -no-undefined \ - -L$(top_builddir)/libpam -lpam @LIBSELINUX@ +pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) \ + -L$(top_builddir)/libpam -lpam \ + -L$(top_builddir)/libpam_misc -lpam_misc -pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) -L$(top_builddir)/libpam_misc -lpam_misc -pam_selinux_la_LDFLAGS = $(AM_LDFLAGS) $(am__append_1) +pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ +pam_selinux_la_LDFLAGS = -no-undefined -avoid-version -module \ + $(am__append_1) @HAVE_LIBSELINUX_TRUE@securelib_LTLIBRARIES = pam_selinux.la @ENABLE_REGENERATE_MAN_TRUE@noinst_DATA = README pam_selinux.8 all: all-am |