X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fautomake.mk;h=047180bf49bcc0670d62c190c1a54fccf32dd10a;hb=9666b94fcb0fe0230371d85a951ed18d1a34d538;hp=1d58b619a947ea7dd93662880c58966c0d956541;hpb=facb4a1ad3c9e8b2cdf55824680eed2afb91aebe;p=pspp

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 1d58b619a9..047180bf49 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-bin_PROGRAMS += utilities/pspp-dump-sav
+noinst_PROGRAMS += utilities/pspp-dump-sav
 dist_man_MANS += utilities/pspp-dump-sav.1
 utilities_pspp_dump_sav_SOURCES = \
 	src/libpspp/integer-format.c \
@@ -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