[ofa-general] [PATCH 5/5] [v2.0] dapl build: add correct CFLAGS, set non-debug build by default for v2

[Arlin Davis]

dapl build: add correct CFLAGS, set non-debug build by default for v2

Signed-off by: Arlin Davis ardavis at ichips.intel.com
---
 Makefile.am  |   10 +++++-----
 dapl.spec.in |    5 +----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dfab5e8..4cb339f 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,9 +22,9 @@ XPROGRAMS_SCM =
 endif
 
 if DEBUG
-DBGFLAGS = -ggdb -DDAPL_DBG
+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DDAPL_DBG
 else
-DBGFLAGS = -g
+AM_CFLAGS = -g -Wall -D_GNU_SOURCE
 endif
 
 datlibdir = $(libdir)
@@ -35,17 +35,17 @@ datlib_LTLIBRARIES = dat/udat/libdat2.la
 dapllibofa_LTLIBRARIES = dapl/udapl/libdaplofa.la
 daplliboscm_LTLIBRARIES = dapl/udapl/libdaploscm.la
 
-dat_udat_libdat2_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
+dat_udat_libdat2_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
 				-I$(srcdir)/dat/include/ -I$(srcdir)/dat/udat/ \
 				-I$(srcdir)/dat/udat/linux -I$(srcdir)/dat/common/ 
 
-dapl_udapl_libdaplofa_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
+dapl_udapl_libdaplofa_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
 				-DOPENIB -DCQ_WAIT_OBJECT \
 				-I$(srcdir)/dat/include/ -I$(srcdir)/dapl/include/ \
 				-I$(srcdir)/dapl/common -I$(srcdir)/dapl/udapl/linux \
 				-I$(srcdir)/dapl/openib_cma 
 		
-dapl_udapl_libdaploscm_la_CFLAGS = -Wall $(DBGFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
+dapl_udapl_libdaploscm_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE $(OSFLAGS) $(XFLAGS) \
                                 -DOPENIB -DCQ_WAIT_OBJECT \
                                 -I$(srcdir)/dat/include/ -I$(srcdir)/dapl/include/ \
                                 -I$(srcdir)/dapl/common -I$(srcdir)/dapl/udapl/linux \
diff --git a/dapl.spec.in b/dapl.spec.in
index e18f19a..4cb8860 100644
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -75,7 +75,7 @@ Useful test suites to validate uDAPL library API's.
 %setup -q
 
 %build
-%configure --enable-debug --enable-ext-type=ib 
+%configure --enable-ext-type=ib 
 make %{?_smp_mflags}
 
 %install
@@ -132,9 +132,6 @@ fi
 %{_mandir}/man5/*.5*
 
 %changelog
-* Thu Aug 21 2008 Arlin Davis <ardavis at ichips.intel.com> - 2.0.12
-- DAT/DAPL Version 2.0.12 Release 1, OFED 1.4 RC 
-
 * Sun Jul 20 2008 Arlin Davis <ardavis at ichips.intel.com> - 2.0.11
 - DAT/DAPL Version 2.0.11 Release 1, IB UD extensions in SCM provider 
 
-- 
1.5.2.5