Automatically link every program against libintl and libiconv.

[pspp] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bebd2ab5ab4d13edc5dadfeef7bc3f36e7b00286..deafc2e2cdfaffe066737d51764c5759e55140a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,7 @@ BUILT_SOURCES =
 AM_CPPFLAGS = \
        -I$(top_srcdir)/gl \
        -I$(top_builddir)/gl \
-       -DINSTALLDIR=\"$(bindir)\" \
-       -DDOCDIR=\"$(docdir)\"
+       -DINSTALLDIR=\"$(bindir)\"
 
 AM_CFLAGS=
 
@@ -29,7 +28,7 @@ all_q_sources =
 pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
 
 
-EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
+EXTRA_DIST = OChangeLog ONEWS pspp-mode.el
 
 CLEANFILES = 
 CLEAN_LOCAL =
@@ -46,6 +45,7 @@ INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 PHONY =
 SUFFIXES = .q
+LDADD = gl/libgl.la
 
 generate-changelog:
        if test -d $(top_srcdir)/.git; then                     \