Merge master into gtk3.
[pspp] / utilities / automake.mk
index ec4ccf20da7d3531fab9ea0dd78e25c230d7211b..5a44ff825cc42dd3d07fe53a847cf05dabfab10c 100644 (file)
@@ -1,7 +1,16 @@
 bin_PROGRAMS += utilities/pspp-dump-sav
+dist_man_MANS += utilities/pspp-dump-sav.1
 utilities_pspp_dump_sav_SOURCES = \
        src/libpspp/integer-format.c \
        src/libpspp/float-format.c \
        utilities/pspp-dump-sav.c
 utilities_pspp_dump_sav_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
 
+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/liblibpspp.la \
+       src/libpspp-core.la \
+       gl/libgl.la