mirrors/pam-modules
1
0
Fork 0
mirror of git://git.gnu.org.ua/pam-modules.git synced 2025-04-26 00:19:52 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecated use of INCLUDES from Makefiles.

Browse source 
* Make.rules: Use AM_CPPFLAGS instead of INCLUDES.
* Makefile.am (SUBDIRS): Add examples.
(dist-hook): Remove.
* configure.ac: Build examples/Makefile.
* examples/Makefile.am: New file.
* pam_fshadow/Makefile.am: Include Make.rules on top.
Use += to set AM_CPPFLAGS
* pam_groupmember/Makefile.am: Likewise.
* pam_ldaphome/Makefile.am: Likewise.
* pam_log/Makefile.am: Likewise.
* pam_regex/Makefile.am: Likewise.
* pam_sql/Makefile.am: Likewise.
* pam_umotd/Makefile.am: Likewise.
This commit is contained in:
Sergey Poznyakoff 2014-05-21 12:48:53 +03:00
parent 4edfb36f05
commit 66dcf254f5
11 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Make.rules
View file

@ -14,5 +14,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.
AM_LDFLAGS = -module -export-dynamic -avoid-version -rpath '$(pamdir)'
INCLUDES=-I. -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/lib
AM_CPPFLAGS=-I. -I${top_builddir} -I${top_srcdir} -I${top_srcdir}/lib
LIBS = -lpam ../lib/libgraypam.la @LIBS@

5
Makefile.am
View file

@ -38,6 +38,7 @@ endif
SUBDIRS = \
imprimatur\
doc\
examples\
lib\
$(FSHADOW_DIR)\
$(REGEX_DIR)\
@ -48,9 +49,7 @@ SUBDIRS = \
$(GROUPMEMBER_DIR)\
pamck
EXTRA_DIST=ChangeLog.svn examples
dist-hook:
rm -rf `find $(distdir)/examples -name '*~'`
EXTRA_DIST=ChangeLog.svn
# Name of the previous ChangeLog file.
prev_change_log = ChangeLog.svn

1
configure.ac
View file

@ -257,6 +257,7 @@ build_groupmember=$build_groupmember])
AC_OUTPUT(Makefile
doc/Makefile
examples/Makefile
lib/Makefile
pam_fshadow/Makefile
pam_regex/Makefile

1
examples/Makefile.am Normal file
View file

@ -0,0 +1 @@
EXTRA_DIST=ldappubkey usergitconfig

5
pam_fshadow/Makefile.am
View file

@ -14,9 +14,10 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/Make.rules
pamdir=@PAMDIR@
pam_LTLIBRARIES = pam_fshadow.la
pam_fshadow_la_SOURCES = pam_fshadow.c
AM_CPPFLAGS=-DMODULE_NAME=\"pam_fshadow\" -DSYSCONFDIR=\"${sysconfdir}\"
AM_CPPFLAGS += -DMODULE_NAME=\"pam_fshadow\" -DSYSCONFDIR=\"${sysconfdir}\"
include $(top_srcdir)/Make.rules

5
pam_groupmember/Makefile.am
View file

@ -14,9 +14,10 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/Make.rules
pamdir=@PAMDIR@
pam_LTLIBRARIES = pam_groupmember.la
pam_groupmember_la_SOURCES = pam_groupmember.c
AM_CPPFLAGS=-DMODULE_NAME=\"pam_groupmember\" -DSYSCONFDIR=\"${sysconfdir}\"
AM_CPPFLAGS += -DMODULE_NAME=\"pam_groupmember\" -DSYSCONFDIR=\"${sysconfdir}\"
include $(top_srcdir)/Make.rules

2
pam_ldaphome/Makefile.am
View file

@ -18,6 +18,6 @@ include $(top_srcdir)/Make.rules
pamdir=@PAMDIR@
pam_LTLIBRARIES = pam_ldaphome.la
AM_CPPFLAGS=-DMODULE_NAME=\"pam_ldaphome\" -DSYSCONFDIR=\"${sysconfdir}\"
AM_CPPFLAGS += -DMODULE_NAME=\"pam_ldaphome\" -DSYSCONFDIR=\"${sysconfdir}\"
pam_ldaphome_la_SOURCES = pam_ldaphome.c
pam_ldaphome_la_LIBADD = @PAM_MISC@ -lldap

5
pam_log/Makefile.am
View file

@ -14,9 +14,10 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/Make.rules
pamdir=@PAMDIR@
pam_LTLIBRARIES = pam_log.la
pam_log_la_SOURCES = pam_log.c
AM_CPPFLAGS=-DMODULE_NAME=\"pam_log\" -DSYSCONFDIR=\"${sysconfdir}\"
AM_CPPFLAGS += -DMODULE_NAME=\"pam_log\" -DSYSCONFDIR=\"${sysconfdir}\"
include $(top_srcdir)/Make.rules

6
pam_regex/Makefile.am
View file

@ -14,10 +14,10 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/Make.rules
pamdir=@PAMDIR@
PAM_REGEX =
pam_LTLIBRARIES = pam_regex.la
pam_regex_la_SOURCES = pam_regex.c
AM_CPPFLAGS=-DMODULE_NAME=\"pam_regex\" -DSYSCONFDIR=\"${sysconfdir}\"
include $(top_srcdir)/Make.rules
AM_CPPFLAGS += -DMODULE_NAME=\"pam_regex\" -DSYSCONFDIR=\"${sysconfdir}\"

2
pam_sql/Makefile.am
View file

@ -15,7 +15,7 @@ pamdir=@PAMDIR@
pam_LTLIBRARIES = @SQL_MODULES@
EXTRA_LTLIBRARIES = pam_mysql.la pam_pgsql.la
EXTRA_DIST=pam_sql.c
AM_CPPFLAGS=-DSYSCONFDIR=\"${sysconfdir}\"
AM_CPPFLAGS += -DSYSCONFDIR=\"${sysconfdir}\"
pam_mysql_la_SOURCES = pam_mysql.c
pam_mysql_la_LIBADD = @PAM_MISC@ @MYSQLLIBS@ ./pam_sql.lo
pam_pgsql_la_SOURCES = pam_pgsql.c

5
pam_umotd/Makefile.am
View file

@ -14,9 +14,10 @@
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
include $(top_srcdir)/Make.rules
pamdir=@PAMDIR@
pam_LTLIBRARIES = pam_umotd.la
pam_umotd_la_SOURCES = pam_umotd.c
AM_CPPFLAGS=-DMODULE_NAME=\"pam_umotd\"
AM_CPPFLAGS += -DMODULE_NAME=\"pam_umotd\"
include $(top_srcdir)/Make.rules