Attempt at detecting 64bit compilation flags between gcc, old, and new versions of...

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

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index de8813ffe052531327c454023e5c2896cbf4dd06..b5f55197024cd0403962bbc0aaa5f2d29c737c41 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,14 +1,19 @@
 ## Process this file with automake to produce Makefile.in
 
+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)/gl -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@
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
@@ -74,16 +79,16 @@ install-exec-local: $(noinst_PROGRAMS)
 # the actual targets
 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 $(NETOBJS)
 
-all-local: .FORCE-NP-VERSION-FILE
-
 clean-local:
        rm -f NP-VERSION-FILE
 
-.PHONY: .FORCE-NP-VERSION-FILE