Changeset 55b6460 in git


Ignore:
Timestamp:
Jan 8, 2014, 11:42:18 AM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
93410849245a328140884aeb7351c43bcca67b4d
Parents:
2f67434b2d4065786f3221f09116ce1ae996c410
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 11:42:18+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-01-08 15:56:28+01:00
Message:
Moved -DHAVE_CONFIG from Makefile.am: AM_CPPFLAGS into global compiler flags
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    r2f67434 r55b6460  
    33GIT_VERSION := $(shell $(top_srcdir)/git-version-gen $(top_srcdir)/.tarball-git-version)
    44
    5 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS) -DHAVE_CONFIG_H  -DGIT_VERSION='"$(GIT_VERSION)"'
     5AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) $(FLINT_CFLAGS)   -DGIT_VERSION='"$(GIT_VERSION)"'
    66
    77if HAVE_GFANLIB

  • factory/Makefile.am

    r2f67434 r55b6460  
    44SUBDIRS=$(PACKAGES)
    55
    6 AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include $(FLINT_CFLAGS) ${GMP_CFLAGS} ${NTL_CFLAGS} ${OMALLOC_CFLAGS} -DHAVE_CONFIG_H
     6AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include $(FLINT_CFLAGS) ${GMP_CFLAGS} ${NTL_CFLAGS} ${OMALLOC_CFLAGS}
    77
    88lib_LTLIBRARIES = libfactory.la

  • factory/libfac/Makefile.am

    r2f67434 r55b6460  
    1919# -fdiagnostics-show-option
    2020
    21 AM_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}  -DHAVE_CONFIG_H
     21AM_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} 
    2222
    23 # libfac_la_CPPFLAGS   = ${AM_CPPFLAGS} -DSING_NDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    24 # libfac_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     23# libfac_la_CPPFLAGS   = ${AM_CPPFLAGS} -DSING_NDEBUG -DOM_NDEBUG
     24# libfac_la_CPPFLAGS = ${AM_CPPFLAGS}
    2525
    2626# libfac_la_LDFLAGS    = -release ${PACKAGE_VERSION}

  • gfanlib/Makefile.am

    r2f67434 r55b6460  
    77libgfandir = $(libdir)
    88
    9 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL -DHAVE_CONFIG_H
     9AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DGMPRATIONAL
    1010
    1111SOURCES  = gfanlib_zcone.cpp gfanlib_symmetry.cpp gfanlib_symmetriccomplex.cpp gfanlib_polyhedralfan.cpp gfanlib_zfan.cpp gfanlib_polymakefile.cpp

  • kernel/Makefile.am

    r2f67434 r55b6460  
    55libkerneldir = $(libdir)/singular
    66
    7 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS)  -DHAVE_CONFIG_H
     7AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS) 
    88
    99SOURCES = polys.cc febase.cc feread.cc \

  • libpolys/coeffs/Makefile.am

    r2f67434 r55b6460  
    11ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}  -DHAVE_CONFIG_H
     3AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS} 
    44
    55libcoeffs_LTLIBRARIES = libcoeffs.la

  • libpolys/misc/Makefile.am

    r2f67434 r55b6460  
    11ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..  -DHAVE_CONFIG_H
     3AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. 
    44
    55libmisc_LTLIBRARIES = libmisc.la

  • libpolys/polys/Makefile.am

    r2f67434 r55b6460  
    66NODEBUGDEFS     =
    77
    8 AM_CPPFLAGS     = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS}  -DHAVE_CONFIG_H
     8AM_CPPFLAGS     = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS} 
    99
    1010

  • libpolys/reporter/Makefile.am

    r2f67434 r55b6460  
    11ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..  -DHAVE_CONFIG_H
     3AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. 
    44
    55libreporter_LTLIBRARIES = libreporter.la

  • libpolys/tests/Makefile.am

    r2f67434 r55b6460  
    11ACLOCAL_AMFLAGS = -I ../../m4
    22
    3 AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS} -DHAVE_CONFIG_H
     3AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
    44
    55TESTS = simple_test \

  • m4/flags.m4

    r2f67434 r55b6460  
    109109
    110110 if test "x${ENABLE_OPTIMIZATION}" != xno; then
    111   OPTFLAGS="-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"
     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"
    112112  #  -O3 - crashes gcc???!!! 
    113113  # -fpermissive 

  • numeric/Makefile.am

    r2f67434 r55b6460  
    55libnumericdir = $(libdir)/singular
    66
    7 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS}  -DHAVE_CONFIG_H
     7AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} -I${top_srcdir}/factory/include -I${top_builddir}/factory/include ${FACTORY_CFLAGS} ${NTL_CFLAGS} 
    88
    99SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc

  • omalloc/Makefile.am

    r2f67434 r55b6460  
    2727EXTRA_DIST = omalloc.c omtTestAlloc.c omtTest.h omMmap.c
    2828
    29 AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/..  -DHAVE_CONFIG_H
     29AM_CPPFLAGS =-I${top_srcdir}/.. -I${top_builddir}/.. 
    3030
    3131libomalloc_la_SOURCES=$(SOURCES) $(noinst_HEADERS)
    … …  
    3838
    3939### NOTE: "_g" (debug) means full library
    40 ### libomalloc_la_CPPFLAGS= -DOM_ALLOC_INTERNAL -DHAVE_CONFIG_H -DOM_NDEBUG
     40### libomalloc_la_CPPFLAGS= -DOM_ALLOC_INTERNAL -DOM_NDEBUG
    4141
    4242libomalloc_la_CPPFLAGS  = ${AM_CPPFLAGS} -DOM_ALLOC_INTERNAL

  • resources/Makefile.am

    r2f67434 r55b6460  
    66
    77
    8 AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DHAVE_CONFIG_H
     8AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir}
    99
    1010

  • xalloc/Makefile.am

    r2f67434 r55b6460  
    1212SOURCES = dummy.c omalloc.h
    1313
    14 AM_CPPFLAGS = -I${srcdir} -DHAVE_CONFIG_H
     14AM_CPPFLAGS = -I${srcdir}
    1515
    1616libomalloc_la_SOURCES  =$(SOURCES)
    … …  
    1818### libomalloc_la_LDFLAGS  = -release ${PACKAGE_VERSION}
    1919
    20 # libomalloc_la_CPPFLAGS  += ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DSING_NDEBUG -DOM_NDEBUG
     20# libomalloc_la_CPPFLAGS  += ${AM_CPPFLAGS} -DSING_NDEBUG -DOM_NDEBUG
    2121# libomalloc_la_CPPFLAGS = ${AM_CPPFLAGS}
    2222
Note: See TracChangeset for help on using the changeset viewer.