Made src/language into one big library. Closes patch #5633

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

diff --git a/src/language/utilities/automake.mk b/src/language/utilities/automake.mk
index ba7ab45cc497904b111e74344692efcf0faa9bee..a6ea213f2d672bba779a59424bd507bbf3fc085e 100644 (file)
--- a/src/language/utilities/automake.mk
+++ b/src/language/utilities/automake.mk
@@ -1,30 +1,17 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 
-src/language/utilities/%: AM_CPPFLAGS += -I$(top_srcdir)/src/libpspp \
- -I$(top_srcdir)/src/data \
- -I$(top_srcdir)/src/math \
- -I$(top_srcdir)/src/output \
- -I$(top_srcdir)/src/output/charts \
- -I$(top_srcdir)/src/language/lexer \
- -I$(top_srcdir)/src/language
-
-src_language_utilities_q_sources_q =  \
-       src/language/utilities/set.q
-
-
-src_language_utilities_q_sources_c =  \
+src_language_utilities_built_sources = \
        src/language/utilities/set.c
-
-noinst_LIBRARIES += src/language/utilities/libutilities.a
-
-EXTRA_DIST += $(src_language_utilities_q_sources_q)
-nodist_src_language_utilities_libutilities_a_SOURCES = $(src_language_utilities_q_sources_c)
-CLEANFILES += $(src_language_utilities_q_sources_c)
-
-src_language_utilities_libutilities_a_SOURCES = \
+language_utilities_sources = \
        src/language/utilities/date.c \
        src/language/utilities/echo.c \
        src/language/utilities/title.c \
        src/language/utilities/include.c \
-       src/language/utilities/permissions.c 
+       src/language/utilities/permissions.c \
+       $(src_language_utilities_built_sources)
+
+all_q_sources += $(src_language_utilities_built_sources:.c=.q)
+EXTRA_DIST += $(src_language_utilities_built_sources:.c=.q)
+CLEANFILES += $(src_language_utilities_built_sources)
+