[Pspp-cvs] Changes to pspp/src/expressions/Makefile.am

[John Darrington]

Index: pspp/src/expressions/Makefile.am
diff -u pspp/src/expressions/Makefile.am:1.1 
pspp/src/expressions/Makefile.am:1.2
--- pspp/src/expressions/Makefile.am:1.1        Tue Mar  1 08:16:16 2005
+++ pspp/src/expressions/Makefile.am    Thu Mar  3 14:21:00 2005
@@ -5,23 +5,29 @@
 noinst_LIBRARIES = libexpressions.a
 
 libexpressions_a_SOURCES = evaluate.c helpers.c helpers.h optimize.c   \
-parse.c private.h public.h
+       parse.c private.h public.h \
+       evaluate.inc.pl PSPP_expressions.pm operations.def \
+       evaluate.h.pl operations.h.pl optimize.inc.pl parse.inc.pl
 
 BUILT_SOURCES = evaluate.h evaluate.inc operations.h optimize.inc parse.inc
+CLEANFILES = evaluate.h evaluate.inc operations.h optimize.inc parse.inc
+
 
 PERL = @PERL@
 
-evaluate.inc: evaluate.inc.pl generate.pl operations.def 
-       $(PERL) evaluate.inc.pl -o evaluate.inc
+helpers = $(srcdir)/PSPP_expressions.pm $(srcdir)/operations.def
+
+evaluate.inc: $(srcdir)/evaluate.inc.pl $(helpers)
+       $(PERL) -I $(srcdir) $< -o $@ -i $(srcdir)/operations.def
 
-evaluate.h: evaluate.h.pl generate.pl operations.def
-       $(PERL) evaluate.h.pl -o evaluate.h
+evaluate.h: $(srcdir)/evaluate.h.pl $(helpers)
+       $(PERL) -I $(srcdir) $< -o $@ -i $(srcdir)/operations.def
 
-operations.h: operations.h.pl generate.pl operations.def
-       $(PERL) operations.h.pl -o operations.h
+operations.h: $(srcdir)/operations.h.pl $(helpers)
+       $(PERL) -I $(srcdir) $< -o $@ -i $(srcdir)/operations.def
 
-optimize.inc: optimize.inc.pl generate.pl operations.def
-       $(PERL) optimize.inc.pl -o optimize.inc
+optimize.inc: $(srcdir)/optimize.inc.pl $(helpers)
+       $(PERL) -I $(srcdir) $< -o $@ -i $(srcdir)/operations.def
 
-parse.inc: parse.inc.pl generate.pl operations.def
-       $(PERL) parse.inc.pl -o parse.inc
+parse.inc: $(srcdir)/parse.inc.pl $(helpers)
+       $(PERL) -I $(srcdir) $< -o $@ -i $(srcdir)/operations.def