[tokkee]

tokkee.org

Code

projects / nagiosplug.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0c34b75)
Workaround to support more make programs
authorThomas Guyot-Sionnest <dermoth@aei.ca>
Tue, 25 Nov 2008 05:33:23 +0000 (00:33 -0500)
committerThomas Guyot-Sionnest <dermoth@aei.ca>
Tue, 25 Nov 2008 13:50:35 +0000 (08:50 -0500)
Avoid the use of "-include". Since "include" is interpreted by Automake, we have to use a special macro instead.

plugins-root/Makefile.am patch | blob | history
plugins-scripts/Makefile.am patch | blob | history
plugins/Makefile.am patch | blob | history

diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index 843b8a9998446e6958d67ee23c3479c5c20f861b..ba2e9a27843710be1626a72234dcf0b9fcea82ff 100644 (file)
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -4,7 +4,10 @@ NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
        @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
 .FORCE-NP-VERSION-FILE:
 
--include NP-VERSION-FILE
+## This is undocumented and could possibly break in future versions of
+## automake. See:
+## http://article.gmane.org/gmane.comp.sysutils.automake.general/10036
+@am__include@ @am__quote@NP-VERSION-FILE@am__quote@
 
 AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
 
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index 897c724a689ea4a48a0dd13ffefd6694954d6417..19702739d7d1db9968c30613adf1fef26cebeedb 100644 (file)
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -4,7 +4,10 @@ NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
        @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
 .FORCE-NP-VERSION-FILE:
 
--include NP-VERSION-FILE
+## This is undocumented and could possibly break in future versions of
+## automake. See:
+## http://article.gmane.org/gmane.comp.sysutils.automake.general/10036
+@am__include@ @am__quote@NP-VERSION-FILE@am__quote@
 
 SUFFIXES = .pl .sh
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 10fb06c66f1c3b23bbdbcc52a4ad793684d2c59a..fb1924fe377b82e16597268abd96e63780d65cf9 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -4,7 +4,10 @@ NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
        @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
 .FORCE-NP-VERSION-FILE:
 
--include NP-VERSION-FILE
+## This is undocumented and could possibly break in future versions of
+## automake. See:
+## http://article.gmane.org/gmane.comp.sysutils.automake.general/10036
+@am__include@ @am__quote@NP-VERSION-FILE@am__quote@
 
 AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
 
Nagios® plugins