Hey Dmitry, Thanks. It's applied on both branches. Do you think its necessary to release a 0.4.7 b/c of this patch?
Al On Mon, 2007-10-15 at 14:57 +0700, Dmitry Frolov wrote: > Hello! > > This little patch moves "-I" compiler flags from CFLAGS to CPPFLAGS, > which seems more appropriate and also fixes compilation of FreeBSD port > by avoiding conflict with installed headers. > > Cleanly applies to CVS HEAD and Release-0_4_0_branch. > > Index: ipmidetect/src/ipmidetect/Makefile.am > =================================================================== > RCS file: /sources/freeipmi/freeipmi/ipmidetect/src/ipmidetect/Makefile.am,v > retrieving revision 1.1 > diff -u -d -p -u -r1.1 Makefile.am > --- ipmidetect/src/ipmidetect/Makefile.am 2 Mar 2007 00:56:26 -0000 > 1.1 > +++ ipmidetect/src/ipmidetect/Makefile.am 15 Oct 2007 07:34:01 -0000 > @@ -10,7 +10,7 @@ noinst_HEADERS = error.h > > ipmidetect_SOURCES = ipmidetect.c error.c > > -ipmidetect_CFLAGS = -I $(srcdir)/../libipmidetect \ > +ipmidetect_CPPFLAGS = -I $(srcdir)/../libipmidetect \ > -I $(srcdir)/../../../common/src > > ipmidetect_LDADD = ../../../common/src/libllnlcommon.la \ > Index: ipmidetect/src/ipmidetectd/Makefile.am > =================================================================== > RCS file: /sources/freeipmi/freeipmi/ipmidetect/src/ipmidetectd/Makefile.am,v > retrieving revision 1.1 > diff -u -d -p -u -r1.1 Makefile.am > --- ipmidetect/src/ipmidetectd/Makefile.am 2 Mar 2007 00:56:26 -0000 > 1.1 > +++ ipmidetect/src/ipmidetectd/Makefile.am 15 Oct 2007 07:34:01 -0000 > @@ -24,7 +24,7 @@ ipmidetectd_SOURCES = \ > ipmidetectd_config.c \ > ipmidetectd_loop.c > > -ipmidetectd_CFLAGS = \ > +ipmidetectd_CPPFLAGS = \ > -I$(srcdir)/../../../common/src \ > -I$(srcdir)/../../../libfreeipmi/include > > Index: ipmidetect/src/libipmidetect/Makefile.am > =================================================================== > RCS file: > /sources/freeipmi/freeipmi/ipmidetect/src/libipmidetect/Makefile.am,v > retrieving revision 1.1 > diff -u -d -p -u -r1.1 Makefile.am > --- ipmidetect/src/libipmidetect/Makefile.am 2 Mar 2007 00:56:26 -0000 > 1.1 > +++ ipmidetect/src/libipmidetect/Makefile.am 15 Oct 2007 07:34:01 -0000 > @@ -16,7 +16,7 @@ lib_LTLIBRARIES = libipmidetect.la > libipmidetect_la_SOURCES = \ > ipmidetect.c > > -libipmidetect_la_CFLAGS = \ > +libipmidetect_la_CPPFLAGS = \ > -I$(srcdir)/../../../common/src > > libipmidetect_la_LIBADD = \ > Index: ipmimonitoring/src/ipmimonitoring/Makefile.am > =================================================================== > RCS file: > /sources/freeipmi/freeipmi/ipmimonitoring/src/ipmimonitoring/Makefile.am,v > retrieving revision 1.4 > diff -u -d -p -u -r1.4 Makefile.am > --- ipmimonitoring/src/ipmimonitoring/Makefile.am 2 Aug 2007 20:50:14 > -0000 1.4 > +++ ipmimonitoring/src/ipmimonitoring/Makefile.am 15 Oct 2007 07:34:01 > -0000 > @@ -13,7 +13,7 @@ ipmimonitoring_SOURCES = \ > ipmimonitoring.c \ > error.c > > -ipmimonitoring_CFLAGS = \ > +ipmimonitoring_CPPFLAGS = \ > -I$(srcdir)/../libipmimonitoring \ > -I$(srcdir)/../../../common/src \ > -I$(srcdir)/../../../libfreeipmi/include > Index: ipmimonitoring/src/libipmimonitoring/Makefile.am > =================================================================== > RCS file: > /sources/freeipmi/freeipmi/ipmimonitoring/src/libipmimonitoring/Makefile.am,v > retrieving revision 1.4 > diff -u -d -p -u -r1.4 Makefile.am > --- ipmimonitoring/src/libipmimonitoring/Makefile.am 16 Mar 2007 12:05:50 > -0000 1.4 > +++ ipmimonitoring/src/libipmimonitoring/Makefile.am 15 Oct 2007 07:34:01 > -0000 > @@ -26,14 +26,11 @@ libipmimonitoring_la_SOURCES = \ > ipmi_monitoring_sensor_reading.c \ > ipmi_monitoring_sensor_config.c > > -libipmimonitoring_la_CFLAGS = \ > +libipmimonitoring_la_CPPFLAGS = -D_REENTRANT \ > -I$(srcdir)/../../../common/src \ > -I$(srcdir)/../../../libfreeipmi/include \ > -I$(srcdir)/../libipmisdrcache > > -libipmimonitoring_la_CPPFLAGS = \ > - -D_REENTRANT > - > libipmimonitoring_la_LDFLAGS = \ > -version-info @LIBIPMIMONITORING_VERSION_INFO@ \ > $(OTHER_FLAGS) > Index: ipmimonitoring/src/libipmisdrcache/Makefile.am > =================================================================== > RCS file: > /sources/freeipmi/freeipmi/ipmimonitoring/src/libipmisdrcache/Makefile.am,v > retrieving revision 1.3 > diff -u -d -p -u -r1.3 Makefile.am > --- ipmimonitoring/src/libipmisdrcache/Makefile.am 14 Feb 2007 19:36:39 > -0000 1.3 > +++ ipmimonitoring/src/libipmisdrcache/Makefile.am 15 Oct 2007 07:34:01 > -0000 > @@ -10,11 +10,9 @@ noinst_LTLIBRARIES = libipmisdrcache.la > > libipmisdrcache_la_SOURCES = ipmi_sdr_cache.c > > -libipmisdrcache_la_CFLAGS = -I$(srcdir)/../../../common/src \ > +libipmisdrcache_la_CPPFLAGS = -D_REENTRANT \ > + -I$(srcdir)/../../../common/src \ > -I$(srcdir)/../../../libfreeipmi/include > > -libipmisdrcache_la_CPPFLAGS = \ > - -D_REENTRANT > - > force-dependency-check: > > > > _______________________________________________ > Freeipmi-devel mailing list > [email protected] > http://lists.gnu.org/mailman/listinfo/freeipmi-devel -- Albert Chu [EMAIL PROTECTED] 925-422-5311 Computer Scientist High Performance Systems Division Lawrence Livermore National Laboratory _______________________________________________ Freeipmi-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/freeipmi-devel
