Changeset da83f8 for pcp


Ignore:
Timestamp:
Apr 24, 2008, 1:52:02 PM (17 years ago)
Author:
Frederik Heber <heber@…>
Children:
bd7b85
Parents:
054af7
Message:

added --enable-optimization, thrown -g -O specifics out of Makefile.am's

--enable-optimization is added to each configure.ac and is linked with --enable-debug (no debug and optimization at the same time, debug is normally off and -O2 on), implemented via C(XX)FLAGS
Henceforth, -g, -O and -cc=... specifics are thrown out of the Makefile.am's, so that the optimiziation and debugging is streamlined throughout the whole package

Location:
pcp
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • pcp/Makefile.am

    r054af7 rda83f8  
    22SUBDIRS = src doc
    33DIST_SUBDIRS = ${SUBDIRS}
    4 #defaults/pseudopot
    54
    65#include aminclude.am
    … …  
    87pcpdir = ${bindir}
    98
    10 EXTRA_DIST = util/suffix autogen.sh util/visual.cfg util/visual.net
     9EXTRA_DIST = util/suffix pseudopot/ autogen.sh util/visual.cfg util/visual.net
    1110
    1211#configs.tar.gz:

  • pcp/configure.ac

    r054af7 rda83f8  
    7676             
    7777# debugging info
    78 AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Output debugging information (default is no)]),
    79               [enable_debug=$enableval], [enable_debug=maybe])
    80 if test x"$enable_debug" = xyes; then
     78AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Output debugging information, argument is yes or debugging level (default is no).]),
     79              [enable_debug=$enableval], [enable_debug=no])
     80if ! test x"$enable_debug" = xno; then
     81        if test x"${enable_debug}" = xyes; then
     82                CFLAGS="-g3"
     83                CXXFLAGS="-g3"
     84        else
     85                CFLAGS="-g${enable_debug}"
     86                CXXFLAGS="-g${enable_debug}"
     87        fi
    8188  AC_DEFINE(HAVE_DEBUG,1, ["Output debugging info"])
    8289  AC_SUBST(HAVE_DEBUG)
    8390fi
    8491
    85 # add replacement/saturation hydrogen or not
    86 AC_ARG_ENABLE([hydrogen],AS_HELP_STRING([--enable-hydrogen],[Adding saturation hydrogen (default is yes)]),
    87               [enable_hydrogen=$enableval], [enable_hydrogen=yes])
    88 if test x"$enable_hydrogen" = xyes; then
    89   AC_DEFINE(ADDHYDROGEN,1, ["Adding saturation hydrogen"])
    90   AC_SUBST(ADDHYDROGEN)
     92# optimization level
     93AC_ARG_ENABLE([optimization],AS_HELP_STRING([--enable-optimization],[Optimization level of compiler. Argument is yes or debugging level. (default is 2)]),
     94              [enable_optimization=$enableval], [enable_optimization=yes])
     95if test ! x"$enable_optimization" = xno; then
     96        if test x"$enable_debug" = xno; then
     97                if test x"${enable_optimization}" = xyes; then
     98                        CFLAGS="-O2"
     99                        CXXFLAGS="-O2"
     100                else
     101                        CFLAGS="-O${enable_optimization}"
     102                        CXXFLAGS="-O${enable_optimization}"
     103                fi
     104        else
     105                AC_MSG_WARN(["Already specified --enable-debug!"])
     106        fi
    91107fi
    92108

  • pcp/src/Makefile.am

    r054af7 rda83f8  
    44bin_PROGRAMS = pcp
    55pcp_SOURCES = ${SOURCE} ${HEADER}
    6 #pcp_CFLAGS = -cc=gcc  -g -O3 -march=nocona -Wall -DBIGENDIAN=0
    7 pcp_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O3 -march=nocona -Wall -DBIGENDIAN=0
    8 #pcp_CFLAGS = -cc=gcc -g -O -fno-inline -march=nocona -Wall -DBIGENDIAN=0
     6pcp_CFLAGS = -fno-inline -march=nocona -Wall -DBIGENDIAN=0

  • pcp/src/Makefile.in

    r054af7 rda83f8  
    7676DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    7777ACLOCAL = @ACLOCAL@
    78 ADDHYDROGEN = @ADDHYDROGEN@
    7978AMDEP_FALSE = @AMDEP_FALSE@
    8079AMDEP_TRUE = @AMDEP_TRUE@
    … …  
    173172HEADER = data.h defs.h density.h energy.h errors.h excor.h grad.h gramsch.h helpers.h init.h ions.h mergesort2.h myfft.h mymath.h opt.h output.h pcp.h pdbformat.h perturbed.h pseudo.h riemann.h run.h wannier.h
    174173pcp_SOURCES = ${SOURCE} ${HEADER}
    175 #pcp_CFLAGS = -cc=gcc  -g -O3 -march=nocona -Wall -DBIGENDIAN=0
    176 pcp_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O3 -march=nocona -Wall -DBIGENDIAN=0
     174pcp_CFLAGS = -fno-inline -march=nocona -Wall -DBIGENDIAN=0
    177175all: all-am
    178176
    … …  
    738736        uninstall-am uninstall-binPROGRAMS uninstall-info-am
    739737
    740 #pcp_CFLAGS = -cc=gcc -g -O -fno-inline -march=nocona -Wall -DBIGENDIAN=0
    741738# Tell versions [3.59,3.63) of GNU make to not export all variables.
    742739# Otherwise a system limit (for SysV at least) may be exceeded.

  • pcp/src/helpers.h

    r054af7 rda83f8  
    3131extern void /*@exits@*/ debug(struct Problem *P, const char *output);
    3232  //__attribute__ ((__return__));
    33 #define debug(err, data) debug_in((err), (data), __FILE__, __LINE__)
     33#define debug(problemstruct, data) debug_in((problemstruct), (data), __FILE__, __LINE__)
    3434
    3535extern void /*@exits@*/ debug_in(struct Problem *P, const char *output,
Note: See TracChangeset for help on using the changeset viewer.