Changeset 833 in openpam


Ignore:
Timestamp:
Oct 28, 2014, 9:03:41 AM (6 years ago)
Author:
Dag-Erling Smørgrav
Message:

Use $() instead of @@ in Makefiles.
Don't build OATH man pages if --without-oath.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/man/Makefile.am

    r786 r833  
    6262        $(NULL)
    6363
     64if WITH_OATH
    6465OATH_MAN = \
    6566        oath_key_alloc.3 \
     
    7172        oath_uri_decode.3 \
    7273        $(NULL)
     74endif
    7375
    7476EXTRA_DIST = openpam.man pam.man
    7577
    76 ALLCMAN = $(PAM_MAN) $(MOD_MAN) $(OPENPAM_MAN) $(OATH_MAN)
    77 GENMAN = $(ALLCMAN) oath.3 openpam.3 pam.3
     78PAMCMAN = $(PAM_MAN) $(MOD_MAN) $(OPENPAM_MAN)
     79PAMXMAN = openpam.3 pam.3
     80
     81if WITH_OATH
     82OATHCMAN = $(OATH_MAN)
     83OATHXMAN = oath.3
     84endif
     85
     86ALLCMAN = $(PAMCMAN) $(OATHCMAN)
     87GENMAN = $(ALLCMAN) $(PAMXMAN) $(OATHXMAN)
    7888
    7989dist_man3_MANS = $(GENMAN) pam_conv.3
     
    8696
    8797LIBPAMSRCDIR = $(top_srcdir)/lib/libpam
     98if WITH_OATH
    8899LIBOATHSRCDIR = $(top_srcdir)/lib/liboath
     100endif
    89101
    90102VPATH = $(LIBPAMSRCDIR) $(LIBOATHSRCDIR) $(srcdir)
     
    95107        perl -w $(GENDOC) $< || rm $@
    96108
     109if WITH_OATH
    97110oath.3: $(OATH_MAN) $(GENDOC) $(srcdir)/oath.man
    98111        perl -w $(GENDOC) -a $(OATH_MAN) <$(srcdir)/oath.man || rm $@
     112endif
    99113
    100114openpam.3: $(OPENPAM_MAN) $(GENDOC) $(srcdir)/openpam.man
  • trunk/lib/liboath/Makefile.am

    r786 r833  
    2121        oath_uri_decode.c
    2222
    23 liboath_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
    24 liboath_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPTO_LIBS@
     23liboath_la_LDFLAGS = -no-undefined -version-info $(LIB_MAJ)
     24liboath_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la $(CRYPTO_LIBS)
  • trunk/lib/libpam/Makefile.am

    r803 r833  
    8080        $(NULL)
    8181
    82 libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
    83 libpam_la_LIBADD = @DL_LIBS@
     82libpam_la_LDFLAGS = -no-undefined -version-info $(LIB_MAJ)
     83libpam_la_LIBADD = $(DL_LIBS)
    8484
    8585EXTRA_DIST = \
  • trunk/modules/pam_deny/Makefile.am

    r690 r833  
    22
    33if CUSTOM_MODULES_DIR
    4 moduledir = @OPENPAM_MODULES_DIR@
     4moduledir = $(OPENPAM_MODULES_DIR)
    55else
    66moduledir = $(libdir)
     
    1111
    1212pam_deny_la_SOURCES = pam_deny.c
    13 pam_deny_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
     13pam_deny_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
    1414        -export-symbols-regex '^pam_sm_'
    1515pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
  • trunk/modules/pam_oath/Makefile.am

    r690 r833  
    22
    33if CUSTOM_MODULES_DIR
    4 moduledir = @OPENPAM_MODULES_DIR@
     4moduledir = $(OPENPAM_MODULES_DIR)
    55else
    66moduledir = $(libdir)
     
    1111
    1212pam_oath_la_SOURCES = pam_oath.c
    13 pam_oath_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
     13pam_oath_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
    1414        -export-symbols-regex '^pam_sm_'
    1515pam_oath_la_LIBADD = \
  • trunk/modules/pam_permit/Makefile.am

    r690 r833  
    22
    33if CUSTOM_MODULES_DIR
    4 moduledir = @OPENPAM_MODULES_DIR@
     4moduledir = $(OPENPAM_MODULES_DIR)
    55else
    66moduledir = $(libdir)
     
    1111
    1212pam_permit_la_SOURCES = pam_permit.c
    13 pam_permit_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
     13pam_permit_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
    1414        -export-symbols-regex '^pam_sm_'
    1515pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
  • trunk/modules/pam_unix/Makefile.am

    r690 r833  
    22
    33if CUSTOM_MODULES_DIR
    4 moduledir = @OPENPAM_MODULES_DIR@
     4moduledir = $(OPENPAM_MODULES_DIR)
    55else
    66moduledir = $(libdir)
     
    1111
    1212pam_unix_la_SOURCES = pam_unix.c
    13 pam_unix_la_LDFLAGS = -no-undefined -module -version-info @LIB_MAJ@ \
     13pam_unix_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
    1414        -export-symbols-regex '^pam_sm_'
    15 pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la @CRYPT_LIBS@
     15pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la $(CRYPT_LIBS)
Note: See TracChangeset for help on using the changeset viewer.