Changeset 18601

Timestamp:

09/17/16 16:32:31 (8 years ago)

Author:

tbretz

Message:

Updated the handling of the flags to better split between pre-processor and compiler

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (4 diffs)

trunk/FACT++/Makefile.am

@@ -13 +13 @@
 AM_CPPFLAGS = -Idim/dim -Ipal -Ierfa/src \
    $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
+   $(SVN_REVISION)
+
+AM_CXXFLAGS = $(ROOTCXXFLAGS) \
    -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
-   $(SVN_REVISION)
-
-AM_CXXFLAGS = $(AM_CPPFLAGS) \
    -Woverloaded-virtual -Wnon-virtual-dtor -Wshadow
 

trunk/FACT++/configure.ac

@@ -264 +264 @@
 
 # Now we can safely add the compiler option for your prefered standard
-CXXFLAGS+=" -std=c++0x"
+CXXFLAGS+=" -DTTTT -std=c++0x -DXXX "
 
 #AC_CHECK_HEADERS(
@@ -322 +322 @@
 then
 
-   ROOTCPPFLAGS=$ROOTCFLAGS" "$ROOTAUXCFLAGS
+   ROOTCPPFLAGS=$ROOTCFLAGS
+   ROOTCXXFLAGS=$ROOTAUXCFLAGS
    ROOTLDFLAGS="-L"$ROOTLIBDIR
 
@@ -332 +333 @@
 
    AC_SUBST(ROOTCPPFLAGS)
+   AC_SUBST(ROOTCXXFLAGS)
    AC_SUBST(ROOTLDFLAGS)
 fi
@@ -468 +470 @@
    AC_MSG_NOTICE([ ROOTCINT      = $ROOTCINT])
    AC_MSG_NOTICE([ ROOTCPPFLAGS  = $ROOTCPPFLAGS])
-   AC_MSG_NOTICE([ ROOTLDFLAGS   = $ROOTLDFLAGS])
+   AC_MSG_NOTICE([ ROOTCXXFLAGS  = $ROOTCXXFLAGS])
    AC_MSG_NOTICE()
 ],[])