Applied patch file #10344.

[pspp-builds.git] / src / language / expressions / automake.mk

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index f1687486eaaf10baae3e5a91db5224c640a8e576..44152b4473c97548436b3916798b31526949b524 100644 (file)
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -2,19 +2,9 @@
 
 noinst_LIBRARIES += src/language/expressions/libexpressions.a
 
-$(top_builddir)/src/language/expressions/src_language_expressions_libexpressions_a-evaluate.o: \
-       $(top_builddir)/src/language/expressions/evaluate.h \
-       $(top_builddir)/src/language/expressions/operations.h \
-       $(top_builddir)/src/language/expressions/evaluate.inc
-
-$(top_builddir)/src/language/expressions/src_language_expressions_libexpressions_a-optimize.o: \
-       $(top_builddir)/src/language/expressions/optimize.inc
-
-$(top_builddir)/src/language/expressions/src_language_expressions_libexpressions_a-parse.o: \
-       $(top_builddir)/src/language/expressions/parse.inc
-
-
-CLEANFILES += $(expressions_built_sources)
+src_language_expressions_libexpressions_a_CPPFLAGS = $(AM_CPPFLAGS) \
+       -I src/language/expressions \
+       -I $(top_srcdir)/src/language/expressions
 
 src_language_expressions_libexpressions_a_SOURCES = \
        src/language/expressions/evaluate.c \
@@ -23,14 +13,7 @@ src_language_expressions_libexpressions_a_SOURCES = \
        src/language/expressions/optimize.c \
        src/language/expressions/parse.c \
        src/language/expressions/private.h \
-       src/language/expressions/public.h \
-       src/language/expressions/evaluate.inc.pl \
-       src/language/expressions/generate.pl \
-       src/language/expressions/operations.def \
-       src/language/expressions/evaluate.h.pl \
-       src/language/expressions/operations.h.pl \
-       src/language/expressions/optimize.inc.pl \
-       src/language/expressions/parse.inc.pl
+       src/language/expressions/public.h
 
 expressions_built_sources= \
        src/language/expressions/evaluate.h \
@@ -39,19 +22,22 @@ expressions_built_sources= \
        src/language/expressions/optimize.inc \
        src/language/expressions/parse.inc
 
-src_language_expressions_libexpressions_a_CPPFLAGS = $(AM_CPPFLAGS) \
-       -I $(top_builddir)/src/language/expressions \
-       -I $(top_srcdir)/src/language/expressions
-
-nodist_src_language_expressions_libexpressions_a_SOURCES = $(expressions_built_sources)
+BUILT_SOURCES += $(expressions_built_sources)
+CLEANFILES += $(expressions_built_sources)
 
+helpers = src/language/expressions/generate.pl \
+       src/language/expressions/operations.def
 
-PERL = @PERL@
+$(expressions_built_sources): $(helpers)
+EXTRA_DIST += $(helpers) $(expressions_built_sources:=.pl)
 
-helpers = $(top_srcdir)/src/language/expressions/generate.pl \
-       $(top_srcdir)/src/language/expressions/operations.def
+SUFFIXES = .h.pl .inc.pl
 
-%: %.pl $(helpers)
-       @mkdir -p `dirname $@`
+generate_from_pl = $(top_srcdir)/mkinstalldirs `dirname $@` && \
        $(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
+.h.pl.h:
+       $(generate_from_pl)
+
+.inc.pl.inc:
+       $(generate_from_pl)