build: Use a non-recursive makefile.
* configure.ac (AM_INIT_AUTOMAKE): Use 'subdir-objects' option. (AC_CONFIG_FILES): Remove 'scm/mcron/makefile' and 'makefile'. Add 'Makefile'. * makefile.am: Delete file. Move its content into ... * scm/mcron/makefile.am: Likewise. * Makefile.am: ... this. New file. * .gitignore: Update.
This commit is contained in:
Mathieu Lirzin
parent
589d5ff8d1
commit
b59f2f5ea6
5 changed files with 162 additions and 170 deletions
30
.gitignore
vendored
30
.gitignore
vendored
|
|
@ -1,9 +1,7 @@
|
||||||
*~
|
|
||||||
*.go
|
*.go
|
||||||
|
*.o
|
||||||
|
*~
|
||||||
.deps
|
.deps
|
||||||
INSTALL
|
|
||||||
aclocal.m4
|
|
||||||
autom4te.cache
|
|
||||||
/build-aux/compile
|
/build-aux/compile
|
||||||
/build-aux/config.guess
|
/build-aux/config.guess
|
||||||
/build-aux/config.sub
|
/build-aux/config.sub
|
||||||
|
|
@ -12,6 +10,19 @@ autom4te.cache
|
||||||
/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/mcron.1
|
||||||
|
/doc/mcron.info
|
||||||
|
/doc/stamp-vti
|
||||||
|
/doc/version.texi
|
||||||
|
/mcron
|
||||||
|
/mdate-sh
|
||||||
|
INSTALL
|
||||||
|
Makefile
|
||||||
|
Makefile.in
|
||||||
|
aclocal.m4
|
||||||
|
autom4te.cache
|
||||||
compile
|
compile
|
||||||
config.cache
|
config.cache
|
||||||
config.log
|
config.log
|
||||||
|
|
@ -20,17 +31,6 @@ config.status
|
||||||
configure
|
configure
|
||||||
core.scm
|
core.scm
|
||||||
depcomp
|
depcomp
|
||||||
/doc/.dirstamp
|
|
||||||
/doc/config.texi
|
|
||||||
/doc/mcron.info
|
|
||||||
/doc/mcron.1
|
|
||||||
/doc/stamp-vti
|
|
||||||
/doc/version.texi
|
|
||||||
install-sh
|
install-sh
|
||||||
makefile
|
|
||||||
makefile.in
|
|
||||||
/mcron
|
|
||||||
/mdate-sh
|
|
||||||
*.o
|
|
||||||
missing
|
missing
|
||||||
texinfo.tex
|
texinfo.tex
|
||||||
|
|
|
||||||
145
Makefile.am
Normal file
145
Makefile.am
Normal file
|
|
@ -0,0 +1,145 @@
|
||||||
|
## Process this file with automake to produce Makefile.in.
|
||||||
|
|
||||||
|
# Copyright (C) 2003 Dale Mellor
|
||||||
|
# Copyright (C) 2015, 2016 Mathieu Lirzin
|
||||||
|
#
|
||||||
|
# This program is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
bin_PROGRAMS = mcron
|
||||||
|
mcron_SOURCES = mcron.c
|
||||||
|
mcron_CFLAGS = @GUILE_CFLAGS@ -DGUILE_LOAD_PATH=\"$(datadir):./scm:...\"
|
||||||
|
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
|
||||||
|
|
||||||
|
GEN_MODULES = \
|
||||||
|
scm/mcron/config.scm \
|
||||||
|
scm/mcron/core.scm
|
||||||
|
|
||||||
|
CP = @CP@
|
||||||
|
# XXX: Prevent the 'configure' script to delete the 'core.*' files.
|
||||||
|
scm/mcron/core.scm: scm/mcron/mcron-core.scm
|
||||||
|
$(CP) $< $@
|
||||||
|
|
||||||
|
GOBJECTS = \
|
||||||
|
$(GEN_MODULES:%.scm=%.go) \
|
||||||
|
$(MODULES:%.scm=%.go)
|
||||||
|
|
||||||
|
mcronmodule_DATA = \
|
||||||
|
$(GOBJECTS) \
|
||||||
|
$(GEN_MODULES)
|
||||||
|
|
||||||
|
dist_mcronmodule_DATA = \
|
||||||
|
$(MODULES) \
|
||||||
|
scm/mcron/crontab.scm \
|
||||||
|
scm/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
|
||||||
|
# in there that are newer than the local .scm files (for instance because the
|
||||||
|
# user ran 'make install' recently). When that happens, we end up loading
|
||||||
|
# those previously-installed .go files, which may be stale, thereby breaking
|
||||||
|
# the whole thing.
|
||||||
|
#
|
||||||
|
# XXX: Use the C locale for when Guile lacks
|
||||||
|
# <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
|
||||||
|
.scm.go:
|
||||||
|
$(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \
|
||||||
|
unset GUILE_LOAD_COMPILED_PATH ; \
|
||||||
|
LC_ALL=C \
|
||||||
|
$(GUILD) compile \
|
||||||
|
--load-path="$(top_builddir)/scm" \
|
||||||
|
--load-path="$(top_srcdir)/scm" \
|
||||||
|
--warn=format --warn=unbound-variable --warn=arity-mismatch \
|
||||||
|
--target="$(host)" --output="$@" "$<"
|
||||||
|
|
||||||
|
SUFFIXES = .go
|
||||||
|
|
||||||
|
dist-hook: gen-ChangeLog
|
||||||
|
|
||||||
|
gen_start_date = 2015-06-26
|
||||||
|
.PHONY: gen-ChangeLog
|
||||||
|
gen-ChangeLog:
|
||||||
|
$(AM_V_GEN)if test -d $(srcdir)/.git; then \
|
||||||
|
log_fix="$(srcdir)/build-aux/git-log-fix"; \
|
||||||
|
test -e "$$log_fix" \
|
||||||
|
&& amend_git_log="--amend=$$log_fix" \
|
||||||
|
|| amend_git_log=; \
|
||||||
|
$(top_srcdir)/build-aux/gitlog-to-changelog \
|
||||||
|
$$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
|
||||||
|
{ rm -f $(distdir)/ChangeLog && \
|
||||||
|
mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
|
||||||
|
fi
|
||||||
|
|
||||||
|
#full program prefix
|
||||||
|
fpp = $(DESTDIR)$(bindir)/@real_program_prefix@
|
||||||
|
|
||||||
|
install-exec-hook:
|
||||||
|
@if [ "x@NO_VIXIE_CLOBBER@" != "xyes" -a "`id -u`" -eq "0" ]; then \
|
||||||
|
rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
|
||||||
|
$(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
|
||||||
|
rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
|
||||||
|
$(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
|
||||||
|
$(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
|
||||||
|
$(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
|
||||||
|
$(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
|
||||||
|
$(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
|
||||||
|
elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
|
||||||
|
echo "Not installing Vixie-style programs"; \
|
||||||
|
else \
|
||||||
|
echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
uninstall-hook:
|
||||||
|
if [ "`id -u`" -eq "0" ]; then \
|
||||||
|
rm -f $(fpp){cron,crontab}$(EXEEXT); \
|
||||||
|
fi
|
||||||
|
|
||||||
|
EXTRA_DIST = BUGS
|
||||||
|
CLEANFILES = $(GOBJECTS)
|
||||||
|
|
||||||
|
## --------------- ##
|
||||||
|
## Documentation. ##
|
||||||
|
## --------------- ##
|
||||||
|
|
||||||
|
info_TEXINFOS = doc/mcron.texi
|
||||||
|
doc_mcron_TEXINFOS = doc/fdl.texi
|
||||||
|
dist_man_MANS = doc/mcron.1
|
||||||
|
|
||||||
|
# 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
|
||||||
|
-$(AM_V_HELP2MAN)$(MKDIR_P) `dirname "$@"` ; \
|
||||||
|
$(HELP2MAN) \
|
||||||
|
-n 'a program to run tasks at regular (or not) intervals' \
|
||||||
|
./mcron > $@
|
||||||
|
|
||||||
|
## -------------- ##
|
||||||
|
## Silent rules. ##
|
||||||
|
## -------------- ##
|
||||||
|
|
||||||
|
AM_V_GUILEC = $(AM_V_GUILEC_$(V))
|
||||||
|
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
|
||||||
|
AM_V_GUILEC_0 = @echo " GUILEC " $@;
|
||||||
|
|
||||||
|
AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V))
|
||||||
|
AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY))
|
||||||
|
AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@;
|
||||||
|
|
@ -24,7 +24,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_AUX_DIR([build-aux])
|
AC_CONFIG_AUX_DIR([build-aux])
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE([subdir-objects])
|
||||||
AM_SILENT_RULES([yes]) # enables silent rules by default
|
AM_SILENT_RULES([yes]) # enables silent rules by default
|
||||||
|
|
||||||
mcronmoduledir="${datarootdir}/guile/site/2.0/mcron"
|
mcronmoduledir="${datarootdir}/guile/site/2.0/mcron"
|
||||||
|
|
@ -182,7 +182,6 @@ real_program_prefix=`echo $program_prefix | sed s/NONE//`
|
||||||
AC_SUBST(real_program_prefix)
|
AC_SUBST(real_program_prefix)
|
||||||
|
|
||||||
AC_CONFIG_FILES([doc/config.texi
|
AC_CONFIG_FILES([doc/config.texi
|
||||||
makefile
|
Makefile
|
||||||
scm/mcron/makefile
|
|
||||||
scm/mcron/config.scm])
|
scm/mcron/config.scm])
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
|
||||||
93
makefile.am
93
makefile.am
|
|
@ -1,93 +0,0 @@
|
||||||
## Makefile for the toplevel directory of mcron.
|
|
||||||
## Copyright (C) 2003 Dale Mellor
|
|
||||||
## Copyright (C) 2015 Mathieu Lirzin
|
|
||||||
##
|
|
||||||
# This file is part of GNU mcron.
|
|
||||||
#
|
|
||||||
# GNU mcron is free software: you can redistribute it and/or modify it under
|
|
||||||
# the terms of the GNU General Public License as published by the Free
|
|
||||||
# Software Foundation, either version 3 of the License, or (at your option)
|
|
||||||
# any later version.
|
|
||||||
#
|
|
||||||
# GNU mcron is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
# more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License along
|
|
||||||
# with GNU mcron. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
## Process this file with automake to produce Makefile.in
|
|
||||||
|
|
||||||
SUBDIRS = scm/mcron .
|
|
||||||
|
|
||||||
CP = @CP@
|
|
||||||
|
|
||||||
EXTRA_DIST = BUGS ChangeLog.old
|
|
||||||
|
|
||||||
info_TEXINFOS = doc/mcron.texi
|
|
||||||
doc_mcron_TEXINFOS = doc/fdl.texi
|
|
||||||
dist_man_MANS = doc/mcron.1
|
|
||||||
|
|
||||||
bin_PROGRAMS = mcron
|
|
||||||
mcron_SOURCES = mcron.c
|
|
||||||
mcron_LDADD = @GUILE_LIBS@
|
|
||||||
|
|
||||||
# The second option is so that we can execute the binary in the local directory,
|
|
||||||
# in turn so that we can do mcron --help during the build process.
|
|
||||||
mcron_CFLAGS = @GUILE_CFLAGS@ -DGUILE_LOAD_PATH=\"$(datadir):./scm:...\"
|
|
||||||
|
|
||||||
dist-hook: gen-ChangeLog
|
|
||||||
|
|
||||||
gen_start_date = 2015-06-26
|
|
||||||
.PHONY: gen-ChangeLog
|
|
||||||
gen-ChangeLog:
|
|
||||||
$(AM_V_GEN)if test -d $(srcdir)/.git; then \
|
|
||||||
log_fix="$(srcdir)/build-aux/git-log-fix"; \
|
|
||||||
test -e "$$log_fix" \
|
|
||||||
&& amend_git_log="--amend=$$log_fix" \
|
|
||||||
|| amend_git_log=; \
|
|
||||||
$(top_srcdir)/build-aux/gitlog-to-changelog \
|
|
||||||
$$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
|
|
||||||
{ rm -f $(distdir)/ChangeLog && \
|
|
||||||
mv $(distdir)/cl-t $(distdir)/ChangeLog; } \
|
|
||||||
fi
|
|
||||||
|
|
||||||
#full program prefix
|
|
||||||
fpp = $(DESTDIR)$(bindir)/@real_program_prefix@
|
|
||||||
|
|
||||||
|
|
||||||
install-exec-hook:
|
|
||||||
@if [ "x@NO_VIXIE_CLOBBER@" != "xyes" -a "`id -u`" -eq "0" ]; then \
|
|
||||||
rm -f $(fpp)cron$(EXEEXT) > /dev/null 2>&1; \
|
|
||||||
$(INSTALL) --mode='u=rwx' mcron$(EXEEXT) $(fpp)cron$(EXEEXT); \
|
|
||||||
rm -f $(fpp)crontab$(EXEEXT) > /dev/null 2>&1; \
|
|
||||||
$(INSTALL) --mode='u=rwxs,og=rx' mcron$(EXEEXT) $(fpp)crontab$(EXEEXT); \
|
|
||||||
$(INSTALL) -d --mode='u=rwx' $(DESTDIR)/var/cron; \
|
|
||||||
$(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)/var/run; \
|
|
||||||
$(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@; \
|
|
||||||
$(INSTALL) -d --mode='u=rwx,og=rx' $(DESTDIR)@GUILE_SITE@/mcron; \
|
|
||||||
elif [ "x@NO_VIXIE_CLOBBER@" = "xyes" ]; then \
|
|
||||||
echo "Not installing Vixie-style programs"; \
|
|
||||||
else \
|
|
||||||
echo "+++ WARNING: NON-ROOT INSTALL: ONLY mcron WILL BE INSTALLED, NOT ANY OF THE VIXIE REPLACEMENT PROGRAMS"; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
uninstall-hook:
|
|
||||||
if [ "`id -u`" -eq "0" ]; then \
|
|
||||||
rm -f $(fpp){cron,crontab}$(EXEEXT); \
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Extend silent rules to help2man.
|
|
||||||
AM_V_HELP2MAN = $(AM_V_HELP2MAN_$(V))
|
|
||||||
AM_V_HELP2MAN_ = $(AM_V_HELP2MAN_$(AM_DEFAULT_VERBOSITY))
|
|
||||||
AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@;
|
|
||||||
|
|
||||||
# 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
|
|
||||||
-$(AM_V_HELP2MAN)$(MKDIR_P) `dirname "$@"` ; \
|
|
||||||
$(HELP2MAN) \
|
|
||||||
-n 'a program to run tasks at regular (or not) intervals' \
|
|
||||||
./mcron > $@
|
|
||||||
|
|
@ -1,59 +0,0 @@
|
||||||
MODULES = \
|
|
||||||
environment.scm \
|
|
||||||
job-specifier.scm \
|
|
||||||
main.scm \
|
|
||||||
redirect.scm \
|
|
||||||
vixie-specification.scm \
|
|
||||||
vixie-time.scm
|
|
||||||
|
|
||||||
GEN_MODULES = \
|
|
||||||
config.scm \
|
|
||||||
core.scm
|
|
||||||
|
|
||||||
GOBJECTS = \
|
|
||||||
$(GEN_MODULES:%.scm=%.go) \
|
|
||||||
$(MODULES:%.scm=%.go)
|
|
||||||
|
|
||||||
mcronmodule_DATA = \
|
|
||||||
$(GOBJECTS) \
|
|
||||||
$(GEN_MODULES)
|
|
||||||
|
|
||||||
dist_mcronmodule_DATA = \
|
|
||||||
$(MODULES) \
|
|
||||||
crontab.scm \
|
|
||||||
mcron-core.scm
|
|
||||||
|
|
||||||
# Extend silent rules to Guile compilation.
|
|
||||||
AM_V_GUILEC = $(AM_V_GUILEC_$(V))
|
|
||||||
AM_V_GUILEC_ = $(AM_V_GUILEC_$(AM_DEFAULT_VERBOSITY))
|
|
||||||
AM_V_GUILEC_0 = @echo " GUILEC " $@;
|
|
||||||
|
|
||||||
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if
|
|
||||||
# $GUILE_LOAD_COMPILED_PATH contains $(mcronmoduledir), we may find .go files
|
|
||||||
# in there that are newer than the local .scm files (for instance because the
|
|
||||||
# user ran 'make install' recently). When that happens, we end up loading
|
|
||||||
# those previously-installed .go files, which may be stale, thereby breaking
|
|
||||||
# the whole thing.
|
|
||||||
#
|
|
||||||
# XXX: Use the C locale for when Guile lacks
|
|
||||||
# <http://git.sv.gnu.org/cgit/guile.git/commit/?h=stable-2.0&id=e2c6bf3866d1186c60bacfbd4fe5037087ee5e3f>.
|
|
||||||
.scm.go:
|
|
||||||
$(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \
|
|
||||||
unset GUILE_LOAD_COMPILED_PATH ; \
|
|
||||||
LC_ALL=C \
|
|
||||||
$(GUILD) compile \
|
|
||||||
--load-path="$(top_builddir)/scm" \
|
|
||||||
--load-path="$(top_srcdir)/scm" \
|
|
||||||
--warn=format --warn=unbound-variable --warn=arity-mismatch \
|
|
||||||
--target="$(host)" --output="$@" "$<"
|
|
||||||
|
|
||||||
SUFFIXES = .go
|
|
||||||
CLEANFILES = $(GOBJECTS)
|
|
||||||
|
|
||||||
# If you're wondering, the configure script keeps deleting all files with a name
|
|
||||||
# like core.*, so we have to keep re-making it (I lost a good day's work because
|
|
||||||
# of this).
|
|
||||||
|
|
||||||
core.scm : mcron-core.scm
|
|
||||||
$(CP) mcron-core.scm core.scm
|
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue