work on docs

[pspp] / utilities / automake.mk

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 1d58b619a947ea7dd93662880c58966c0d956541..41c57c733f204e4afdd48624bc26407be5d8fd96 100644 (file)
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -26,9 +26,23 @@ bin_PROGRAMS += utilities/pspp-convert
 dist_man_MANS += utilities/pspp-convert.1
 utilities_pspp_convert_SOURCES = utilities/pspp-convert.c
 utilities_pspp_convert_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
-utilities_pspp_convert_LDADD = src/libpspp-core.la
+utilities_pspp_convert_LDADD = src/libpspp.la src/libpspp-core.la $(CAIRO_LIBS)
 
 utilities_pspp_convert_LDFLAGS = $(PSPP_LDFLAGS) $(PG_LDFLAGS)
 if RELOCATABLE_VIA_LD
 utilities_pspp_convert_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
 endif
+
+bin_PROGRAMS += utilities/pspp-output
+dist_man_MANS += utilities/pspp-output.1
+utilities_pspp_output_SOURCES = utilities/pspp-output.c
+utilities_pspp_output_CPPFLAGS = \
+       $(LIBXML2_CFLAGS) $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
+utilities_pspp_output_LDADD = \
+       src/libpspp.la \
+       src/libpspp-core.la \
+       $(CAIRO_LIBS)
+utilities_pspp_output_LDFLAGS = $(PSPP_LDFLAGS) $(LIBXML2_LIBS)
+if RELOCATABLE_VIA_LD
+utilities_pspp_output_LDFLAGS += `$(RELOCATABLE_LDFLAGS) $(bindir)`
+endif