Add new level to most plugin directories to better separate modules which

are specific to a particular plugin type.

NEWS

@@ -12,6 +12,7 @@ documents those changes that are of interest to users and admins.
  -- Modify partition's group_allow test to be based upon the user 
     of the allocation rather than the user making the allocation 
     request (user root for LCRM batch jobs).
+ -- Restructure plugin directory structure.
 
 * Changes in SLURM 0.3.0.0-pre10
 ================================

configure.ac

@@ -315,12 +315,20 @@ AC_CONFIG_FILES([Makefile
 		 src/sinfo/Makefile
 		 src/plugins/Makefile
 		 src/plugins/auth/Makefile
+		 src/plugins/auth/authd/Makefile
+		 src/plugins/auth/munge/Makefile
+		 src/plugins/auth/none/Makefile
 		 src/plugins/jobcomp/Makefile
+		 src/plugins/jobcomp/filetxt/Makefile
+		 src/plugins/jobcomp/none/Makefile
 		 src/plugins/sched/Makefile
 		 src/plugins/sched/backfill/Makefile
 		 src/plugins/sched/builtin/Makefile
-		 src/plugins/sched/wiki/Makefile
+		 src/plugins/sched/maui/Makefile
+		 src/plugins/sched/maui/wiki/Makefile
 		 src/plugins/switch/Makefile
+		 src/plugins/switch/elan/Makefile
+		 src/plugins/switch/none/Makefile
 		 doc/Makefile
 		 doc/man/Makefile
 		 testsuite/Makefile

src/plugins/auth/Makefile.am

 # $Id$
 # Makefile for auth plugins
 
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-# Add your plugin to this line, following the naming conventions.
-if WITH_AUTHD
-AUTHD = auth_authd.la
-endif
-if WITH_MUNGE
-MUNGE = auth_munge.la
-endif
-
-pkglib_LTLIBRARIES = auth_none.la $(AUTHD) $(MUNGE)
-
-# Null authentication plugin.
-auth_none_la_SOURCES = auth_none.c
-auth_none_la_LDFLAGS = $(PLUGIN_FLAGS)
-auth_none_la_LIBADD = $(top_builddir)/src/api/libslurm.la
-
-# Authd authentication plugin -- requires libauth
-auth_authd_la_SOURCES = auth_authd.c
-auth_authd_la_LDFLAGS = $(PLUGIN_FLAGS) 
-auth_authd_la_LIBADD = -lauth -le
-
-# Munge authentication plugin
-auth_munge_la_SOURCES = auth_munge.c
-auth_munge_la_LDFLAGS = $(PLUGIN_FLAGS) 
-auth_munge_la_LIBADD =   -lmunge 
-
-
+SUBDIRS = authd munge none

src/plugins/auth/authd/Makefile.am

+# $Id$
+# Makefile for auth/authd plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+# Add your plugin to this line, following the naming conventions.
+if WITH_AUTHD
+AUTHD = auth_authd.la
+endif
+
+pkglib_LTLIBRARIES = $(AUTHD)
+
+# Authd authentication plugin -- requires libauth
+auth_authd_la_SOURCES = auth_authd.c
+auth_authd_la_LDFLAGS = $(PLUGIN_FLAGS) 
+auth_authd_la_LIBADD = -lauth -le
+

src/plugins/auth/munge/Makefile.am

+# $Id$
+# Makefile for auth/munge plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+# Add your plugin to this line, following the naming conventions.
+if WITH_MUNGE
+MUNGE = auth_munge.la
+endif
+
+pkglib_LTLIBRARIES = $(MUNGE)
+
+# Munge authentication plugin
+auth_munge_la_SOURCES = auth_munge.c
+auth_munge_la_LDFLAGS = $(PLUGIN_FLAGS) 
+auth_munge_la_LIBADD =   -lmunge 
+
+

src/plugins/auth/none/Makefile.am

+# $Id$
+# Makefile for auth/none plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = auth_none.la
+
+# Null authentication plugin.
+auth_none_la_SOURCES = auth_none.c
+auth_none_la_LDFLAGS = $(PLUGIN_FLAGS)
+auth_none_la_LIBADD = $(top_builddir)/src/api/libslurm.la

src/plugins/jobcomp/Makefile.am

 # $Id$
 # Makefile for jobcomp plugins
 
-AUTOMAKE_OPTIONS = foreign
-
-PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
-
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
-
-pkglib_LTLIBRARIES = jobcomp_none.la jobcomp_filetxt.la
-
-# Null job completion logging plugin.
-jobcomp_none_la_SOURCES = jobcomp_none.c
-jobcomp_none_la_LDFLAGS = $(PLUGIN_FLAGS)
-
-# Text file job completion logging plugin.
-jobcomp_filetxt_la_SOURCES = jobcomp_filetxt.c
-jobcomp_filetxt_la_LDFLAGS = $(PLUGIN_FLAGS)
+SUBDIRS = filetxt none

src/plugins/jobcomp/filetxt/Makefile.am

+# $Id$
+# Makefile for jobcomp/filetxt plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = jobcomp_filetxt.la
+
+# Text file job completion logging plugin.
+jobcomp_filetxt_la_SOURCES = jobcomp_filetxt.c
+jobcomp_filetxt_la_LDFLAGS = $(PLUGIN_FLAGS)

src/plugins/jobcomp/none/Makefile.am

+# $Id$
+# Makefile for jobcomp/none plugin
+
+AUTOMAKE_OPTIONS = foreign
+
+PLUGIN_FLAGS = -module -avoid-version --export-dynamic 
+
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src/common
+
+pkglib_LTLIBRARIES = jobcomp_none.la
+
+# Null job completion logging plugin.
+jobcomp_none_la_SOURCES = jobcomp_none.c
+jobcomp_none_la_LDFLAGS = $(PLUGIN_FLAGS)

src/plugins/sched/maui/Makefile.am

+# $Id$
+# Makefile for scheduler plugins
+
+SUBDIRS = wiki