OpenPAM/OpenPAM
OpenPAM
/
OpenPAM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use $() instead of @@ in Makefiles. 

Don't build OATH man pages if --without-oath.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@833 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2014-10-28 09:03:41 +00:00
parent 37baf24e77
commit 385dfb33cb
7 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/man/Makefile.am
View File

@ -61,6 +61,7 @@ OPENPAM_MAN = \
pam_vprompt.3 \
$(NULL)
if WITH_OATH
OATH_MAN = \
oath_key_alloc.3 \
oath_key_create.3 \
@ -70,11 +71,20 @@ OATH_MAN = \
oath_key_from_uri.3 \
oath_uri_decode.3 \
$(NULL)
endif
EXTRA_DIST = openpam.man pam.man
ALLCMAN = $(PAM_MAN) $(MOD_MAN) $(OPENPAM_MAN) $(OATH_MAN)
GENMAN = $(ALLCMAN) oath.3 openpam.3 pam.3
PAMCMAN = $(PAM_MAN) $(MOD_MAN) $(OPENPAM_MAN)
PAMXMAN = openpam.3 pam.3
if WITH_OATH
OATHCMAN = $(OATH_MAN)
OATHXMAN = oath.3
endif
ALLCMAN = $(PAMCMAN) $(OATHCMAN)
GENMAN = $(ALLCMAN) $(PAMXMAN) $(OATHXMAN)
dist_man3_MANS = $(GENMAN) pam_conv.3
@ -85,7 +95,9 @@ CLEANFILES = $(GENMAN)
GENDOC = $(top_srcdir)/misc/gendoc.pl
LIBPAMSRCDIR = $(top_srcdir)/lib/libpam
if WITH_OATH
LIBOATHSRCDIR = $(top_srcdir)/lib/liboath
endif
VPATH = $(LIBPAMSRCDIR) $(LIBOATHSRCDIR) $(srcdir)
@ -94,8 +106,10 @@ SUFFIXES = .3
.c.3: $(GENDOC)
perl -w $(GENDOC) $< || rm $@
if WITH_OATH
oath.3: $(OATH_MAN) $(GENDOC) $(srcdir)/oath.man
perl -w $(GENDOC) -a $(OATH_MAN) <$(srcdir)/oath.man || rm $@
endif
openpam.3: $(OPENPAM_MAN) $(GENDOC) $(srcdir)/openpam.man
perl -w $(GENDOC) -o $(OPENPAM_MAN) <$(srcdir)/openpam.man || rm $@

4
lib/liboath/Makefile.am
View File

@ -20,5 +20,5 @@ liboath_la_SOURCES = \
oath_key.c \
oath_uri_decode.c
liboath_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
liboath_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPTO_LIBS@
liboath_la_LDFLAGS = -no-undefined -version-info $(LIB_MAJ)
liboath_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la $(CRYPTO_LIBS)

4
lib/libpam/Makefile.am
View File

@ -79,8 +79,8 @@ libpam_la_SOURCES = \
pam_vprompt.c \
$(NULL)
libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
libpam_la_LIBADD = @DL_LIBS@
libpam_la_LDFLAGS = -no-undefined -version-info $(LIB_MAJ)
libpam_la_LIBADD = $(DL_LIBS)
EXTRA_DIST = \
pam_authenticate_secondary.c \

4
modules/pam_deny/Makefile.am
View File

@ -1,7 +1,7 @@
# $Id$
if CUSTOM_MODULES_DIR
moduledir = @OPENPAM_MODULES_DIR@
moduledir = $(OPENPAM_MODULES_DIR)
else
moduledir = $(libdir)
endif
@ -10,6 +10,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
module_LTLIBRARIES = pam_deny.la
pam_deny_la_SOURCES = pam_deny.c
pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
pam_deny_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
-export-symbols-regex '^pam_sm_'
pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la

4
modules/pam_oath/Makefile.am
View File

@ -1,7 +1,7 @@
# $Id$
if CUSTOM_MODULES_DIR
moduledir = @OPENPAM_MODULES_DIR@
moduledir = $(OPENPAM_MODULES_DIR)
else
moduledir = $(libdir)
endif
@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
module_LTLIBRARIES = pam_oath.la
pam_oath_la_SOURCES = pam_oath.c
pam_oath_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
pam_oath_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
-export-symbols-regex '^pam_sm_'
pam_oath_la_LIBADD = \
$(top_builddir)/lib/libpam/libpam.la \

4
modules/pam_permit/Makefile.am
View File

@ -1,7 +1,7 @@
# $Id$
if CUSTOM_MODULES_DIR
moduledir = @OPENPAM_MODULES_DIR@
moduledir = $(OPENPAM_MODULES_DIR)
else
moduledir = $(libdir)
endif
@ -10,6 +10,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
module_LTLIBRARIES = pam_permit.la
pam_permit_la_SOURCES = pam_permit.c
pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
pam_permit_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
-export-symbols-regex '^pam_sm_'
pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la

6
modules/pam_unix/Makefile.am
View File

@ -1,7 +1,7 @@
# $Id$
if CUSTOM_MODULES_DIR
moduledir = @OPENPAM_MODULES_DIR@
moduledir = $(OPENPAM_MODULES_DIR)
else
moduledir = $(libdir)
endif
@ -10,6 +10,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
module_LTLIBRARIES = pam_unix.la
pam_unix_la_SOURCES = pam_unix.c
pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
pam_unix_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
-export-symbols-regex '^pam_sm_'
pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la $(CRYPT_LIBS)