Changeset da83f8


Ignore:
Timestamp:
Apr 24, 2008, 1:52:02 PM (18 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

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r054af7 rda83f8  
    11#ACLOCAL_AMFLAGS = -I m4
    22SUBDIRS = pcp util molecuilder
    3 #<F2>util/molecuilder
    43DIST_SUBDIRS = ${SUBDIRS}
    5 #defaults/pseudopot
    64
    75#include aminclude.am
    … …  
    97pcpdir = ${bindir}
    108
    11 EXTRA_DIST = util/suffix autogen.sh configs.tar.gz pseudopots.tar.gz util/visual.cfg util/visual.net
     9EXTRA_DIST = util/suffix autogen.sh pseudopot util/visual.cfg util/visual.net
    1210
    1311configs.tar.gz:

  • molecuilder/configure.ac

    r054af7 rda83f8  
    1616
    1717
    18 AC_FUNC_MALLOC
    19 AC_FUNC_REALLOC
    20 AC_CHECK_FUNCS([floor pow sqrt strchr])
    21 
    2218# Checks for libraries.
    2319AC_CHECK_LIB(m, sqrt, ,AC_MSG_ERROR([compatible libc math library not found]))
    … …  
    2723AC_CHECK_HEADERS([sys/time.h])
    2824AC_HEADER_STDBOOL
     25
     26AC_FUNC_MALLOC
     27AC_FUNC_REALLOC
     28AC_CHECK_FUNCS([floor pow sqrt strchr])
    2929
    3030# Checks for typedefs, structures, and compiler characteristics.
    … …  
    4141
    4242# debugging info
    43 AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Output debugging information (default is no)]),
    44               [enable_debug=$enableval], [enable_debug=maybe])
    45 if test x"$enable_debug" = xyes; then
     43AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Output debugging information, argument is yes or debugging level (default is no).]),
     44              [enable_debug=$enableval], [enable_debug=no])
     45if ! test x"$enable_debug" = xno; then
     46        if test x"${enable_debug}" = xyes; then
     47                CFLAGS="-g3"
     48                CXXFLAGS="-g3"
     49        else
     50                CFLAGS="-g${enable_debug}"
     51                CXXFLAGS="-g${enable_debug}"
     52        fi
    4653  AC_DEFINE(HAVE_DEBUG,1, ["Output debugging info"])
    4754  AC_SUBST(HAVE_DEBUG)
     55fi
     56
     57# optimization level
     58AC_ARG_ENABLE([optimization],AS_HELP_STRING([--enable-optimization],[Optimization level of compiler. Argument is yes or debugging level. (default is 2)]),
     59              [enable_optimization=$enableval], [enable_optimization=yes])
     60if test ! x"$enable_optimization" = xno; then
     61        if test x"$enable_debug" = xno; then
     62                if test x"${enable_optimization}" = xyes; then
     63                        CFLAGS="-O2"
     64                        CXXFLAGS="-O2"
     65                else
     66                        CFLAGS="-O${enable_optimization}"
     67                        CXXFLAGS="-O${enable_optimization}"
     68                fi
     69        else
     70                AC_MSG_WARN(["Already specified --enable-debug!"])
     71        fi
    4872fi
    4973

  • molecuilder/src/Makefile.am

    r054af7 rda83f8  
    88joiner_SOURCES = joiner.cpp parser.cpp helpers.cpp verbose.cpp helpers.hpp parser.hpp
    99analyzer_SOURCES = analyzer.cpp parser.cpp datacreator.cpp helpers.cpp verbose.cpp helpers.hpp parser.hpp datacreator.hpp
    10 #molecuilder_CXXFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    11 molecuilder_CXXFLAGS = -g3 -march=nocona -Wall -DBIGENDIAN=0
    12 joiner_CXXFLAGS = -g3 -march=nocona -Wall -DBIGENDIAN=0
    13 analyzer_CXXFLAGS = -g3 -march=nocona -Wall -DBIGENDIAN=0
     10molecuilder_CXXFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     11joiner_CXXFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     12analyzer_CXXFLAGS = -march=nocona -Wall -DBIGENDIAN=0
    1413
    1514#EXTRA_DIST = ${molecuilder_DATA}

  • molecuilder/src/helpers.cpp

    r054af7 rda83f8  
    2323};
    2424
     25/** Output of a debug message to stderr.
     26 * \param *P Problem at hand, points to ParallelSimulationData#me
     27 * \param output output string
     28 */
     29#ifdef HAVE_DEBUG
     30void debug_in(const char *output, const char *file, const int line) {
     31  if (output) fprintf(stderr,"DEBUG: in %s at line %i: %s\n", file, line, output);
     32}
     33#else
     34void debug_in(const char *output, const char *file, const int line) {}  // print nothing
     35#endif
    2536
    2637/** Wrapper for allocating'ing a memory range with *output if it fails.

  • molecuilder/src/helpers.hpp

    r054af7 rda83f8  
    2222
    2323/********************************************** helpful functions *********************************/
     24
     25// taken out of TREMOLO
     26/*@-namechecks@*/
     27#ifndef __GNUC__
     28# undef __attribute__
     29# define __attribute__(x)
     30#endif
     31/*@=namechecks@*/
     32
     33/* Behandelt aufgetretene Fehler. error ist der Fehlertyp(enum Errors)
     34   void *SpecialData ist ein untypisierter Zeiger auf Spezielle Daten zur Fehlerbehandlung.
     35   Man koennte auch noch einen Zeiger auf eine Funktion uebergeben */
     36extern void /*@exits@*/ debug(const char *output);
     37  //__attribute__ ((__return__));
     38#define debug(data) debug_in((data), __FILE__, __LINE__)
     39
     40extern void /*@exits@*/ debug_in(const char *output,
     41    const char *file, const int line);
     42  //__attribute__ ((__return__));
    2443
    2544double ask_value(const char *text);

  • molecuilder/src/molecules.cpp

    r054af7 rda83f8  
    18711871  MoleculeLeafClass *Subgraphs = NULL;      // list of subgraphs from DFS analysis
    18721872
     1873#ifdef ADDHYDROGEN
     1874  debug("Test");
     1875  cout << Verbose(0) << "I will treat hydrogen special and saturate dangling bonds with it." << endl;
     1876#else
     1877  debug("Test2");
     1878  cout << Verbose(0) << "Hydrogen is treated just like the rest of the lot." << endl;
     1879#endif
     1880 
    18731881  CreateListOfBondsPerAtom(out);
    18741882

  • 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,

  • util/Makefile.am

    r054af7 rda83f8  
    3636bin_SCRIPTS = ${scripts}
    3737
    38 average_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    39 CreateGaAs_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    40 CreateH2_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    41 GetPdb_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    42 ReadSrcIon_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    43 stochastik_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    44 NanoCreator_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
    45 VibrAlyzer_CFLAGS = -cc=/opt/packages/gcc-4.0.2/bin/gcc  -g -O -march=nocona -Wall -DBIGENDIAN=0
     38average_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     39CreateGaAs_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     40CreateH2_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     41GetPdb_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     42ReadSrcIon_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     43stochastik_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     44NanoCreator_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
     45VibrAlyzer_CFLAGS = -march=nocona -Wall -DBIGENDIAN=0
    4646

  • util/configure.ac

    r054af7 rda83f8  
    2626AC_TYPE_SIZE_T
    2727
     28# debugging info
     29AC_ARG_ENABLE([debug],AS_HELP_STRING([--enable-debug],[Output debugging information, argument is yes or debugging level (default is no).]),
     30              [enable_debug=$enableval], [enable_debug=no])
     31if ! test x"$enable_debug" = xno; then
     32        if test x"${enable_debug}" = xyes; then
     33                CFLAGS="-g3"
     34                CXXFLAGS="-g3"
     35        else
     36                CFLAGS="-g${enable_debug}"
     37                CXXFLAGS="-g${enable_debug}"
     38        fi
     39  AC_DEFINE(HAVE_DEBUG,1, ["Output debugging info"])
     40  AC_SUBST(HAVE_DEBUG)
     41fi
     42
     43# optimization level
     44AC_ARG_ENABLE([optimization],AS_HELP_STRING([--enable-optimization],[Optimization level of compiler. Argument is yes or debugging level. (default is 2)]),
     45              [enable_optimization=$enableval], [enable_optimization=yes])
     46if test ! x"$enable_optimization" = xno; then
     47        if test x"$enable_debug" = xno; then
     48                if test x"${enable_optimization}" = xyes; then
     49                        CFLAGS="-O2"
     50                        CXXFLAGS="-O2"
     51                else
     52                        CFLAGS="-O${enable_optimization}"
     53                        CXXFLAGS="-O${enable_optimization}"
     54                fi
     55        else
     56                AC_MSG_WARN(["Already specified --enable-debug!"])
     57        fi
     58fi
     59
    2860# Checks for library functions.
    2961AC_FUNC_MALLOC
Note: See TracChangeset for help on using the changeset viewer.