Changeset b7d64b in git


Ignore:
Timestamp:
Nov 18, 2011, 7:40:58 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
5acf7dca6b6eb7a36ab400997b08fd8c6a42a9fc
Parents:
ee668eff445bb4cf7e96d94673c39f627a30d232
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-11-18 19:40:58+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00
Message:
adaptation/fix due to SW build system

FIX: don't distribute generated system-dependent headers
FIX: adaptation to FACTORY/include/factory/*

TODO: combine -I${abs_top_srcdir}/../factory/include -I${abs_top_builddir}/../factory/include into ${FACTORY_CFLAGS}
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • Singular/Makefile.am

    ree668e rb7d64b  
    1414CXXTEMPLFLAGS = --no-exceptions ## -fno-implicit-templates
    1515
    16 INCLUDES = -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) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
     16INCLUDES = -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)
    1717
    1818########################### libSingular* #########################

  • factory/Makefile.am

    ree668e rb7d64b  
    55CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
    66
    7 AM_CPPFLAGS = -Iinclude -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS}
     7AM_CPPFLAGS = -I${builddir}/include -I${srcdir}/include ${GMP_CFLAGS} ${NTL_CFLAGS}
    88
    99lib_LTLIBRARIES = libfactory.la libfactory_g.la
    … …  
    303303BUILT_SOURCES = cplusplus.h factory.h factoryconf.h
    304304
    305 CLEANFILES = $(BUILT_SOURCES)
     305CLEANFILES = $(BUILT_SOURCES) include/factory/factory.h include/factory/factoryconf.h include/factory/cplusplus.h
    306306
    307307

  • factory/include/factory/Makefile.am

    ree668e rb7d64b  
    99
    1010nobase_libfactory_include_HEADERS = \
    11     cf_gmp.h $(templateincl)
     11              cf_gmp.h ${templateincl}

  • kernel/Makefile.am

    ree668e rb7d64b  
    2626libkernel_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    2727
    28 INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
     28INCLUDES = -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)
    2929
    3030SOURCES = polys.cc febase.cc feread.cc \

  • libpolys/coeffs/Makefile.am

    ree668e rb7d64b  
    2121#       mpr_complex.h mpr_global.h
    2222
    23 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
     23
     24INCLUDES = -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}
    2425
    2526SOURCES = \

  • libpolys/polys/Makefile.am

    ree668e rb7d64b  
    1010AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1111
    12 INCLUDES        = -I${abs_top_srcdir} -I${abs_top_srcdir}/.. -I${abs_top_builddir} -I${abs_top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
     12INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${includedir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${FACTORY_CFLAGS} ${GMP_CFLAGS}
    1313AM_LDFLAGS      = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/resources -L${abs_top_builddir}/../omalloc -L${abs_builddir}
    1414

  • libpolys/tests/Makefile.am

    ree668e rb7d64b  
    99
    1010
    11 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${FACTORY_CFLAGS} ${GMP_CFLAGS} ${NTL_CFLAGS}
     11INCLUDES = -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}
    1212
    1313TESTS = simple_test \

  • numeric/Makefile.am

    ree668e rb7d64b  
    1414libnumeric_g_la_CPPFLAGS = -DHAVE_CONFIG_H
    1515
    16 INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/libpolys -I${top_builddir}/libpolys ${GMP_CFLAGS} ${FACTORY_CFLAGS} ${NTL_CFLAGS}
     16INCLUDES = -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}
    1717
    1818SOURCES  = mpr_base.cc mpr_inout.cc mpr_numeric.cc
Note: See TracChangeset for help on using the changeset viewer.