all: Rename 'scm' directory to 'src'.

* scm/mcron/config.scm.in: Rename to ...
* src/mcron/config.scm.in: ... this.
* scm/mcron/crontab.scm: Rename to ...
* src/mcron/crontab.scm: ... this.
* scm/mcron/environment.scm: Rename to ...
* src/mcron/environment.scm: ... this.
* scm/mcron/job-specifier.scm: Rename to ...
* src/mcron/job-specifier.scm: ... this.
* scm/mcron/main.scm: Rename to ...
* src/mcron/main.scm: ... this.
* scm/mcron/mcron-core.scm: Rename to ...
* src/mcron/mcron-core.scm: ... this.
* scm/mcron/redirect.scm: Rename to ...
* src/mcron/redirect.scm: ... this.
* scm/mcron/vixie-specification.scm: Rename to ...
* src/mcron/vixie-specification.scm: ... this.
* scm/mcron/vixie-time.scm: Rename to ...
* src/mcron/vixie-time.scm: ... this.
* mcron.c: Rename to ...
* src/mcron.c: ... this.
* Makefile.am: Adapt to them.
* build-aux/pre-inst-env.in: Likewise.
* configure.ac (AC_CONFIG_FILES): Likewise.
(AC_CONFIG_HEADER): Set to 'src/config.h'.
* .gitignore: Update.
This commit is contained in:
Mathieu Lirzin 2016-05-07 11:09:44 +02:00
commit 995bc9ca6e
14 changed files with 20 additions and 20 deletions

2
.gitignore vendored
View file

@ -2,6 +2,7 @@
*.o *.o
*~ *~
.deps .deps
.dirstamp
/build-aux/compile /build-aux/compile
/build-aux/config.guess /build-aux/config.guess
/build-aux/config.sub /build-aux/config.sub
@ -10,7 +11,6 @@
/build-aux/mdate-sh /build-aux/mdate-sh
/build-aux/missing /build-aux/missing
/build-aux/texinfo.tex /build-aux/texinfo.tex
/doc/.dirstamp
/doc/config.texi /doc/config.texi
/doc/mcron.1 /doc/mcron.1
/doc/mcron.info /doc/mcron.info

View file

@ -17,26 +17,26 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
bin_PROGRAMS = mcron bin_PROGRAMS = mcron
mcron_SOURCES = mcron.c mcron_SOURCES = src/mcron.c
mcron_CFLAGS = @GUILE_CFLAGS@ mcron_CFLAGS = @GUILE_CFLAGS@
mcron_DEPENDENCIES = $(GOBJECTS) # Build Guile modules before linking. mcron_DEPENDENCIES = $(GOBJECTS) # Build Guile modules before linking.
mcron_LDADD = @GUILE_LIBS@ mcron_LDADD = @GUILE_LIBS@
MODULES = \ MODULES = \
scm/mcron/environment.scm \ src/mcron/environment.scm \
scm/mcron/job-specifier.scm \ src/mcron/job-specifier.scm \
scm/mcron/main.scm \ src/mcron/main.scm \
scm/mcron/redirect.scm \ src/mcron/redirect.scm \
scm/mcron/vixie-specification.scm \ src/mcron/vixie-specification.scm \
scm/mcron/vixie-time.scm src/mcron/vixie-time.scm
GEN_MODULES = \ GEN_MODULES = \
scm/mcron/config.scm \ src/mcron/config.scm \
scm/mcron/core.scm src/mcron/core.scm
CP = @CP@ CP = @CP@
# XXX: Prevent the 'configure' script to delete the 'core.*' files. # 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) $< $@ $(CP) $< $@
GOBJECTS = \ GOBJECTS = \
@ -49,8 +49,8 @@ mcronmodule_DATA = \
dist_mcronmodule_DATA = \ dist_mcronmodule_DATA = \
$(MODULES) \ $(MODULES) \
scm/mcron/crontab.scm \ src/mcron/crontab.scm \
scm/mcron/mcron-core.scm src/mcron/mcron-core.scm
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if # Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if
# $GUILE_LOAD_COMPILED_PATH contains $(mcronmoduledir), we may find .go files # $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 ; \ export GUILE_AUTO_COMPILE=0 ; unset GUILE_LOAD_COMPILED_PATH ; \
LC_ALL=C \ LC_ALL=C \
$(top_builddir)/pre-inst-env $(GUILD) compile \ $(top_builddir)/pre-inst-env $(GUILD) compile \
--load-path="$(top_builddir)/scm" \ --load-path="$(top_builddir)/src" \
--load-path="$(top_srcdir)/scm" \ --load-path="$(top_srcdir)/src" \
--warn=format --warn=unbound-variable --warn=arity-mismatch \ --warn=format --warn=unbound-variable --warn=arity-mismatch \
--target="$(host)" --output="$@" "$<" --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 # 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. # 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 "$@"` ; \ -$(AM_V_HELP2MAN)$(MKDIR_P) `dirname "$@"` ; \
$(top_builddir)/pre-inst-env $(HELP2MAN) \ $(top_builddir)/pre-inst-env $(HELP2MAN) \
-n 'a program to run tasks at regular (or not) intervals' \ -n 'a program to run tasks at regular (or not) intervals' \

View file

@ -20,8 +20,8 @@
abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd`" abs_top_srcdir="`cd "@abs_top_srcdir@" > /dev/null; pwd`"
abs_top_builddir="`cd "@abs_top_builddir@" > /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_COMPILED_PATH="$abs_top_builddir/src${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_PATH="$abs_top_builddir/src:$abs_top_srcdir/src${GUILE_LOAD_PATH:+:}:$GUILE_LOAD_PATH"
export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH export GUILE_LOAD_COMPILED_PATH GUILE_LOAD_PATH
PATH="$abs_top_builddir:$PATH" PATH="$abs_top_builddir:$PATH"

View file

@ -23,7 +23,7 @@
AC_PREREQ(2.61) AC_PREREQ(2.61)
AC_INIT([GNU Mcron], [1.0.8], [bug-mcron@gnu.org]) 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]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([subdir-objects]) AM_INIT_AUTOMAKE([subdir-objects])
AM_SILENT_RULES([yes]) # enables silent rules by default 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]) [chmod +x pre-inst-env])
AC_CONFIG_FILES([doc/config.texi AC_CONFIG_FILES([doc/config.texi
Makefile Makefile
scm/mcron/config.scm]) src/mcron/config.scm])
AC_OUTPUT AC_OUTPUT