Changeset adb2ed in git


Ignore:
Timestamp:
May 11, 2011, 5:43:14 PM (12 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')
Children:
e432a0567954893b1c33d7a9943e9921184cefef
Parents:
45e35b62b6f04314377865c4eb8cad555c42f584
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-11 17:43:14+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:04+01:00
Message:
Fixes to allow out-of-tree compilation

- Add $(top_builddir)/.. to INCLUDES in various places
- Set CFLAGS, etc. for tests in omalloc/configure.ac to find omalloc-header-files
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • factory/Makefile.am

    r45e35b radb2ed  
    11CXXTEMPLFLAGS      = -fno-implicit-templates --no-exceptions
    22
    3 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
     3INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
    44
    55lib_LIBRARIES = libfactory.a libfactory_g.a
    … …  
    257257                bin/folding.el bin/fold-docu.el \
    258258                bin/makeheader bin/gen-readcf
     259
     260CLEANFILES = factory.h factoryconf.h readcf.cc

  • libpolys/coeffs/Makefile.am

    r45e35b radb2ed  
    2020        mpr_complex.h mpr_global.h
    2121
    22 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
     22INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
    2323
    2424SOURCES = \

  • libpolys/misc/Makefile.am

    r45e35b radb2ed  
    1313libmisc_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir}
     15INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
    1616
    1717SOURCES  = intvec.cc options.c

  • libpolys/polys/Makefile.am

    r45e35b radb2ed  
    1313AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1414
    15 INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} -I${includedir} ${GMP_CFLAGS}
     15INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
    1616AM_LDFLAGS      = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/../omalloc -L${builddir}
    1717

  • libpolys/reporter/Makefile.am

    r45e35b radb2ed  
    1313libreporter_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir}
     15INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
    1616
    1717SOURCES  = dError.c reporter.cc

  • libpolys/resources/Makefile.am

    r45e35b radb2ed  
    1313libresources_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir}
     15INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/..
    1616
    1717SOURCES = feFopen.cc feResource.cc

  • libpolys/tests/Makefile.am

    r45e35b radb2ed  
    1212AM_CPPFLAGS = -DHAVE_CONFIG_H
    1313
    14 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${srcdir} ${GMP_CFLAGS}  ${NTL_CFLAGS}
     14INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS}  ${NTL_CFLAGS}
    1515
    1616

  • omalloc/configure.ac

    r45e35b radb2ed  
    143143fi
    144144
     145dnl Set compiler, linker flags so that we can work with omalloc
     146BACKUP_CFLAGS=$CFLAGS
     147BACKUP_CXXFLAGS=$CXXFLAGS
     148BACKUP_LDFLAGS=$LDFLAGS
     149CFLAGS="$CFLAGS -I$srcdir"
     150CXXFLAGS="$CXXFLAGS -I$srcdir"
     151
    145152dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    146153dnl figure out page size of the system
    … …  
    167174  AC_DEFINE_UNQUOTED(SIZEOF_SYSTEM_PAGE, $ac_cv_pagesize, "Page-size of the build-system")
    168175else
    169 AC_MSG_ERROR(need sytem page to be of size 4096 or 8192, but is $ac_cv_pagesize)
     176AC_MSG_ERROR([need sytem page to be of size 4096 or 8192, but is $ac_cv_pagesize])
    170177fi
    171178
    … …  
    304311fi
    305312
     313dnl Restore user-specified CFLAGS, CXXFLAGS, LIBS
     314
     315CFLAGS=$BACKUP_CFLAGS
     316CXXFLAGS=$BACKUP_CXXFLAGS
     317LDFLAGS=$BACKUP_LDFLAGS
     318
    306319dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
    307320dnl check whether valloc is provided and that it works
Note: See TracChangeset for help on using the changeset viewer.