Nagios Support Forum

This is a multi-part message in MIME format.
--------------040607000304070109090405
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

I've finally had some time to clean up the base/Makefile.in.

Here's what it does, with short rationale.

CFLAGS settings changed a bit;
@DEFS@ and -DNSCORE must always be included, so + them on last.
There's no real reason to include the entire set of CFLAGS_WARN
explicitly in the flags overriding the default, since the effect is
identical if they're applied later.

$(SRC_XDATA) shouldn't be explicitly mentioned for each buildrule (poor
normalization).

nagios.o should be among the objects, so that linking and compiling can
be two separate stages also in the rules. This also allows for faster
re-compilation when modifications are done.

Targets that doesn't produce output files should be marked as .PHONY.

Apply with patch -p1 < nagios-base-Makefile.diff.

--
Andreas Ericsson [email protected]
OP5 AB www.op5.se
Lead Developer

--------------040607000304070109090405
Content-Type: text/plain;
name="nagios-base-Makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="nagios-base-Makefile.diff"

diff -urN ../nagios.orig/base/Makefile.in ./base/Makefile.in
--- ../nagios.orig/base/Makefile.in 2004-12-10 15:38:08.000000000 +0100
+++ ./base/Makefile.in 2005-05-22 17:43:36.000000000 +0200
@@ -11,16 +11,19 @@
SRC_XDATA=../xdata

CC=@CC@
-CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE
+CFLAGS=@CFLAGS@

# Compiler flags for optimization (overrides default)
-#CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCORE
+#CFLAGS=-O3 -fomit-frame-pointer -momit-leaf-frame-pointer -funroll-loops

-# Compiler flags for optimization (complements default)
+# Compiler flags for optimization (complements default or optimize flags)
#CFLAGS_WARN=-Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs
#CFLAGS_DEBUG=-ggdb3 -g3
#CFLAGS+=$(CFLAGS_WARN) $(CFLAGS_DEBUG)

+# These must be present, so make sure they are
+CFLAGS+=@DEFS@ -DNSCORE
+
LDFLAGS=@LDFLAGS@
LIBS=@LIBS@

@@ -51,18 +54,18 @@
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@
+XSDC=$(SRC_XDATA)/@XSDC@
+XSDH=$(SRC_XDATA)/@XSDH@
+XCDC=$(SRC_XDATA)/@XCDC@
+XCDH=$(SRC_XDATA)/@XCDH@
+XRDC=$(SRC_XDATA)/@XRDC@
+XRDH=$(SRC_XDATA)/@XRDH@
+XODC=$(SRC_XDATA)/@XODC@
+XODH=$(SRC_XDATA)/@XODH@
+XPDC=$(SRC_XDATA)/@XPDC@
+XPDH=$(SRC_XDATA)/@XPDH@
+XDDC=$(SRC_XDATA)/@XDDC@
+XDDH=$(SRC_XDATA)/@XDDH@

# Extra base code
BASEEXTRALIBS=@BASEEXTRALIBS@
@@ -73,49 +76,37 @@
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 xdownti

...[email truncated]...


This post was automatically imported from historical nagios-devel mailing list archives
Original poster: [email protected]