RELIABILITY: Improve error messages and coding style.

[pspp] / utilities / automake.mk

diff --git a/utilities/automake.mk b/utilities/automake.mk
index f4cf8983c8b4753b06cf193d70915d361d9ec79c..047180bf49bcc0670d62c190c1a54fccf32dd10a 100644 (file)
--- 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,7 +26,7 @@ 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
@@ -43,3 +43,6 @@ utilities_pspp_output_LDADD = \
        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