Changeset c2eb2e in git for libpolys


Ignore:
Timestamp:
Sep 28, 2011, 6:22:34 PM (13 years ago)
Author:
Volker Braun <vbraun.name@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
a0acbc558a10c931620702cf1f67288945e04b23
Parents:
83db8d3000b4078b3fa1965f387d1f5099e5426e
git-author:
Volker Braun <vbraun.name@gmail.com>2011-09-28 18:22:34+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:44+01:00
Message:
make install and make distcheck work now
Location:
libpolys
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • libpolys/Makefile.am

    r83db8d rc2eb2e  
    22
    33bin_SCRIPTS = libpolys-config
    4 
    5 libpoly_libincludedir = $(libdir)/libpolys/include
    6 nodist_libpoly_libinclude_HEADERS = config.h
    7 
    84
    95PACKAGES=misc reporter resources coeffs polys tests

  • libpolys/coeffs/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES = libcoeffs.a libcoeffs_g.a
     1libcoeffs_LIBRARIES = libcoeffs.a libcoeffs_g.a
     2libcoeffsdir = $(libdir)/singular
     3
    24CXXTEMPLFLAGS =  --no-exceptions
    35## -fno-implicit-templates
    … …  
    2931libcoeffs_g_a_SOURCES = $(SOURCES)
    3032
    31 ## include_HEADERS = coeffs.h numbers.h
    32 
    33 libcoeffs_a_includedir  =$(includedir)/libpolys/coeffs
    34 libcoeffs_g_a_includedir=$(includedir)/libpolys/coeffs
    35 
    36 COEFFSHEADERS  = coeffs.h numbers.h si_gmp.h
    37 libcoeffs_a_include_HEADERS   = $(COEFFSHEADERS)
    38 libcoeffs_g_a_include_HEADERS = $(COEFFSHEADERS)
    39 
     33libcoeffs_includedir  =$(includedir)/singular/coeffs
     34libcoeffs_include_HEADERS = coeffs.h numbers.h si_gmp.h
    4035
    4136if ENABLE_FACTORY

  • libpolys/misc/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libmisc.a libmisc_g.a
     1libmisc_LIBRARIES = libmisc.a libmisc_g.a
     2libmiscdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libmisc_g_a_SOURCES = $(SOURCES)
    2021
    21 libmisc_a_includedir  =$(includedir)/libpolys/misc
    22 libmisc_g_a_includedir=$(includedir)/libpolys/misc
    23 
    24 ###????
    25 #libmisc_a_libdir  =${libdir}/libpolys
    26 #libmisc_g_a_libdir=${libdir}/libpolys
    27 
    28 MISCHEADERS  = auxiliary.h mylimits.h options.h intvec.h int64vec.h
    29 libmisc_a_include_HEADERS   = $(MISCHEADERS)
    30 libmisc_g_a_include_HEADERS = $(MISCHEADERS)
     22libmisc_includedir = $(includedir)/singular/misc
     23libmisc_include_HEADERS = auxiliary.h mylimits.h options.h intvec.h int64vec.h
    3124
    3225
    3326
     27

  • libpolys/polys/Makefile.am

    r83db8d rc2eb2e  
    11CXXTEMPLFLAGS   =  --no-exceptions ## -fno-implicit-templates
    2 
    32
    43DEBUGCXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long
    … …  
    2827endif
    2928
    30 prCopy.inc: prCopy.pl
    31         perl ${srcdir}/prCopy.pl >  prCopy.inc
    32 
    33 lib_LIBRARIES=libpolys.a libpolys_g.a
    34 
    35 libpolys_a_includedir=$(includedir)/libpolys/polys
    36 libpolys_g_a_includedir=$(includedir)/libpolys/polys
     29libpolys_LIBRARIES = libpolys.a libpolys_g.a
     30libpolysdir = $(libdir)/singular
    3731
    3832SOURCES = \
    3933        monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
    40         operations/pShallowCopyDelete.cc operations/p_Mult_q.cc operations/p_Mult_q.h \
    41         templates/p_Procs_Lib.cc templates/p_MemCmp.h templates/p_MemCopy.h templates/p_Numbers.h \
    42         templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
    43         templates/p_Procs_Impl.h \
     34        operations/pShallowCopyDelete.cc operations/p_Mult_q.cc \
    4435        nc/sca.cc nc/summator.cc nc/ncSAFormula.cc nc/ncSACache.cc nc/ncSAMult.cc \
    4536        pDebug.cc polys0.cc prCopy.cc prCopyMacros.h \
    4637        kbuckets.cc sbuckets.cc weight.cc weight0.c simpleideals.cc matpol.cc \
    4738        sparsmat.cc \
    48         ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC}  mod_raw.cc \
    49         ext_fields/algext.cc ext_fields/algext.h \
    50         ext_fields/transext.cc clapsing.cc clapconv.cc \
     39        ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} mod_raw.cc \
     40        ext_fields/algext.cc ext_fields/transext.cc \
     41        clapsing.cc clapconv.cc \
    5142        nc/old.gring.cc
    52 
    53 #       OLD?:
    54 
    55 BUILT_SOURCES = prCopy.inc templates/p_Procs.inc
    56 
    57 noinst_HEADERS =
    5843
    5944LIBPOLYSHEADERS = monomials/ring.h monomials/monomials.h \
    6045        nc/nc.h nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
    61         operations/pShallowCopyDelete.h \
    62         templates/p_MemAdd.h \
     46        operations/pShallowCopyDelete.h operations/p_Mult_q.h \
    6347        templates/p_Procs.h mod_raw.h \
    6448        monomials/p_polys.h monomials/maps.h prCopy.h \
    6549        kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
    66         sparsmat.h clapsing.h clapconv.h
     50        sparsmat.h clapsing.h clapconv.h coeffrings.h \
     51        ext_fields/algext.h ext_fields/transext.h
    6752
    68 ### nobase_include_HEADERS = $(LIBPOLYSHEADERS)
    69 
    70 
     53EXTRA_DIST = \
     54        prCopy.pl prCopyTemplate.cc \
     55        templates/p_Procs_Lib.cc templates/p_MemCmp.h templates/p_MemCopy.h templates/p_Numbers.h \
     56        templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
     57        templates/p_Procs_Impl.h templates/p_Delete__T.cc templates/p_Copy__T.cc \
     58        templates/p_ShallowCopyDelete__T.cc templates/p_MemAdd.h templates/p_Mult_nn__T.cc \
     59        templates/pp_Mult_nn__T.cc templates/pp_Mult_mm__T.cc templates/p_Mult_mm__T.cc \
     60        templates/pp_Mult_Coeff_mm_DivSelect__T.cc templates/pp_Mult_nn__T.cc \
     61        templates/pp_Mult_Coeff_mm_DivSelectMult__T.cc \
     62        templates/pp_Mult_mm_Noether__T.cc \
     63        templates/p_kBucketSetLm__T.cc templates/p_Minus_mm_Mult_qq__T.cc \
     64        templates/p_Merge_q__T.cc templates/p_Add_q__T.cc templates/p_Neg__T.cc
    7165
    7266P_PROCS_CPPFLAGS_COMMON = -DDYNAMIC_VERSION
    … …  
    121115
    122116
    123 moduledir = $(libdir)/libpolys/MOD/
     117moduledir = $(libdir)/singular/MOD/
    124118
    125119if ENABLE_P_PROCS_DYNAMIC
    … …  
    128122endif
    129123
     124libpolys_includedir=$(includedir)/singular/polys
    130125
    131 nobase_libpolys_a_include_HEADERS = $(LIBPOLYSHEADERS)
    132 nobase_libpolys_g_a_include_HEADERS = $(LIBPOLYSHEADERS)
    133 
     126libpolys_include_HEADERS = $(LIBPOLYSHEADERS)
    134127
    135128libpolys_a_SOURCES = ${SOURCES}
    136129libpolys_g_a_SOURCES = ${SOURCES}
    137130
    138 ## libpolys_adir = $(libdir)/libpolys
    139 ## libpolys_g_adir = $(libdir)/libpolys
    140 
    141131EXTRA_libpolys_a_SOURCES = templates/p_Procs_Static.cc templates/p_Procs_Dynamic.cc
    142132
    143 EXTRA_PROGRAMS = templates/p_Procs_Generate
    144 templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
     133libpolys_g_a_CXXFLAGS = ${DEBUGCXXFLAGS}
     134libpolys_a_CPPFLAGS = ${NODEBUGDEFS}
    145135
    146136
    147 ###test_LDADD   = libcoeffs.a -lresources -lreporter -lgmp -lomalloc
     137#################################################
     138# autogenerated sources
    148139
     140BUILT_SOURCES = prCopy.inc templates/p_Procs.inc
     141
     142noinst_PROGRAMS = templates/p_Procs_Generate
     143templates_p_Procs_Generate_SOURCES = templates/p_Procs_Generate.cc
    149144templates_p_Procs_Generate_CFLAGS   = ${NODEBUGCFLAGS}
    150145templates_p_Procs_Generate_CXXFLAGS = ${NODEBUGCXXFLAGS}
    … …  
    156151        ${builddir}/templates/p_Procs_Generate > ${builddir}/templates/p_Procs.inc
    157152
    158 libpolys_g_a_CXXFLAGS = ${DEBUGCXXFLAGS}
    159 libpolys_a_CPPFLAGS = ${NODEBUGDEFS}
     153prCopy.inc: prCopy.pl
     154        perl ${srcdir}/prCopy.pl >  prCopy.inc
    160155
    161 #  -fdiagnostics-show-option
     156CLEANFILES = $(BUILT_SOURCES)
    162157
    163 dynamic_modules: ${module_LTLIBRARIES}
    164 

  • libpolys/reporter/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libreporter.a libreporter_g.a
     1libreporter_LIBRARIES=libreporter.a libreporter_g.a
     2libreporterdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libreporter_g_a_SOURCES = $(SOURCES)
    2021
    21 libreporter_a_includedir  =$(includedir)/libpolys/reporter
    22 libreporter_g_a_includedir=$(includedir)/libpolys/reporter
     22libreporter_includedir  =$(includedir)/singular/reporter
    2323
    24 REPORTERHEADERS = reporter.h
    25 libreporter_a_include_HEADERS   = $(REPORTERHEADERS)
    26 libreporter_g_a_include_HEADERS = $(REPORTERHEADERS)
     24libreporter_include_HEADERS   = reporter.h
    2725
    2826

  • libpolys/resources/Makefile.am

    r83db8d rc2eb2e  
    1 lib_LIBRARIES=libresources.a libresources_g.a
     1libresources_LIBRARIES=libresources.a libresources_g.a
     2libresourcesdir = $(libdir)/singular
    23
    34CXXTEMPLFLAGS      =  --no-exceptions ## -fno-implicit-templates
    … …  
    1920libresources_g_a_SOURCES = $(SOURCES)
    2021
    21 libresources_a_includedir  =$(includedir)/libpolys/resources
    22 libresources_g_a_includedir=$(includedir)/libpolys/resources
     22libresources_includedir  =$(includedir)/singular/resources
    2323
    24 RESOURCESHEADERS  = feFopen.h feResource.h
    25 libresources_a_include_HEADERS   = $(RESOURCESHEADERS)
    26 libresources_g_a_include_HEADERS = $(RESOURCESHEADERS)
     24libresources_include_HEADERS   = feFopen.h feResource.h
    2725
    2826

  • libpolys/tests/Makefile.am

    r83db8d rc2eb2e  
    2323
    2424simple_test_SOURCES = simple_test_runner.cpp
    25 coeffs_test_SOURCES = coeffs_test_runner.cpp gftables
    26 polys_test_SOURCES = polys_test_runner.cpp gftables MOD
    27 rings_test_SOURCES = rings_test_runner.cpp gftables MOD
    28 
    29 
     25coeffs_test_SOURCES = coeffs_test_runner.cpp
     26polys_test_SOURCES = polys_test_runner.cpp
     27rings_test_SOURCES = rings_test_runner.cpp
    3028
    3129polys_test_LDFLAGS = ${AM_LDFLAGS} ${USEPPROCSDYNAMICLDFLAGS}
    … …  
    3735
    3836
    39 BUILT_SOURCES = $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)
     37BUILT_SOURCES = gftables MOD \
     38        $(simple_test_SOURCES) $(coeffs_test_SOURCES) $(rings_test_SOURCES) $(polys_test_SOURCES)
    4039
    4140gftables: ${top_srcdir}/../factory/gftables
    … …  
    5958
    6059CLEANFILES = $(BUILT_SOURCES)
     60
     61EXTRA_DIST = simple_test.h coeffs_test.h polys_test.h rings_test.h common.h             \
     62    cxxtest/Descriptions.h       cxxtest/ParenPrinter.h      cxxtest/TestListener.h     \
     63    cxxtest/DummyDescriptions.h  cxxtest/QtGui.h             cxxtest/TestRunner.h       \
     64    cxxtest/ErrorFormatter.h     cxxtest/RealDescriptions.h  cxxtest/TestSuite.h        \
     65    cxxtest/ErrorPrinter.h       cxxtest/SelfTest.h          cxxtest/TestTracker.h      \
     66    cxxtest/Flags.h              cxxtest/StdHeaders.h        cxxtest/ValueTraits.h      \
     67    cxxtest/GlobalFixture.h      cxxtest/StdioFilePrinter.h  cxxtest/Win32Gui.h         \
     68    cxxtest/Gui.h                cxxtest/StdioPrinter.h      cxxtest/X11Gui.h           \
     69    cxxtest/LinkedList.h         cxxtest/StdValueTraits.h    cxxtest/YesNoRunner.h      \
     70    cxxtest/Mock.h               cxxtest/TeeListener.h                                  \
     71    cxxtest/Descriptions.cpp     cxxtest/LinkedList.cpp      cxxtest/TestSuite.cpp      \
     72    cxxtest/DummyDescriptions.cpp cxxtest/RealDescriptions.cpp  cxxtest/TestTracker.cpp \
     73    cxxtest/GlobalFixture.cpp    cxxtest/Root.cpp            cxxtest/ValueTraits.cpp
Note: See TracChangeset for help on using the changeset viewer.