diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 30 | ||||
| -rw-r--r-- | build-aux/pre-inst-env.in | 4 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/mcron.c (renamed from mcron.c) | 0 | ||||
| -rw-r--r-- | src/mcron/config.scm.in (renamed from scm/mcron/config.scm.in) | 0 | ||||
| -rw-r--r-- | src/mcron/crontab.scm (renamed from scm/mcron/crontab.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/environment.scm (renamed from scm/mcron/environment.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/job-specifier.scm (renamed from scm/mcron/job-specifier.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/main.scm (renamed from scm/mcron/main.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/mcron-core.scm (renamed from scm/mcron/mcron-core.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/redirect.scm (renamed from scm/mcron/redirect.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/vixie-specification.scm (renamed from scm/mcron/vixie-specification.scm) | 0 | ||||
| -rw-r--r-- | src/mcron/vixie-time.scm (renamed from scm/mcron/vixie-time.scm) | 0 |
14 files changed, 20 insertions, 20 deletions
@@ -2,6 +2,7 @@ *.o *~ .deps +.dirstamp /build-aux/compile /build-aux/config.guess /build-aux/config.sub @@ -10,7 +11,6 @@ /build-aux/mdate-sh /build-aux/missing /build-aux/texinfo.tex -/doc/.dirstamp /doc/config.texi /doc/mcron.1 /doc/mcron.info diff --git a/Makefile.am b/Makefile.am index 4f11c0f..1b5317c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,26 +17,26 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. bin_PROGRAMS = mcron -mcron_SOURCES = mcron.c +mcron_SOURCES = src/mcron.c mcron_CFLAGS = @GUILE_CFLAGS@ mcron_DEPENDENCIES = $(GOBJECTS) # Build Guile modules before linking. mcron_LDADD = @GUILE_LIBS@ MODULES = \ - scm/mcron/environment.scm \ - scm/mcron/job-specifier.scm \ - scm/mcron/main.scm \ - scm/mcron/redirect.scm \ - scm/mcron/vixie-specification.scm \ - scm/mcron/vixie-time.scm + src/mcron/environment.scm \ + src/mcron/job-specifier.scm \ + src/mcron/main.scm \ + src/mcron/redirect.scm \ + src/mcron/vixie-specification.scm \ + src/mcron/vixie-time.scm GEN_MODULES = \ - scm/mcron/config.scm \ - scm/mcron/core.scm + src/mcron/config.scm \ + src/mcron/core.scm CP = @CP@ # XXX: Prevent the 'configure' script to delete the 'core.*' files. -scm/mcron/core.scm: scm/mcron/mcron-core.scm +src/mcron/core.scm: src/mcron/mcron-core.scm $(CP) $< $@ GOBJECTS = \ @@ -49,8 +49,8 @@ mcronmodule_DATA = \ dist_mcronmodule_DATA = \ $(MODULES) \ - scm/mcron/crontab.scm \ - scm/mcron/mcron-core.scm + src/mcron/crontab.scm \ + src/mcron/mcron-core.scm # Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if # $GUILE_LOAD_COMPILED_PATH contains $(mcronmoduledir), we may find .go files @@ -67,8 +67,8 @@ dist_mcronmodule_DATA = \ export GUILE_AUTO_COMPILE=0 ; unset GUILE_LOAD_COMPILED_PATH ; \ LC_ALL=C \ $(top_builddir)/pre-inst-env $(GUILD) compile \ - --load-path="$(top_builddir)/scm" \ - --load-path="$(top_srcdir)/scm" \ + --load-path="$(top_builddir)/src" \ + --load-path="$(top_srcdir)/src" \ --warn=format --warn=unbound-variable --warn=arity-mismatch \ --target="$(host)" --output="$@" "$<" @@ -134,7 +134,7 @@ TEXI2DVI = texi2dvi -I doc # Not part of formal package building, but a rule for manual use to get the # elemental man page. Will only work once the mcron program is installed. -doc/mcron.1: mcron.c +doc/mcron.1: src/mcron.c -$(AM_V_HELP2MAN)$(MKDIR_P) `dirname "$@"` ; \ $(top_builddir)/pre-inst-env $(HELP2MAN) \ -n 'a program to run tasks at regular (or not) intervals' \ diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index 7e69b44..ea866ee 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -20,8 +20,8 @@ abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd`" abs_top_builddir="`cd "@abs_top_builddir@" > /dev/null; pwd`" -GUILE_LOAD_COMPILED_PATH="$abs_top_builddir/scm${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" -GUILE_LOAD_PATH="$abs_top_builddir/scm:$abs_top_srcdir/scm${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH" +GUILE_LOAD_COMPILED_PATH="$abs_top_builddir/src${GUILE_LOAD_COMPILED_PATH:+:}$GUILE_LOAD_COMPILED_PATH" +GUILE_LOAD_PATH="$abs_top_builddir/src:$abs_top_srcdir/src${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH" export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH PATH="$abs_top_builddir:$PATH" diff --git a/configure.ac b/configure.ac index d6262f2..175ba16 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PREREQ(2.61) AC_INIT([GNU Mcron], [1.0.8], [bug-mcron@gnu.org]) -AC_CONFIG_HEADER([config.h]) +AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([subdir-objects]) AM_SILENT_RULES([yes]) # enables silent rules by default @@ -187,5 +187,5 @@ AC_CONFIG_FILES([pre-inst-env:build-aux/pre-inst-env.in], [chmod +x pre-inst-env]) AC_CONFIG_FILES([doc/config.texi Makefile - scm/mcron/config.scm]) + src/mcron/config.scm]) AC_OUTPUT diff --git a/scm/mcron/config.scm.in b/src/mcron/config.scm.in index db2bc32..db2bc32 100644 --- a/scm/mcron/config.scm.in +++ b/src/mcron/config.scm.in diff --git a/scm/mcron/crontab.scm b/src/mcron/crontab.scm index 6be5c61..6be5c61 100644 --- a/scm/mcron/crontab.scm +++ b/src/mcron/crontab.scm diff --git a/scm/mcron/environment.scm b/src/mcron/environment.scm index b563d55..b563d55 100644 --- a/scm/mcron/environment.scm +++ b/src/mcron/environment.scm diff --git a/scm/mcron/job-specifier.scm b/src/mcron/job-specifier.scm index 1c2f9d9..1c2f9d9 100644 --- a/scm/mcron/job-specifier.scm +++ b/src/mcron/job-specifier.scm diff --git a/scm/mcron/main.scm b/src/mcron/main.scm index 1f2b068..1f2b068 100644 --- a/scm/mcron/main.scm +++ b/src/mcron/main.scm diff --git a/scm/mcron/mcron-core.scm b/src/mcron/mcron-core.scm index 13781c9..13781c9 100644 --- a/scm/mcron/mcron-core.scm +++ b/src/mcron/mcron-core.scm diff --git a/scm/mcron/redirect.scm b/src/mcron/redirect.scm index af763cb..af763cb 100644 --- a/scm/mcron/redirect.scm +++ b/src/mcron/redirect.scm diff --git a/scm/mcron/vixie-specification.scm b/src/mcron/vixie-specification.scm index 5cd1528..5cd1528 100644 --- a/scm/mcron/vixie-specification.scm +++ b/src/mcron/vixie-specification.scm diff --git a/scm/mcron/vixie-time.scm b/src/mcron/vixie-time.scm index a91fa89..a91fa89 100644 --- a/scm/mcron/vixie-time.scm +++ b/src/mcron/vixie-time.scm |