Add additional PID column heading

[nagiosplug.git] / plugins-root / Makefile.am

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 54e91b0808b94e047fdff74472611653cc312f40..bca3ceb5f047618959020ebdb0fb126bebb49467 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,22 +1,21 @@
 ## Process this file with automake to produce Makefile.in
 
-VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir)
 
-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins @SSLINCLUDE@
 
-datadir = @datadir@
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LIBS = @LIBINTL@ @LIBS@ @SSLLIBS@
+# Don't add LTLIBINTL to all, as pst3 doesn't need it
+#LIBS = @LTLIBINTL@ @LIBS@
 
-EXTRA_PROGRAMS = check_dhcp check_icmp
+noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@
 
-if WANT_PST3
-       EXTRA_PROGRAMS += pst3
-       pst3_DEPENDENCIES = pst3.c
-endif
+EXTRA_PROGRAMS = pst3
 
-BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
+EXTRA_DIST = pst3.c
+
+BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -27,16 +26,12 @@ TESTS = @PLUGIN_TEST@
 test:
        perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
 
-all-local: $(EXTRA_PROGRAMS)
-
-setuid_root_mode = 4550
-
-group = nagios
+setuid_root_mode = ug=rx,u+s
 
 # /* Author Coreutils team - see ACKNOWLEDGEMENTS */
 
 INSTALL_SUID = \
-       for f in $(EXTRA_PROGRAMS) ; do \
+       for f in $(noinst_PROGRAMS) ; do \
        p=$$f; \
        echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
        $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
@@ -46,10 +41,10 @@ INSTALL_SUID = \
        chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
        done
 
-install-root: $(EXTRA_PROGRAMS)
+install-root: $(noinst_PROGRAMS)
        @$(INSTALL_SUID)
 
-install-exec-local: $(EXTRA_PROGRAMS)
+install-exec-local: $(noinst_PROGRAMS)
        @TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
        rm -f $$TMPFILE; \
        echo > $$TMPFILE; \
@@ -71,8 +66,12 @@ install-exec-local: $(EXTRA_PROGRAMS)
 
 ##############################################################################
 # the actual targets
-check_dhcp_LDADD = $(NETLIBS)
-check_icmp_LDADD = $(SOCKETLIBS)
+check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS)
+check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS)
+# -m64 needed at compiler and linker phase
+pst3_CFLAGS = @PST3CFLAGS@
+pst3_LDFLAGS = @PST3CFLAGS@
+pst3_LDADD = -lkvm
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
-check_icmp_DEPENDENCIES = check_icmp.c
+check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)