[Nagios-checkins] SF.net SVN: nagios:[2125] nagioscore/trunk/contrib/Makefile.in

ageric at users.sourceforge.net ageric at users.sourceforge.net
Wed Aug 29 15:20:22 UTC 2012


Revision: 2125
          http://nagios.svn.sourceforge.net/nagios/?rev=2125&view=rev
Author:   ageric
Date:     2012-08-29 15:20:22 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
contrib: Make stuff build properly with libnagios

Thanks to Daniel Wittenberg for keeping an eye on me ;)

Signed-off-by: Andreas Ericsson <ae at op5.se>

Modified Paths:
--------------
    nagioscore/trunk/contrib/Makefile.in

Modified: nagioscore/trunk/contrib/Makefile.in
===================================================================
--- nagioscore/trunk/contrib/Makefile.in	2012-08-29 15:20:04 UTC (rev 2124)
+++ nagioscore/trunk/contrib/Makefile.in	2012-08-29 15:20:22 UTC (rev 2125)
@@ -5,13 +5,14 @@
 ###############################
 
 CC=@CC@
-CFLAGS=@CFLAGS@ @DEFS@
+CFLAGS=-I.. @CFLAGS@ @DEFS@
 LDFLAGS=@LDFLAGS@ @LIBS@
 
 # Source code directories
 SRC_INCLUDE=../include
 SRC_COMMON=../common
 SRC_CGI=../cgi
+SRC_LIB=../lib
 
 # Generated automatically from configure script
 SNPRINTF_O=@SNPRINTF_O@
@@ -59,11 +60,14 @@
 ##############################################################################
 # rules and dependencies for actual target programs
 
-daemonchk.cgi: daemonchk.o $(CGI_O) $(CGI_H) $(COMMON_H)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(CGI_O)
+$(SRC_LIB)/libnagios.a:
+	make -C $(SRC_LIB) libnagios.a
 
+daemonchk.cgi: daemonchk.o $(CGI_O) $(CGI_H) $(COMMON_H) $(SRC_LIB)/libnagios.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(CGI_O) $(SRC_LIB)/libnagios.a
+
 daemonchk.o: daemonchk.c
-	$(CC) $(CLFAGS) -c -o $@ $< -I$(SRC_INCLUDE)
+	$(CC) $(CFLAGS) -c -o $@ $< -I$(SRC_INCLUDE)
 
 ##############################################################################
 # dependencies

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Nagios-commits mailing list