Changeset 0ff203 in git


Ignore:
Timestamp:
Sep 29, 2011, 10:08:30 AM (13 years ago)
Author:
Volker Braun <vbraun.name@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
61a05011eb6c7b5ce19f060abf2ce176727b964e
Parents:
5d18675b2ded38546a705f58d4e8b9d631357571
git-author:
Volker Braun <vbraun.name@gmail.com>2011-09-29 10:08:30+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:47+01:00
Message:
stop automake from flattening install subdirectories for headers
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    r5d18675 r0ff203  
    161161
    162162libSingular_includedir = ${includedir}/singular/Singular/
    163 libSingular_include_HEADERS = $(SingularHEADERS)
     163nobase_libSingular_include_HEADERS = $(SingularHEADERS)
    164164
    165165if ENABLE_FACTORY
  • Singular/libsingular.h

    r5d18675 r0ff203  
    33
    44#include <math.h> // Why this?
    5 /*
    6 // TODO: correct these includes!!!
    7 #include <singular/mod2.h>
    8 #include <singular/structs.h>
    9 #include <singular/polys.h>
    10 #include <singular/longrat.h>
    11 #include <singular/numbers.h>
    12 #include <singular/febase.h>
    13 #include <singular/ring.h>
     5
     6#include <misc/auxiliary.h>
     7#include <kernel/structs.h>
     8#include <kernel/polys.h>
     9#include <kernel/longrat.h>
     10#include <coeffs/numbers.h>
     11#include <kernel/febase.h>
     12#include <polys/monomials/ring.h>
    1413#include <omalloc/omalloc.h>
    15 #include <singular/clapsing.h>
    16 #include <singular/maps.h>
    17 #include <singular/fast_maps.h>
    18 #include <singular/kutil.h>
    19 #include <singular/kstd1.h>
    20 #include <singular/tgb.h>
    21 #include <singular/sparsmat.h>
    22 #include <singular/rintegers.h>
    23 #include <singular/rmodulo2m.h>
    24 #include <singular/rmodulon.h>
     14#include <polys/clapsing.h>
     15#include <polys/monomials/maps.h>
     16#include <kernel/kutil.h>
     17#include <kernel/kstd1.h>
     18#include <kernel/tgb.h>
     19#include <polys/sparsmat.h>
    2520
    26 #include <singular/subexpr.h>
    27 #include <singular/tok.h>
    28 #include <singular/grammar.h>
    29 #include <singular/ipid.h>
    30 #include <singular/ipshell.h>
    31 #include <singular/attrib.h>
    32 #include <singular/options.h>
    33 */
     21#include <Singular/subexpr.h>
     22#include <Singular/tok.h>
     23#include <Singular/grammar.h>
     24#include <Singular/ipid.h>
     25#include <Singular/ipshell.h>
     26#include <Singular/attrib.h>
     27#include <misc/options.h>
    3428
    3529void siInit(char *);
  • factory/Makefile.am

    r5d18675 r0ff203  
    109109                cf_globals.h \
    110110                cf_gcd_smallp.h \
    111                 cf_gmp.h \
    112111                cf_hnf.h \
    113112                cf_irred.h \
     
    146145                fieldGCD.h \
    147146                ffops.h \
    148                 templates/ftmpl_list.h \
    149                 templates/ftmpl_matrix.h \
    150147                gf_tabutil.h \
    151148                gfops.h \
     
    172169
    173170libfactory_includedir=$(includedir)/factory
    174 libfactory_include_HEADERS = cplusplus.h factory.h factoryconf.h
    175 
     171nobase_libfactory_include_HEADERS = \
     172                cplusplus.h factory.h factoryconf.h \
     173                cf_gmp.h $(templateincl)
    176174
    177175# Documentation
     
    276274
    277275EXTRA_DIST =    test_install.cc \
    278                 $(templatesrc) $(templateincl) $(hdrtemplsrc) \
     276                $(templatesrc) $(hdrtemplsrc) \
    279277                $(ftestsrc) $(ftestincl) $(ftestm4src) $(ftestdistfiles) \
    280278                doxygen.cfg factory.cfg \
  • kernel/Makefile.am

    r5d18675 r0ff203  
    4848    f5c.cc ratgring.cc shiftgb.cc gfan.cc \
    4949    linearAlgebra.cc nc.cc preimage.cc \
    50     fegetopt.c
     50    fegetopt.c mod2.h
    5151
    5252libkernel_a_SOURCES   = $(SOURCES)
     
    6767        fegetopt.h \
    6868        ratgring.h shiftgb.h nc.h \
    69         gfan.h preimage.h mod2.h longrat.h timer.h kInline.h modulop.h fast_mult.h \
     69        gfan.h preimage.h longrat.h timer.h kInline.h modulop.h fast_mult.h \
    7070        digitech.h tgb.h ringgb.h tgbgauss.h tgb_internal.h \
    7171        linearAlgebra.h page.h
  • libpolys/coeffs/Makefile.am

    r5d18675 r0ff203  
    1212# -fdiagnostics-show-option
    1313
    14 libcoeffs_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
    15 libcoeffs_g_a_CPPFLAGS = -DHAVE_CONFIG_H
     14libcoeffs_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
     15libcoeffs_g_a_CPPFLAGS =
    1616
    1717
     
    5858
    5959
    60 # testr: libcoeffs.a
    61 # testg: libcoeffs_g.a
    62 # gftables
    63 
    6460testr_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    6561testg_CFLAGS = ${PIPE}
     
    7470testg_CPPFLAGS =
    7571
    76 #gftables: ${top_srcdir}/../factory/gftables
    77 #       ln -snf ${top_srcdir}/../factory/gftables ${builddir}
     72
  • libpolys/polys/Makefile.am

    r5d18675 r0ff203  
    4444LIBPOLYSHEADERS = monomials/ring.h monomials/monomials.h \
    4545        nc/nc.h nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
    46         operations/pShallowCopyDelete.h operations/p_Mult_q.h \
    47         templates/p_Procs.h mod_raw.h \
     46        operations/pShallowCopyDelete.h \
     47        templates/p_Procs.h templates/p_MemAdd.h templates/p_MemCmp.h \
    4848        monomials/p_polys.h monomials/maps.h prCopy.h \
    4949        kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
    5050        sparsmat.h clapsing.h clapconv.h coeffrings.h \
    51         ext_fields/algext.h ext_fields/transext.h
     51        ext_fields/algext.h ext_fields/transext.h mod_raw.h 
    5252
    5353EXTRA_DIST = \
    5454        prCopy.pl prCopyTemplate.cc \
    55         templates/p_Procs_Lib.cc templates/p_MemCmp.h templates/p_MemCopy.h templates/p_Numbers.h \
     55        templates/p_Procs_Lib.cc templates/p_MemCopy.h templates/p_Numbers.h \
    5656        templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
    5757        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 \
     58        templates/p_ShallowCopyDelete__T.cc templates/p_Mult_nn__T.cc \
    5959        templates/pp_Mult_nn__T.cc templates/pp_Mult_mm__T.cc templates/p_Mult_mm__T.cc \
    6060        templates/pp_Mult_Coeff_mm_DivSelect__T.cc templates/pp_Mult_nn__T.cc \
    6161        templates/pp_Mult_Coeff_mm_DivSelectMult__T.cc \
    62         templates/pp_Mult_mm_Noether__T.cc \
     62        templates/pp_Mult_mm_Noether__T.cc operations/p_Mult_q.h \
    6363        templates/p_kBucketSetLm__T.cc templates/p_Minus_mm_Mult_qq__T.cc \
    6464        templates/p_Merge_q__T.cc templates/p_Add_q__T.cc templates/p_Neg__T.cc
     
    124124libpolys_includedir=$(includedir)/singular/polys
    125125
    126 libpolys_include_HEADERS = $(LIBPOLYSHEADERS)
     126nobase_libpolys_include_HEADERS = $(LIBPOLYSHEADERS)
    127127
    128128libpolys_a_SOURCES = ${SOURCES}
Note: See TracChangeset for help on using the changeset viewer.