Move the module source to a subdirectory

If we're going to move the documentation, we may as well move the
module source files as well and make the source distribution look
a bit tidier.

diff --git a/Makefile.am b/Makefile.am
index 6b12ab8d7cb0ad8a1918fedcd55ae871fc849433..c86de54919188ef439d21597b5bc12b429e7e799 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,18 +20,19 @@ pam_util_libpamutil_la_SOURCES = pam-util/args.c pam-util/args.h    \
        pam-util/options.h pam-util/vector.c pam-util/vector.h
 
 if HAVE_LD_VERSION_SCRIPT
-    VERSION_LDFLAGS = -Wl,--version-script=${srcdir}/pam_webauth_otp.map
+    VERSION_LDFLAGS = -Wl,--version-script=${srcdir}/module/pam_webauth_otp.map
 else
-    VERSION_LDFLAGS = -export-symbols ${srcdir}/pam_webauth_otp.sym
+    VERSION_LDFLAGS = -export-symbols ${srcdir}/module/pam_webauth_otp.sym
 endif
 
 pamdir = $(libdir)/security
-pam_LTLIBRARIES = pam_webauth_otp.la
-pam_webauth_otp_la_SOURCES = internal.h options.c public.c
-pam_webauth_otp_la_LDFLAGS = -module -shared -avoid-version \
+pam_LTLIBRARIES = module/pam_webauth_otp.la
+module_pam_webauth_otp_la_SOURCES = module/internal.h module/options.c \
+       module/public.c
+module_pam_webauth_otp_la_LDFLAGS = -module -shared -avoid-version \
        $(VERSION_LDFLAGS) $(KRB5_LDFLAGS) $(AM_LDFLAGS)
-pam_webauth_otp_la_LIBADD = pam-util/libpamutil.la portable/libportable.la \
-       -lwebauth $(KRB5_LIBS)
+module_pam_webauth_otp_la_LIBADD = pam-util/libpamutil.la \
+       portable/libportable.la -lwebauth $(KRB5_LIBS)
 dist_man_MANS = docs/pam_webauth_otp.5
 
 # Clean up the backup of config.h.in on make distclean.
@@ -92,7 +93,7 @@ tests_tap_libtap_a_SOURCES = tests/tap/basic.c tests/tap/basic.h      \
 
 # The list of objects and libraries used for module testing by programs that
 # link with the fake PAM library or with both it and the module.
-MODULE_OBJECTS = options.lo public.lo pam-util/libpamutil.la \
+MODULE_OBJECTS = module/options.lo module/public.lo pam-util/libpamutil.la \
        tests/fakepam/libfakepam.a
 
 # The test programs themselves.

diff --git a/internal.h b/module/internal.h
similarity index 100%
rename from internal.h
rename to module/internal.h

diff --git a/options.c b/module/options.c
similarity index 98%
rename from options.c
rename to module/options.c
index dfe68c29e2b7810f2cc19a6ad144b96b8faefbc9..860aa679b6f49b6f1e89df4a339b4e20d99d6c54 100644 (file)
--- a/options.c
+++ b/module/options.c
@@ -16,7 +16,7 @@
 
 #include <errno.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>
 #include <pam-util/options.h>

diff --git a/pam_webauth_otp.map b/module/pam_webauth_otp.map
similarity index 100%
rename from pam_webauth_otp.map
rename to module/pam_webauth_otp.map

diff --git a/pam_webauth_otp.sym b/module/pam_webauth_otp.sym
similarity index 100%
rename from pam_webauth_otp.sym
rename to module/pam_webauth_otp.sym

diff --git a/public.c b/module/public.c
similarity index 99%
rename from public.c
rename to module/public.c
index 7c49add5df454b207cd06d806d60d6c6323d5e9d..ee90ccdfe4603eaf0cb03f2c0b36db63ed184fdd 100644 (file)
--- a/public.c
+++ b/module/public.c
@@ -20,7 +20,7 @@
 #include <webauth/factors.h>
 #include <webauth/webkdc.h>
 
-#include <internal.h>
+#include <module/internal.h>
 #include <pam-util/args.h>
 #include <pam-util/logging.h>