Remove deprecated use of INCLUDES from Makefiles.

* 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.

11 files changed, 22 insertions, 17 deletions

diff --git a/Make.rules b/Make.rules
index 843ebd5..fe42bb8 100644
--- a/Make.rules
+++ b/Make.rules
@@ -11,8 +11,8 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
 # 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@
diff --git a/Makefile.am b/Makefile.am
index 7a55296..15453c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,25 +35,24 @@ endif
 if PAM_COND_GROUPMEMBER
   GROUPMEMBER_DIR=pam_groupmember
 endif
 SUBDIRS = \
  imprimatur\
  doc\
+ examples\
  lib\
  $(FSHADOW_DIR)\
  $(REGEX_DIR)\
  $(LOG_DIR)\
  pam_sql\
  $(LDAPHOME_DIR)\
  $(UMOTD_DIR)\
  $(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
 #  Start Git ChangeLog from this date. 
 gen_start_date = 2012-05-13
 
diff --git a/configure.ac b/configure.ac
index f60357b..413dc80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -254,12 +254,13 @@ build_mysql=$build_mysql
 build_ldaphome=$build_ldaphome
 build_umotd=$build_umotd
 build_groupmember=$build_groupmember])
 		
 AC_OUTPUT(Makefile
           doc/Makefile
+	  examples/Makefile
 	  lib/Makefile
 	  pam_fshadow/Makefile
           pam_regex/Makefile
 	  pam_log/Makefile
 	  pam_sql/Makefile
 	  pam_ldaphome/Makefile
diff --git a/examples/Makefile.am b/examples/Makefile.am
new file mode 100644
index 0000000..389e6fc
--- /dev/null
+++ b/examples/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST=ldappubkey usergitconfig
diff --git a/pam_fshadow/Makefile.am b/pam_fshadow/Makefile.am
index cc15a4b..5094920 100644
--- a/pam_fshadow/Makefile.am
+++ b/pam_fshadow/Makefile.am
@@ -11,12 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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
diff --git a/pam_groupmember/Makefile.am b/pam_groupmember/Makefile.am
index 985721e..2585196 100644
--- a/pam_groupmember/Makefile.am
+++ b/pam_groupmember/Makefile.am
@@ -11,12 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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
diff --git a/pam_ldaphome/Makefile.am b/pam_ldaphome/Makefile.am
index 2bb0fa6..d09e173 100644
--- a/pam_ldaphome/Makefile.am
+++ b/pam_ldaphome/Makefile.am
@@ -15,9 +15,9 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 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
diff --git a/pam_log/Makefile.am b/pam_log/Makefile.am
index bfde179..a5656af 100644
--- a/pam_log/Makefile.am
+++ b/pam_log/Makefile.am
@@ -11,12 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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
diff --git a/pam_regex/Makefile.am b/pam_regex/Makefile.am
index 5ec7b12..d0fe5e0 100644
--- a/pam_regex/Makefile.am
+++ b/pam_regex/Makefile.am
@@ -11,13 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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}\"
diff --git a/pam_sql/Makefile.am b/pam_sql/Makefile.am
index 0c282ea..b7ddc88 100644
--- a/pam_sql/Makefile.am
+++ b/pam_sql/Makefile.am
@@ -12,13 +12,13 @@
 include $(top_srcdir)/Make.rules
 
 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
 pam_pgsql_la_LIBADD = @PAM_MISC@ @PGSQLLIBS@ ./pam_sql.lo
 noinst_HEADERS=pam_sql.h
 
diff --git a/pam_umotd/Makefile.am b/pam_umotd/Makefile.am
index 5812f67..a28ab29 100644
--- a/pam_umotd/Makefile.am
+++ b/pam_umotd/Makefile.am
@@ -11,12 +11,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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