diff -Naur nagios-3.0.6/base/Makefile.in nagios-3.0.6-optflags/base/Makefile.in --- nagios-3.0.6/base/Makefile.in 2008-02-28 20:25:45.000000000 +0100 +++ nagios-3.0.6-optflags/base/Makefile.in 2008-12-15 11:44:41.000000000 +0100 @@ -11,7 +11,7 @@ SRC_XDATA=../xdata CC=@CC@ -CFLAGS=@CFLAGS@ @DEFS@ @GLIB_INCLUDE@ -DNSCORE +CFLAGS=$(RPM_OPT_FLAGS) @CFLAGS@ @DEFS@ @GLIB_INCLUDE@ -DNSCORE # Compiler flags for use with gprof #CFLAGS=-pg -DHAVE_CONFIG_H @GLIB_INCLUDE@ -DNSCORE diff -Naur nagios-3.0.6/base/Makefile.in.orig nagios-3.0.6-optflags/base/Makefile.in.orig --- nagios-3.0.6/base/Makefile.in.orig 1970-01-01 01:00:00.000000000 +0100 +++ nagios-3.0.6-optflags/base/Makefile.in.orig 2008-12-15 11:44:34.000000000 +0100 @@ -0,0 +1,211 @@ +############################ +# Makefile for Nagios +# +# Last Modified: 02-24-2008 +############################ + + +# Source code directories +SRC_COMMON=../common +SRC_INCLUDE=../include +SRC_XDATA=../xdata + +CC=@CC@ +CFLAGS=@CFLAGS@ @DEFS@ @GLIB_INCLUDE@ -DNSCORE + +# Compiler flags for use with gprof +#CFLAGS=-pg -DHAVE_CONFIG_H @GLIB_INCLUDE@ -DNSCORE + +# Compiler flags for use with Valgrind +#CFLAGS=-O0 -g -DHAVE_CONFIG_H @GLIB_INCLUDE@ -DNSCORE + +# Compiler flags for optimization (overrides default) +#CFLAGS=-O3 -Wall -fno-strict-aliasing -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H @GLIB_INCLUDE@ -DNSCORE + +# Compiler flags for optimization (complements default) +#CFLAGS_WARN=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs +#CFLAGS_DEBUG=-ggdb3 -g3 +#CFLAGS_GPROF=-pg +#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG) $(CFLAGS_GPROF) + +LDFLAGS=@LDFLAGS@ +LIBS=@LIBS@ @GLIB_LIBS@ + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +LOGDIR=@localstatedir@ +CFGDIR=@sysconfdir@ +BINDIR=@bindir@ +CGIDIR=@sbindir@ +HTMLDIR=@datadir@ +INSTALL=@INSTALL@ +INSTALL_OPTS=@INSTALL_OPTS@ +COMMAND_OPTS=@COMMAND_OPTS@ +STRIP=@STRIP@ + +CGIURL=@cgiurl@ +HTMURL=@htmurl@ + +MATHLIBS=-lm +PERLLIBS=@PERLLIBS@ +PERLXSI_O=@PERLXSI_O@ +SOCKETLIBS=@SOCKETLIBS@ +THREADLIBS=@THREADLIBS@ +BROKERLIBS=@BROKERLIBS@ + +BROKER_LDFLAGS=@BROKER_LDFLAGS@ + +CP=@CP@ + +# External data I/O code and headers +XSDC=@XSDC@ +XSDH=@XSDH@ +XCDC=@XCDC@ +XCDH=@XCDH@ +XRDC=@XRDC@ +XRDH=@XRDH@ +XODC=@XODC@ +XODH=@XODH@ +XPDC=@XPDC@ +XPDH=@XPDH@ +XDDC=@XDDC@ +XDDH=@XDDH@ + +# Extra base code +BASEEXTRALIBS=@BASEEXTRALIBS@ + +# Generated automatically from configure script +SNPRINTF_O=@SNPRINTF_O@ +BROKER_O=@BROKER_O@ +BROKER_H=@BROKER_H@ + +# Object data +#ODATALIBS=$(SRC_COMMON)/objects.c $(SRC_XDATA)/$(XODC) +#ODATAHDRS=$(SRC_INCLUDE)/objects.h $(SRC_XDATA)/$(XODH) +ODATALIBS=objects-base.o xobjects-base.o +ODATAHDRS= +ODATADEPS=$(ODATALIBS) + +# Retention data +#RDATALIBS=sretention.o $(SRC_XDATA)/$(XRDC) +#RDATAHDRS=$(SRC_INCLUDE)/sretention.h $(SRC_XDATA)/$(XRDH) +RDATALIBS=retention-base.o xretention-base.o +RDATAHDRS= +RDATADEPS=$(RDATALIBS) + +# Comment data +#CDATALIBS=$(SRC_COMMON)/comments.c $(SRC_XDATA)/$(XCDC) +#CDATAHDRS=$(SRC_INCLUDE)/comments.h $(SRC_XDATA)/$(XCDH) +CDATALIBS=comments-base.o xcomments-base.o +CDATAHDRS= +CDATADEPS=$(CDATALIBS) + +# Status data +#SDATALIBS=$(SRC_COMMON)/statusdata.c $(SRC_XDATA)/$(XSDC) +#SDATAHDRS=$(SRC_INCLUDE)/statusdata.h $(SRC_XDATA)/$(XSDH) +SDATALIBS=statusdata-base.o xstatusdata-base.o +SDATAHDRS= +SDATADEPS=$(SDATALIBS) + +# Performance data +#PDATALIBS=perfdata.o $(SRC_XDATA)/$(XPDC) +#PDATAHDRS=$(SRC_INCLUDE)/perfdata.h $(SRC_XDATA)/$(XPDH) +PDATALIBS=perfdata-base.o xperfdata-base.o +PDATAHDRS= +PDATADEPS=$(PDATALIBS) + +# Downtime data +#DDATALIBS=$(SRC_COMMON)/downtime.c $(SRC_XDATA)/$(XDDC) +#DDATAHDRS=$(SRC_INCLUDE)/downtime.h $(SRC_XDATA)/$(XDDH) +DDATALIBS=downtime-base.o xdowntime-base.o +DDATAHDRS= +DDATADEPS=$(DDATALIBS) + + +OBJS=$(BROKER_O) checks.o config.o commands.o events.o flapping.o logging.o macros-base.o notifications.o sehandlers.o skiplist.o utils.o $(RDATALIBS) $(CDATALIBS) $(ODATALIBS) $(SDATALIBS) $(PDATALIBS) $(DDATALIBS) $(BASEEXTRALIBS) $(SNPRINTF_O) $(PERLXSI_O) +OBJDEPS=$(ODATADEPS) $(ODATADEPS) $(RDATADEPS) $(CDATADEPS) $(SDATADEPS) $(PDATADEPS) $(DDATADEPS) $(BROKER_H) + +all: nagios nagiostats + + +######## REQUIRED FILES ########## + +macros-base.o: $(SRC_COMMON)/macros.c $(SRC_INCLUDE)/macros.h + $(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/macros.c + +skiplist.o: $(SRC_COMMON)/skiplist.c $(SRC_INCLUDE)/skiplist.h + $(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/skiplist.c + +objects-base.o: $(SRC_COMMON)/objects.c $(SRC_INCLUDE)/objects.h + $(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/objects.c + +xobjects-base.o: $(SRC_XDATA)/$(XODC) $(SRC_XDATA)/$(XODH) + $(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XODC) + +statusdata-base.o: $(SRC_COMMON)/statusdata.c $(SRC_INCLUDE)/statusdata.h + $(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/statusdata.c + +xstatusdata-base.o: $(SRC_XDATA)/$(XSDC) $(SRC_XDATA)/$(XSDH) + $(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XSDC) + +comments-base.o: $(SRC_COMMON)/comments.c $(SRC_INCLUDE)/comments.h + $(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/comments.c + +xcomments-base.o: $(SRC_XDATA)/$(XCDC) $(SRC_XDATA)/$(XCDH) + $(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XCDC) + +downtime-base.o: $(SRC_COMMON)/downtime.c $(SRC_INCLUDE)/downtime.h + $(CC) $(CFLAGS) -c -o $@ $(SRC_COMMON)/downtime.c + +xdowntime-base.o: $(SRC_XDATA)/$(XDDC) $(SRC_XDATA)/$(XDDH) + $(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XDDC) + +perfdata-base.o: perfdata.c $(SRC_INCLUDE)/perfdata.h + $(CC) $(CFLAGS) -c -o $@ perfdata.c + +xperfdata-base.o: $(SRC_XDATA)/$(XPDC) $(SRC_XDATA)/$(XPDH) + $(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XPDC) + +retention-base.o: sretention.c $(SRC_INCLUDE)/sretention.h + $(CC) $(CFLAGS) -c -o $@ sretention.c + +xretention-base.o: $(SRC_XDATA)/$(XRDC) $(SRC_XDATA)/$(XRDH) + $(CC) $(CFLAGS) -c -o $@ $(SRC_XDATA)/$(XRDC) + + + +########## NAGIOS ########## + +nagios: nagios.c $(OBJS) $(OBJDEPS) $(SRC_INCLUDE)/nagios.h $(SRC_INCLUDE)/locations.h + $(CC) $(CFLAGS) -o $@ nagios.c $(OBJS) $(BROKER_LDFLAGS) $(LDFLAGS) $(PERLLIBS) $(MATHLIBS) $(SOCKETLIBS) $(THREADLIBS) $(BROKERLIBS) $(LIBS) + +nagiostats: nagiostats.c $(SRC_INCLUDE)/locations.h + $(CC) $(CFLAGS) -o $@ nagiostats.c $(LDFLAGS) $(MATHLIBS) $(LIBS) + +$(OBJS): $(SRC_INCLUDE)/locations.h + +clean: + rm -f nagios nagiostats core *.o gmon.out + rm -f *~ *.*~ + +distclean: clean + rm -f perlxsi.c + rm -f Makefile + +devclean: distclean + +install: + $(MAKE) install-basic + $(MAKE) strip-post-install + +install-unstripped: + $(MAKE) install-basic + +install-basic: + $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) + $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) + +strip-post-install: + $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ + $(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@ diff -Naur nagios-3.0.6/common/Makefile.in nagios-3.0.6-optflags/common/Makefile.in --- nagios-3.0.6/common/Makefile.in 2003-04-10 05:46:01.000000000 +0200 +++ nagios-3.0.6-optflags/common/Makefile.in 2008-12-15 11:44:41.000000000 +0100 @@ -9,7 +9,7 @@ SRC_CGI=../cgi CC=@CC@ -CFLAGS=@CFLAGS@ @DEFS@ +CFLAGS=$(RPM_OPT_FLAGS) @CFLAGS@ @DEFS@ LDFLAGS=@LDFLAGS@ @LIBS@ prefix=@prefix@ diff -Naur nagios-3.0.6/contrib/Makefile.in nagios-3.0.6-optflags/contrib/Makefile.in --- nagios-3.0.6/contrib/Makefile.in 2008-05-19 20:01:58.000000000 +0200 +++ nagios-3.0.6-optflags/contrib/Makefile.in 2008-12-15 11:44:41.000000000 +0100 @@ -5,7 +5,7 @@ ############################### CC=@CC@ -CFLAGS=@CFLAGS@ @DEFS@ +CFLAGS=$(RPM_OPT_FLAGS) @CFLAGS@ @DEFS@ LDFLAGS=@LDFLAGS@ @LIBS@ # Source code directories diff -Naur nagios-3.0.6/Makefile.in nagios-3.0.6-optflags/Makefile.in --- nagios-3.0.6/Makefile.in 2008-04-13 20:34:26.000000000 +0200 +++ nagios-3.0.6-optflags/Makefile.in 2008-12-15 11:44:41.000000000 +0100 @@ -16,7 +16,7 @@ SRC_CONTRIB=@srcdir@/contrib CC=@CC@ -CFLAGS=@CFLAGS@ @DEFS@ +CFLAGS=$(RPM_OPT_FLAGS) @CFLAGS@ @DEFS@ LDFLAGS=@LDFLAGS@ @LIBS@ prefix=@prefix@
