Couldn't this have been fixed by adding src/mon-collector.hs to HS_GENERATED_FILES? The filtering and readding feels strange somehow... It might be better to define HS_GENERATED_SRCS and add this list to HS_GENERATED_FILES (which does not contain src/mon-collector.hs anyway ATM, but should probably) and to HS_PROGS_SRCS, so we have a more general approach to generated Haskell files?
On Tue, Sep 24, 2013 at 1:11 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 | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/Makefile.am b/Makefile.am > index 609d956..33623cb 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -588,7 +588,16 @@ HS_ALL_PROGS = \ > test/hs/htest \ > $(HS_COMPILE_PROGS) > > -HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) src/hs2py-constants.hs > +# The program 'mon-collector' might be included in 'HS_ALL_PROGS' > +# (through 'HS_PROGS') depending on 'configure' variables. However, > +# its source file must always be included in the distribution. Given > +# that the source files are computed by the following variable, we > +# need to make sure that 'src/mon-collector.hs' is always included by > +# filtering out the binary and adding the source manually > +HS_PROG_SRCS = $(patsubst %,%.hs, \ > + $(filter-out src/mon-collector,$(HS_ALL_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
