X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fautomake.mk;h=cc2ed229a789b0972b8e97bfa6c9a604f574bb65;hb=146d3ec83c45f3ccf131520eece8f75e568a8b53;hp=1ad694b02649f68053869641fe46c714e464c4b5;hpb=92fb12eb06716d14c05b781f5d9dcde956d77c30;p=pspp

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index 1ad694b026..cc2ed229a7 100644
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -1,38 +1,13 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-src/language/expressions/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \
-  -I$(top_srcdir)/src/data \
-  -I$(top_srcdir)/src/math \
-  -I$(top_srcdir)/src/language/lexer \
-  -I$(top_srcdir)/src/language/expressions \
-  -I$(top_builddir)/src/language/expressions \
-  -I$(top_srcdir)/src/language
-
-noinst_LIBRARIES += src/language/expressions/libexpressions.a
-
-src/language/expressions/evaluate.o: src/language/expressions/evaluate.h src/language/expressions/operations.h src/language/expressions/evaluate.inc
-
-src/language/expressions/optimize.o: src/language/expressions/optimize.inc
-
-src/language/expressions/parse.o: src/language/expressions/parse.inc
-
-CLEANFILES += $(expressions_built_sources)
-
-src_language_expressions_libexpressions_a_SOURCES = \
+language_expressions_sources = \
 	src/language/expressions/evaluate.c \
 	src/language/expressions/helpers.c \
 	src/language/expressions/helpers.h \
 	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 \
@@ -41,16 +16,26 @@ expressions_built_sources= \
 	src/language/expressions/optimize.inc \
 	src/language/expressions/parse.inc
 
+BUILT_SOURCES += $(expressions_built_sources)
+CLEANFILES += $(expressions_built_sources)
 
-nodist_src_language_expressions_libexpressions_a_SOURCES = $(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)
+AM_CPPFLAGS += -I$(top_builddir)/src/language/expressions \
+	-I$(top_srcdir)/src/language/expressions
 
-helpers = $(top_srcdir)/src/language/expressions/generate.pl \
-	$(top_srcdir)/src/language/expressions/operations.def
+SUFFIXES += .h .hpl .inc .incpl
 
-%: %.pl $(helpers)
-	@mkdir -p `dirname $@`
+generate_from_pl = $(MKDIR_P) `dirname $@` && \
 	$(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
+.hpl.h:
+	$(AM_V_GEN)$(generate_from_pl)
+
+.incpl.inc:
+	$(AM_V_GEN)$(generate_from_pl)
+
+EXTRA_DIST += src/language/expressions/TODO