X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins-root%2FMakefile.am;h=b5f55197024cd0403962bbc0aaa5f2d29c737c41;hb=e30f77864054e54f3c777aee0315f9c13b10957d;hp=54e91b0808b94e047fdff74472611653cc312f40;hpb=65282c7685ca01c57d94d3df93c2f95d5b945e57;p=nagiosplug.git

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 54e91b0..b5f5519 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,22 +1,32 @@
 ## Process this file with automake to produce Makefile.in
 
-VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t 
+if RELEASE_PRESENT
+NP_VERSION = @NP_RELEASE@
+else
+NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
+	@$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
+.FORCE-NP-VERSION-FILE:
+-include NP-VERSION-FILE
+endif
+
+AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
+
+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@
+AM_CPPFLAGS = -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
+
+EXTRA_DIST = pst3.c
 
-BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../lib/libcoreutils.a
+BASEOBJS = ../plugins/utils.o ../lib/libnagiosplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
 
@@ -27,16 +37,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 +52,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 +77,18 @@ 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 must not use nagiosplug/gnulib includes!
+pst3_CPPFLAGS =
 
 check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
-check_icmp_DEPENDENCIES = check_icmp.c
+check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)
+
+clean-local:
+	rm -f NP-VERSION-FILE
+