LGTM, thanks.
On Tue, Sep 24, 2013 at 3:15 PM, Jose A. Lopes <[email protected]> wrote: > This patch fixes 'Makefile.am' to include the source file of > 'mon-collector' in the distribution tarball even if the monitoring > daemon has been disabled at configure time. Fixes issue 587. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > Makefile.am | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 609d956..6134970 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -581,14 +581,20 @@ HS_PROGS = $(HS_BIN_PROGS) $(HS_MYEXECLIB_PROGS) > HS_BIN_ROLES = harep hbal hscan hspace hinfo hcheck hroller > HS_HTOOLS_PROGS = $(HS_BIN_ROLES) hail > > -HS_ALL_PROGS = \ > - $(HS_PROGS) \ > +# Haskell programs that cannot be disabled at configure (e.g., unlike > +# 'mon-collector') > +HS_DEFAULT_PROGS = \ > + $(HS_BIN_PROGS) \ > test/hs/hpc-htools \ > test/hs/hpc-mon-collector \ > test/hs/htest \ > $(HS_COMPILE_PROGS) > > -HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) src/hs2py-constants.hs > +HS_ALL_PROGS = $(HS_DEFAULT_PROGS) $(HS_MYEXECLIB_PROGS) > + > +HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_DEFAULT_PROGS)) \ > + src/mon-collector.hs \ > + src/hs2py-constants.hs > HS_BUILT_TEST_HELPERS = $(HS_BIN_ROLES:%=test/hs/%) test/hs/hail > > HFLAGS = \ > -- > 1.8.4 > > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
