diff options
author | Thorsten Kukuk <kukuk@thkukuk.de> | 2005-08-16 14:02:15 +0000 |
---|---|---|
committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2005-08-16 14:02:15 +0000 |
commit | 35daff80ad5e762ab31d83256344b3a0b6e6f2b7 (patch) | |
tree | cde6f70f0e9d682ee0eec32672243d1d965127a7 /modules | |
parent | 23624ea6f78ec8acc167a2491c00998907fc76b1 (diff) | |
download | pam-35daff80ad5e762ab31d83256344b3a0b6e6f2b7.tar.gz pam-35daff80ad5e762ab31d83256344b3a0b6e6f2b7.tar.bz2 pam-35daff80ad5e762ab31d83256344b3a0b6e6f2b7.zip |
Relevant BUGIDs: none
Purpose of commit: new feature
Commit summary:
---------------
2. round of automake/autoconf/libtool changes
Diffstat (limited to 'modules')
37 files changed, 64 insertions, 209 deletions
diff --git a/modules/Simple.Rules b/modules/Simple.Rules deleted file mode 100644 index c12ede3a..00000000 --- a/modules/Simple.Rules +++ /dev/null @@ -1,109 +0,0 @@ -# $Id$ -# -# For simple modules with no significant dependencies, set $(TITLE) -# and include this file. -# -# There are a few ways to customize this set of rules. Namely, define -# -# $(MODULE_SIMPLE_EXTRACLEAN) -# $(MODULE_SIMPLE_CLEAN) -# $(MODULE_SIMPLE_REMOVE) -# $(MODULE_SIMPLE_INSTALL) -# $(MODULE_SIMPLE_EXTRALIBS) - other things to link with the module -# $(MODULE_SIMPLE_EXTRAFILES) - other files to build (no .c suffix) -# - --include ../Make.Rules - -LIBFILES = $(TITLE) $(MODULE_SIMPLE_EXTRAFILES) -LIBSRC = $(addsuffix .c,$(LIBFILES)) -LIBOBJ = $(addsuffix .o,$(LIBFILES)) -LIBOBJD = $(addprefix dynamic/,$(LIBOBJ)) -LIBOBJS = $(addprefix static/,$(LIBOBJ)) - -LINK_PAMMODUTILS = -L../pammodutil -lpammodutil -L../../libpam -lpam -INCLUDE_PAMMODUTILS = -I../pammodutil/include - -ifdef DYNAMIC -LIBSHARED = $(TITLE).so -endif - -ifdef STATIC -LIBSTATIC = lib$(TITLE).o -endif - -####################### don't edit below ####################### - -all: dirs $(LIBSHARED) $(LIBSTATIC) register - -dynamic/%.o : %.c - $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(DYNAMIC) $(TARGET_ARCH) -c $< -o $@ - -static/%.o : %.c - $(CC) $(CFLAGS) $(INCLUDE_PAMMODUTILS) $(STATIC) $(TARGET_ARCH) -c $< -o $@ - -dirs: -ifdef DYNAMIC - $(MKDIR) ./dynamic -endif -ifdef STATIC - $(MKDIR) ./static -endif - -register: -ifdef STATIC - ( cd .. ; ./register_static $(TITLE) $(TITLE)/$(LIBSTATIC) ) -endif - -ifdef DYNAMIC -$(LIBOBJD): $(LIBSRC) -endif - -ifdef DYNAMIC -$(LIBSHARED): $(LIBOBJD) - $(LD_D) -o $@ $(LIBOBJD) $(MODULE_SIMPLE_EXTRALIBS) $(NEED_LINK_LIB_C) $(LINK_PAMMODUTILS) - -endif - -ifdef STATIC -$(LIBOBJS): $(LIBSRC) -endif - -ifdef STATIC -$(LIBSTATIC): $(LIBOBJS) - $(LD) -r -o $@ $(LIBOBJS) $(MODULE_SIMPLE_EXTRALIBS) $(LINK_PAMMODUTILS) -endif - -install: all - $(MKDIR) $(FAKEROOT)$(SECUREDIR) -ifdef DYNAMIC - $(INSTALL) -m $(SHLIBMODE) $(LIBSHARED) $(FAKEROOT)$(SECUREDIR) -endif -ifdef MAN3 - test -d $(FAKEROOT)$(mandir)/man3 || $(MKDIR) $(FAKEROOT)$(mandir)/man3 - $(INSTALL) -m $(MANMODE) $(MAN3) $(FAKEROOT)$(mandir)/man3/ -endif -ifdef MAN5 - test -d $(FAKEROOT)$(mandir)/man5 || $(MKDIR) $(FAKEROOT)$(mandir)/man5 - $(INSTALL) -m $(MANMODE) $(MAN5) $(FAKEROOT)$(mandir)/man5/ -endif -ifdef MAN8 - test -d $(FAKEROOT)$(mandir)/man8 || $(MKDIR) $(FAKEROOT)$(mandir)/man8 - $(INSTALL) -m $(MANMODE) $(MAN8) $(FAKEROOT)$(mandir)/man8/ -endif - $(MODULE_SIMPLE_INSTALL) - -remove: - rm -f $(FAKEROOT)$(SECUREDIR)/$(TITLE).so - $(MODULE_SIMPLE_REMOVE) - -clean: - rm -f $(LIBOBJD) $(LIBOBJS) core *~ - $(MODULE_SIMPLE_CLEAN) - rm -f *.a *.o *.so *.bak - rm -rf dynamic static - $(MODULE_SIMPLE_EXTRACLEAN) - -.c.o: - $(CC) $(CFLAGS) -c $< - diff --git a/modules/dont_makefile b/modules/dont_makefile deleted file mode 100644 index b7e11834..00000000 --- a/modules/dont_makefile +++ /dev/null @@ -1,21 +0,0 @@ -######################################################################### -# $Id$ -######################################################################### -# This is a makefile that does nothing. It is designed to be included -# by module Makefile-s when they are not compatable with the local -# system -######################################################################### - -all: - @echo "This module will not be compiled on this system" - -remove: clean - -install: clean - -clean: - @echo "Nothing to do" - -######################################################################### -# all over.. -######################################################################### diff --git a/modules/download-all b/modules/download-all deleted file mode 100755 index 427d0bba..00000000 --- a/modules/download-all +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -cat <<EOT -For a number of reasons it is not practical for Linux-PAM to be -distributed with every module out there. However, this shell script -is intended as a convenient way for users to download modules from the -'net in some semiautomated fashion. - -Please feel free to send (pam-list@redhat.com) snippets of code that -will help others to download and unpack your favorite module into the -Linux-PAM source tree. Especially welcome are snippets of the -following form: - -ncftp ftp://my.ftpsite.org/pub/fluff/pam_fluff.tar.gz -rm -fr pam_fluff -tar zvfx pam_fluff.tar.gz - -Cheers - -Andrew -morgan@linux.kernel.org -EOT - -# --- insert your snippets below --- - -# --- insert your snippets above --- - -exit 0 diff --git a/modules/install_conf b/modules/install_conf deleted file mode 100755 index 80f6be29..00000000 --- a/modules/install_conf +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -FAKEROOT=$1 -CONFD=$1$2 -CONFILE=$1$3 -MODULE=$4 -CONF=$5 - -IGNORE_AGE=./.ignore_age -QUIET_INSTALL=../../.quiet_install - -echo - -if [ -f "$QUIET_INSTALL" ]; then - if [ ! -f "$CONFILE" ]; then - yes="y" - else - yes="skip" - fi -elif [ -f "$IGNORE_AGE" ]; then - echo "you don't want to be bothered with the age of your $CONFILE file" - yes="n" -elif [ ! -f "$CONFILE" ] || [ "$CONF" -nt "$CONFILE" ]; then - if [ -f "$CONFILE" ]; then - echo "An older $MODULE configuration file already exists ($CONFILE)" - echo "Do you wish to copy the $CONF file in this distribution" - echo "to $CONFILE ? (y/n) [skip] " - read yes - else - yes="y" - fi -else - yes="skip" -fi - -if [ "$yes" = "y" ]; then - mkdir -p $CONFD - echo " copying $CONF to $CONFILE" - cp $CONF $CONFILE -else - echo " Skipping $CONF installation" - if [ "$yes" = "n" ]; then - touch "$IGNORE_AGE" - fi -fi - -echo - -exit 0 diff --git a/modules/pam_access/.cvsignore b/modules/pam_access/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_access/.cvsignore +++ b/modules/pam_access/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_cracklib/.cvsignore b/modules/pam_cracklib/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_cracklib/.cvsignore +++ b/modules/pam_cracklib/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_debug/.cvsignore b/modules/pam_debug/.cvsignore index dd17fdcf..ed4eaf3b 100644 --- a/modules/pam_debug/.cvsignore +++ b/modules/pam_debug/.cvsignore @@ -1,2 +1,4 @@ dynamic static +Makefile +Makefile.in diff --git a/modules/pam_deny/.cvsignore b/modules/pam_deny/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_deny/.cvsignore +++ b/modules/pam_deny/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_env/.cvsignore b/modules/pam_env/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_env/.cvsignore +++ b/modules/pam_env/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_filter/.cvsignore b/modules/pam_filter/.cvsignore index 877dafe0..9255c987 100644 --- a/modules/pam_filter/.cvsignore +++ b/modules/pam_filter/.cvsignore @@ -1,2 +1,4 @@ dynamic security +Makefile +Makefile.in diff --git a/modules/pam_filter/upperLOWER/.cvsignore b/modules/pam_filter/upperLOWER/.cvsignore index bcd63650..9459dbe2 100644 --- a/modules/pam_filter/upperLOWER/.cvsignore +++ b/modules/pam_filter/upperLOWER/.cvsignore @@ -1 +1,3 @@ upperLOWER +Makefile +Makefile.in diff --git a/modules/pam_ftp/.cvsignore b/modules/pam_ftp/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_ftp/.cvsignore +++ b/modules/pam_ftp/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_group/.cvsignore b/modules/pam_group/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_group/.cvsignore +++ b/modules/pam_group/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_issue/.cvsignore b/modules/pam_issue/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_issue/.cvsignore +++ b/modules/pam_issue/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_lastlog/.cvsignore b/modules/pam_lastlog/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_lastlog/.cvsignore +++ b/modules/pam_lastlog/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_limits/.cvsignore b/modules/pam_limits/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_limits/.cvsignore +++ b/modules/pam_limits/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_limits/limits.skel b/modules/pam_limits/limits.conf index c52778b1..c52778b1 100644 --- a/modules/pam_limits/limits.skel +++ b/modules/pam_limits/limits.conf diff --git a/modules/pam_listfile/.cvsignore b/modules/pam_listfile/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_listfile/.cvsignore +++ b/modules/pam_listfile/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_mail/.cvsignore b/modules/pam_mail/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_mail/.cvsignore +++ b/modules/pam_mail/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_mkhomedir/.cvsignore b/modules/pam_mkhomedir/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_mkhomedir/.cvsignore +++ b/modules/pam_mkhomedir/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_motd/.cvsignore b/modules/pam_motd/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_motd/.cvsignore +++ b/modules/pam_motd/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_nologin/.cvsignore b/modules/pam_nologin/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_nologin/.cvsignore +++ b/modules/pam_nologin/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_permit/.cvsignore b/modules/pam_permit/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_permit/.cvsignore +++ b/modules/pam_permit/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_pwdb/.cvsignore b/modules/pam_pwdb/.cvsignore index f0420bac..f9e10e18 100644 --- a/modules/pam_pwdb/.cvsignore +++ b/modules/pam_pwdb/.cvsignore @@ -1,2 +1,4 @@ dynamic pwdb_chkpwd +Makefile +Makefile.in diff --git a/modules/pam_radius/.cvsignore b/modules/pam_radius/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_radius/.cvsignore +++ b/modules/pam_radius/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_rhosts/.cvsignore b/modules/pam_rhosts/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_rhosts/.cvsignore +++ b/modules/pam_rhosts/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_rootok/.cvsignore b/modules/pam_rootok/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_rootok/.cvsignore +++ b/modules/pam_rootok/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_securetty/.cvsignore b/modules/pam_securetty/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_securetty/.cvsignore +++ b/modules/pam_securetty/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_shells/.cvsignore b/modules/pam_shells/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_shells/.cvsignore +++ b/modules/pam_shells/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_stress/.cvsignore b/modules/pam_stress/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_stress/.cvsignore +++ b/modules/pam_stress/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_tally/.cvsignore b/modules/pam_tally/.cvsignore index e1a4f48f..092d1253 100644 --- a/modules/pam_tally/.cvsignore +++ b/modules/pam_tally/.cvsignore @@ -1,2 +1,4 @@ dynamic pam_tally +Makefile +Makefile.in diff --git a/modules/pam_time/.cvsignore b/modules/pam_time/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_time/.cvsignore +++ b/modules/pam_time/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_unix/.cvsignore b/modules/pam_unix/.cvsignore index 64c5ce5c..699aea32 100644 --- a/modules/pam_unix/.cvsignore +++ b/modules/pam_unix/.cvsignore @@ -2,3 +2,5 @@ dynamic unix_chkpwd *.so *~ +Makefile +Makefile.in diff --git a/modules/pam_userdb/.cvsignore b/modules/pam_userdb/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_userdb/.cvsignore +++ b/modules/pam_userdb/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_warn/.cvsignore b/modules/pam_warn/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_warn/.cvsignore +++ b/modules/pam_warn/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pam_wheel/.cvsignore b/modules/pam_wheel/.cvsignore index 380a834a..7361e6d2 100644 --- a/modules/pam_wheel/.cvsignore +++ b/modules/pam_wheel/.cvsignore @@ -1 +1,3 @@ dynamic +Makefile +Makefile.in diff --git a/modules/pammodutil/.cvsignore b/modules/pammodutil/.cvsignore index 7b4d4ba2..99d2856d 100644 --- a/modules/pammodutil/.cvsignore +++ b/modules/pammodutil/.cvsignore @@ -1 +1,3 @@ static +Makefile +Makefile.in |