o more Makefile.am updates:

   - fix some EXTRA_DIST declarations so that CVS/ directories don't get
     inlcuded in a make dist
   - add forced target to rebuild any dependent convenience or api libs
     (if necessary)

Makefile.am

@@ -9,10 +9,11 @@ EXTRA_DIST =             		\
 	autogen.sh      		\
         Make-rpm.mk
 
-MAINTAINERCLEANFILES = aclocal.m4 config.guess \
-	               config.h.in config.sub configure install-sh \
-	               ltconfig ltmain.sh missing mkinstalldirs \
-		       stamp-h.in
+MAINTAINERCLEANFILES = 			\
+	aclocal.m4 config.guess 	\
+	config.h.in config.sub configure install-sh \
+	ltconfig ltmain.sh missing mkinstalldirs \
+	stamp-h.in
 
 include $(top_srcdir)/Make-rpm.mk
 
@@ -20,5 +21,3 @@ maintainer-clean-local:
 	-(cd $(top_srcdir) && rm -rf autom4te.cache)
 	-find . -name "Makefile.in" -exec rm {} \;
 	-find $(PACKAGE)-* -exec chmod u+w {} \;
-         
-        

doc/Makefile.am

-
-EXTRA_DIST = txt html pubdesign 
+# $Id$
 
 SUBDIRS = man
 
+EXTRA_DIST =		\
+	html/LCM.arch.png \
+	html/LCM.communicate.png \
+	html/SLURM.components.gif \
+	html/admin.guide.html \
+	html/user.guide.html
+	html/programmer.guide.html \
+	html/slurm.png \

doc/man/Makefile.am

-
+# $Id$
 
 man1_MANS =            \
 	man1/scancel.1 \

src/Makefile.am

+# $Id$
+
 if USE_INCLUDED_POPT
 SUBDIRS = popt common api slurmctld slurmd srun scontrol scancel squeue sinfo
 else

src/api/Makefile.am

 # $Id$
 #
-# Makefile for slurmlib
+# Makefile for slurm API library
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -34,3 +34,6 @@ libslurm_la_LIBADD        = $(common_dir)/libcommon.la
 libslurm_la_LDFLAGS       = -export-symbols $(srcdir)/libslurm.sym
 libslurm_la_DEPENDENCIES  = $(srcdir)/libslurm.sym $(libslurm_la_LIBADD)
 
+force:
+$(libslurm_la_LIBADD) : force
+	@cd `dirname $@` && $(MAKE) `basename $@`

src/common/Makefile.am

+# $Id$
 # Makefile for common library 
 
 AUTOMAKE_OPTIONS = foreign

src/popt/Makefile.am

-# Makefile for popt.
+# Makefile for included popt.
+# $Id$
 
 EXTRA_DIST = README COPYING
 

src/scancel/Makefile.am

+# $Id$
 # Makefile for scancel
 
 AUTOMAKE_OPTIONS = foreign
@@ -6,7 +7,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/api $(POPT_INCLUDES)
 
 bin_PROGRAMS = scancel
 
-LDADD = 					\
+scancel_LDADD = 					\
 	$(top_builddir)/src/common/libcommon.la	\
 	$(top_builddir)/src/api/libslurm.la	\
 	$(POPT_LIBS) 
@@ -14,3 +15,6 @@ LDADD = 					\
 noinst_HEADERS  = scancel.h
 scancel_SOURCES = scancel.c opt.c
 
+force:
+$(scancel_LDADD) : force
+	@cd `dirname $@` && $(MAKE) `basename $@`

src/scontrol/Makefile.am

+# $Id$
 # Makefile for scontrol
 
 AUTOMAKE_OPTIONS = foreign

src/sinfo/Makefile.am

-# Makefile for squeue
+# $Id$
+#
+# Makefile for sinfo
 
 AUTOMAKE_OPTIONS = foreign
 
 INCLUDES = $(POPT_INCLUDES) -I$(top_srcdir) -I$(top_srcdir)/src/api
 bin_PROGRAMS = sinfo
 
-LDADD = $(top_builddir)/src/common/libcommon.la \
-	$(top_builddir)/src/api/libslurm.la \
+sinfo_LDADD =					\
+	$(top_builddir)/src/common/libcommon.la \
+	$(top_builddir)/src/api/libslurm.la 	\
 	$(POPT_LIBS)
 
 noinst_HEADERS = sinfo.h
 sinfo_SOURCES = sinfo.c opts.c 
-#noinst_HEADERS = sinfo.h print.h
-#squeue_SOURCES = sinfo.c print.c opts.c 
+
+force:
+$(sinfo_LDADD) : force
+	@cd `dirname $@` && $(MAKE) `basename $@`
 

src/slurmctld/Makefile.am

@@ -9,8 +9,9 @@ INCLUDES = -I$(top_srcdir) $(SSL_CPPFLAGS)
 
 sbin_PROGRAMS = slurmctld
 
-LDADD = $(top_builddir)/src/common/libcommon.la    \
-	$(top_builddir)/src/common/libcred.la      \
+slurmctld_LDADD = 					\
+	$(top_builddir)/src/common/libcommon.la    	\
+	$(top_builddir)/src/common/libcred.la      	\
 	$(top_builddir)/src/common/libdaemonize.la 
 
 
@@ -29,8 +30,6 @@ slurmctld_SOURCES = 	\
 	read_config.c	\
 	step_mgr.c
 
-% : %_d.o
-	$(LINK) $(LDFLAGS) $^ $(LDADD) $(LIBS)
-
-%_d.o : %.c
-	$(COMPILE) -DDEBUG_MODULE -c -o $@ $< 
+force:
+$(slurmctld_LDADD) : force
+	@cd `dirname $@` && $(MAKE) `basename $@`

src/slurmd/Makefile.am

 # $Id$
+#
 # Makefile for slurmd
 
 AUTOMAKE_OPTIONS = foreign
@@ -13,7 +14,7 @@ else
 interconnect_sources = no_interconnect.c
 endif
 
-slurmd_LDADD = \
+slurmd_LDADD = 					   \
         $(top_builddir)/src/common/libcommon.la    \
 	$(top_builddir)/src/common/libdaemonize.la \
 	$(top_builddir)/src/common/libcred.la      \
@@ -39,7 +40,6 @@ slurmd_SOURCES = $(common_sources) $(interconnect_sources)
 
 EXTRA_slurmd_SOURCES = no_interconnect.c elan_interconnect.c
 
-force-dependency-check:
-
-$(slurmd_LDADD) : force-dependency-check
+force:
+$(slurmd_LDADD) : force
 	@cd `dirname $@` && $(MAKE) `basename $@`

src/squeue/Makefile.am

+# $Id$
+#
 # Makefile for squeue
 
 AUTOMAKE_OPTIONS = foreign

src/srun/Makefile.am

+# $Id$
+#
+
 AUTOMAKE_OPTIONS = foreign
 
 INCLUDES = -I$(top_srcdir) $(POPT_INCLUDES) 
@@ -20,6 +23,5 @@ srun_LDADD = $(top_builddir)/src/common/libcommon.la \
 	     $(POPT_LIBS) 
 
 force:
-
 $(srun_LDADD) : force
 	@cd `dirname $@` && $(MAKE) `basename $@`