Changeset 276a00 in git


Ignore:
Timestamp:
Jan 9, 2014, 4:54:11 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
daa32a5a2021be314b3ff210d21af2a2d4cf5fe1
Parents:
beed2eef2f5fae68a9e7e7ed0f4a9e7710549aa9
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-09 16:54:11+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-09 16:57:25+01:00
Message:
Use @SINGULAR_CFLAGS@ instead of '-D(SING|OM)_NDEBUG' in lib*-config/*.pc  (according to --enable-debug/--disable-optimization!)

chg: also some minor BS cleanup
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • Singular.pc.in

    rbeed2e r276a00  
    1212# Conflicts:
    1313
    14 Cflags: -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG
     14Cflags: -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@
    1515Libs: -L${libdir} -lSingular  @USEPPROCSDYNAMICLD@
    1616# Libs.private:

  • factory/factory.pc.in

    rbeed2e r276a00  
    1212# Conflicts:
    1313
    14 Cflags: -I${includedir} -DOM_NDEBUG -DSING_NDEBUG @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@
     14Cflags: -I${includedir} @SINGULAR_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@
    1515Libs: -L${libdir} -l@PACKAGE@ @FLINT_LIBS@ @NTL_LIBS@ @GMP_LIBS@
    1616# Libs.private:

  • factory/libfac/Makefile.am

    rbeed2e r276a00  
    11ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 # If Want_Debug
    4 #   Lib_G=Libfac_G.La
    5 # Else
    6 #   Lib_G=
    7 # Endif
    8 
    93noinst_LTLIBRARIES=libfac.la
    10 # ${LIB_G}
    11 
    12 #CXXTEMPLFLAGS =-ftrapv  ## -fno-implicit-templates
    13 
    14 #libfac_la_CFLAGS   = -O3 -fomit-frame-pointer ${PIPE}
    15 #libfac_g_la_CFLAGS = ${PIPE}
    16 
    17 #libfac_la_CXXFLAGS   = -O3 -fomit-frame-pointer ${PIPE} ${CXXTEMPLFLAGS}
    18 #libfac_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
    19 # -fdiagnostics-show-option
    204
    215AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${builddir} -I${srcdir}/.. -I${builddir}/.. -I${srcdir}/../include  -I${builddir}/../include -I${srcdir}/factor  -I${builddir}/factor -I${srcdir}/charset -I${builddir}/charset ${GMP_CFLAGS} ${NTL_CFLAGS} 
    22 
    23 # libfac_la_CPPFLAGS   = ${AM_CPPFLAGS} -DSING_NDEBUG -DOM_NDEBUG
    24 # libfac_la_CPPFLAGS = ${AM_CPPFLAGS}
    25 
    26 # libfac_la_LDFLAGS    = -release ${PACKAGE_VERSION}
    276
    287FACTORSRC1 =    factor/SqrFree.cc factor/Factor.cc \
    … …  
    5029
    5130libfac_la_SOURCES   = $(SOURCES)
    52 # libfac_g_la_SOURCES = $(SOURCES)
    53 
    5431
    5532libfac_includedir=$(includedir)/factory/libfac
    56 
    5733libfac_include_HEADERS   = libfac.h
    5834
    … …  
    6137      charset/tests bin \
    6238      ChangeLog 00README
    63 
    64 
    65 

  • libpolys/libpolys-config.in

    rbeed2e r276a00  
    8989
    9090    --cflags)
    91         ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG"
    92         ;;
    93 
    94     --cflagswithdebug)
    95         ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
     91        ${ECHOn} " -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ "
    9692        ;;
    9793
    9894    --libs)
    99         ${ECHOn} " -L${libdir}/singular/libpolys.la"
     95        ${ECHOn} " -L${libdir} -lpolys"
    10096        ;;
    10197

  • libpolys/libpolys.pc.in

    rbeed2e r276a00  
    1212# Conflicts:
    1313
    14 Cflags: -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG
     14Cflags: -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FACTORY_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@
    1515Libs: -L${libdir} -lpolys @FACTORY_LIBS@ @NTL_LIBS@ @GMP_LIBS@
    16 Libs.private: -lcoeffs -lreporter -lmisc
     16# Libs.private:
    1717

  • libpolys/polys/Makefile.am

    rbeed2e r276a00  
    2222
    2323libpolys_LTLIBRARIES = libpolys.la
    24 libpolysdir = $(libdir)/singular
     24libpolysdir = $(libdir)
    2525
    2626SOURCES = \

  • libsingular-config.in

    rbeed2e r276a00  
    8989
    9090    --cflags)
    91         ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ -DSING_NDEBUG -DOM_NDEBUG"
    92         ;;
    93 
    94     --cflagswithdebug)
    95         ${ECHOn} " -I${includedir} -I${includedir}/singular @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@"
     91        ${ECHOn} " -I${includedir} -I${includedir}/singular @SINGULAR_CFLAGS@ @FACTORY_CFLAGS@ @FLINT_CFLAGS@ @NTL_CFLAGS@ @GMP_CFLAGS@ "
    9692        ;;
    9793
    9894    --libs)
    99         ${ECHOn} " ${libdir}/libSingular.la @USEPPROCSDYNAMICLD@"
     95        ${ECHOn} " -L${libdir} -lSingular @USEPPROCSDYNAMICLD@"
    10096        ;;
    10197

  • m4/flags.m4

    rbeed2e r276a00  
    7373   AC_MSG_ERROR([Please note that you have enabled the debug and optimization flags, which may not work well together (try \`--disable-optimizationflags')!])
    7474  fi
    75 # else
    76 #  AC_DEFINE([OM_NDEBUG],1,"Disable OM Debug")
    77 #  AC_DEFINE([SING_NDEBUG],1,"Disable Debug")
     75  SINGULAR_CFLAGS=""
     76 else
     77  SINGULAR_CFLAGS="-DSING_NDEBUG -DOM_NDEBUG"
     78  # for now let '-DSING_NDEBUG -DOM_NDEBUG' be here...
     79  AC_DEFINE([OM_NDEBUG],1,"Disable OM Debug")
     80  AC_DEFINE([SING_NDEBUG],1,"Disable Singular Debug")
    7881 fi
     82 
     83 AC_DEFINE_UNQUOTED([SINGULAR_CFLAGS],"$SINGULAR_CFLAGS",[SINGULAR_CFLAGS])
     84 AC_SUBST(SINGULAR_CFLAGS)
    7985
    8086# SING_SHOW_FLAGS([checking flags....])
    … …  
    108114 ## for clang: -Wunneeded-internal-declaration
    109115
    110  if test "x${ENABLE_OPTIMIZATION}" != xno; then 
    111   OPTFLAGS="-DHAVE_CONFIG_H -DOM_NDEBUG -DSING_NDEBUG -O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops"
     116 if test "x${ENABLE_OPTIMIZATION}" != xno; then
     117  OPTFLAGS="-DHAVE_CONFIG_H -O3 -Wno-unused-function -Wno-trigraphs -Wno-unused-parameter -Wno-unused-variable -fomit-frame-pointer -fwrapv -fvisibility=default -finline-functions -fno-exceptions -fno-rtti -fno-threadsafe-statics -fno-enforce-eh-specs -fconserve-space -funroll-loops"
    112118  #  -O3 - crashes gcc???!!! 
    113119  # -fpermissive 
    … …  
    139145# SING_SHOW_FLAGS([before PROG_C_CC])
    140146
     147
    141148AC_PROG_CC
    142149AC_PROG_CXX

  • omalloc/Makefile.am

    rbeed2e r276a00  
    3737nodist_libomalloc_include_HEADERS = omConfig.h mylimits.h omTables.h
    3838
    39 ### NOTE: "_g" (debug) means full library
    40 ### libomalloc_la_CPPFLAGS= -DOM_ALLOC_INTERNAL  -DOM_NDEBUG
    41 
    4239libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL
    4340

  • resources/resources.pc.in

    rbeed2e r276a00  
    1212# Conflicts:
    1313
    14 Cflags: -I${includedir} -DSING_NDEBUG
     14Cflags: -I${includedir} @SINGULAR_CFLAGS@
    1515Libs: -L${libdir} -l@PACKAGE@
    1616# Libs.private:

  • xalloc/Makefile.am

    rbeed2e r276a00  
    77
    88# libomallocdir = $(libdir)/
     9
    910# libomalloc_includedir=$(includedir)/omalloc
    10 #libomalloc_include_HEADERS = omalloc.h
     11# libomalloc_include_HEADERS = omalloc.h
    1112
    1213SOURCES = dummy.c omalloc.h
    … …  
    1617libomalloc_la_SOURCES  =$(SOURCES)
    1718
    18 ### libomalloc_la_LDFLAGS  = -release ${PACKAGE_VERSION}
     19libomalloc_la_LDFLAGS  = -release ${PACKAGE_VERSION}
    1920
    20 # libomalloc_la_CPPFLAGS  += ${AM_CPPFLAGS}  -DSING_NDEBUG -DOM_NDEBUG
    21 # libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
    2221
Note: See TracChangeset for help on using the changeset viewer.