Cope with new location of upstream files

[pspp] / src / language / expressions / automake.mk

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index 44152b4473c97548436b3916798b31526949b524..58e64327e7b4264127546793ed21b8a6338e7fb6 100644 (file)
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -1,12 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-noinst_LIBRARIES += src/language/expressions/libexpressions.a
-
-src_language_expressions_libexpressions_a_CPPFLAGS = $(AM_CPPFLAGS) \
-       -I src/language/expressions \
-       -I $(top_srcdir)/src/language/expressions
-
-src_language_expressions_libexpressions_a_SOURCES = \
+language_expressions_sources = \
        src/language/expressions/evaluate.c \
        src/language/expressions/helpers.c \
        src/language/expressions/helpers.h \
@@ -15,7 +9,7 @@ src_language_expressions_libexpressions_a_SOURCES = \
        src/language/expressions/private.h \
        src/language/expressions/public.h
 
-expressions_built_sources= \
+expressions_built_sources = \
        src/language/expressions/evaluate.h \
        src/language/expressions/evaluate.inc \
        src/language/expressions/operations.h \
@@ -27,17 +21,13 @@ CLEANFILES += $(expressions_built_sources)
 
 helpers = src/language/expressions/generate.pl \
        src/language/expressions/operations.def
+EXTRA_DIST += $(helpers)
 
 $(expressions_built_sources): $(helpers)
-EXTRA_DIST += $(helpers) $(expressions_built_sources:=.pl)
-
-SUFFIXES = .h.pl .inc.pl
-
-generate_from_pl = $(top_srcdir)/mkinstalldirs `dirname $@` && \
-       $(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
+       $(AV_V_GEN)$(MKDIR_P) `dirname $@` && \
+       $(PERL) $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
-.h.pl.h:
-       $(generate_from_pl)
+AM_CPPFLAGS += -I$(top_builddir)/src/language/expressions \
+       -I$(top_srcdir)/src/language/expressions
 
-.inc.pl.inc:
-       $(generate_from_pl)
+EXTRA_DIST += src/language/expressions/TODO