X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fautomake.mk;h=cc2ed229a789b0972b8e97bfa6c9a604f574bb65;hb=6648c65e4574357f2f3b8d97ccd92ef0e77ad657;hp=44152b4473c97548436b3916798b31526949b524;hpb=1d2780996f3f615c2ea19ddfc1c9e1592fa64b70;p=pspp

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index 44152b4473..cc2ed229a7 100644
--- 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 \
@@ -29,15 +23,19 @@ helpers = src/language/expressions/generate.pl \
 	src/language/expressions/operations.def
 
 $(expressions_built_sources): $(helpers)
-EXTRA_DIST += $(helpers) $(expressions_built_sources:=.pl)
+EXTRA_DIST += $(helpers) $(expressions_built_sources:=pl)
+AM_CPPFLAGS += -I$(top_builddir)/src/language/expressions \
+	-I$(top_srcdir)/src/language/expressions
 
-SUFFIXES = .h.pl .inc.pl
+SUFFIXES += .h .hpl .inc .incpl
 
-generate_from_pl = $(top_srcdir)/mkinstalldirs `dirname $@` && \
+generate_from_pl = $(MKDIR_P) `dirname $@` && \
 	$(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
-.h.pl.h:
-	$(generate_from_pl)
+.hpl.h:
+	$(AM_V_GEN)$(generate_from_pl)
+
+.incpl.inc:
+	$(AM_V_GEN)$(generate_from_pl)
 
-.inc.pl.inc:
-	$(generate_from_pl)
+EXTRA_DIST += src/language/expressions/TODO