Changeset 0ff203 in git

Timestamp:

Sep 29, 2011, 10:08:30 AM (12 years ago)

Author:

Volker Braun <vbraun.name@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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:

• Singular/Makefile.am (modified) (1 diff)
• Singular/libsingular.h (modified) (1 diff)
• factory/Makefile.am (modified) (4 diffs)
• kernel/Makefile.am (modified) (2 diffs)
• libpolys/coeffs/Makefile.am (modified) (3 diffs)
• libpolys/polys/Makefile.am (modified) (2 diffs)

Singular/Makefile.am

@@ -161 +161 @@
 
 libSingular_includedir = ${includedir}/singular/Singular/
-libSingular_include_HEADERS = $(SingularHEADERS)
+nobase_libSingular_include_HEADERS = $(SingularHEADERS)
 
 if ENABLE_FACTORY

Singular/libsingular.h

@@ -3 +3 @@
 
 #include <math.h> // Why this?
-/*
-// TODO: correct these includes!!!
-#include <singular/mod2.h>
-#include <singular/structs.h>
-#include <singular/polys.h>
-#include <singular/longrat.h>
-#include <singular/numbers.h>
-#include <singular/febase.h>
-#include <singular/ring.h>
+
+#include <misc/auxiliary.h>
+#include <kernel/structs.h>
+#include <kernel/polys.h>
+#include <kernel/longrat.h>
+#include <coeffs/numbers.h>
+#include <kernel/febase.h>
+#include <polys/monomials/ring.h>
 #include <omalloc/omalloc.h>
-#include <singular/clapsing.h>
-#include <singular/maps.h>
-#include <singular/fast_maps.h>
-#include <singular/kutil.h>
-#include <singular/kstd1.h>
-#include <singular/tgb.h>
-#include <singular/sparsmat.h>
-#include <singular/rintegers.h>
-#include <singular/rmodulo2m.h>
-#include <singular/rmodulon.h>
+#include <polys/clapsing.h>
+#include <polys/monomials/maps.h>
+#include <kernel/kutil.h>
+#include <kernel/kstd1.h>
+#include <kernel/tgb.h>
+#include <polys/sparsmat.h>
 
-#include <singular/subexpr.h>
-#include <singular/tok.h>
-#include <singular/grammar.h>
-#include <singular/ipid.h>
-#include <singular/ipshell.h>
-#include <singular/attrib.h>
-#include <singular/options.h>
-*/
+#include <Singular/subexpr.h>
+#include <Singular/tok.h>
+#include <Singular/grammar.h>
+#include <Singular/ipid.h>
+#include <Singular/ipshell.h>
+#include <Singular/attrib.h>
+#include <misc/options.h>
 
 void siInit(char *);

factory/Makefile.am

@@ -109 +109 @@
                 cf_globals.h \
                 cf_gcd_smallp.h \
-                cf_gmp.h \
                 cf_hnf.h \
                 cf_irred.h \
@@ -146 +145 @@
                 fieldGCD.h \
                 ffops.h \
-                templates/ftmpl_list.h \
-                templates/ftmpl_matrix.h \
                 gf_tabutil.h \
                 gfops.h \
@@ -172 +169 @@
 
 libfactory_includedir=$(includedir)/factory
-libfactory_include_HEADERS = cplusplus.h factory.h factoryconf.h
-
+nobase_libfactory_include_HEADERS = \
+                cplusplus.h factory.h factoryconf.h \
+                cf_gmp.h $(templateincl)
 
 # Documentation
@@ -276 +274 @@
 
 EXTRA_DIST =    test_install.cc \
-                $(templatesrc) $(templateincl) $(hdrtemplsrc) \
+                $(templatesrc) $(hdrtemplsrc) \
                 $(ftestsrc) $(ftestincl) $(ftestm4src) $(ftestdistfiles) \
                 doxygen.cfg factory.cfg \

kernel/Makefile.am

@@ -48 +48 @@
     f5c.cc ratgring.cc shiftgb.cc gfan.cc \
     linearAlgebra.cc nc.cc preimage.cc \
-    fegetopt.c
+    fegetopt.c mod2.h 
 
 libkernel_a_SOURCES   = $(SOURCES)
@@ -67 +67 @@
         fegetopt.h \
         ratgring.h shiftgb.h nc.h \
-        gfan.h preimage.h mod2.h longrat.h timer.h kInline.h modulop.h fast_mult.h \
+        gfan.h preimage.h longrat.h timer.h kInline.h modulop.h fast_mult.h \
         digitech.h tgb.h ringgb.h tgbgauss.h tgb_internal.h \
         linearAlgebra.h page.h

libpolys/coeffs/Makefile.am

@@ -12 +12 @@
 # -fdiagnostics-show-option 
 
-libcoeffs_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG -DHAVE_CONFIG_H
-libcoeffs_g_a_CPPFLAGS = -DHAVE_CONFIG_H
+libcoeffs_a_CPPFLAGS   = -DNDEBUG -DOM_NDEBUG
+libcoeffs_g_a_CPPFLAGS =
 
 
@@ -58 +58 @@
 
 
-# testr: libcoeffs.a
-# testg: libcoeffs_g.a
-# gftables 
-
 testr_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
 testg_CFLAGS = ${PIPE}
@@ -74 +70 @@
 testg_CPPFLAGS =
 
-#gftables: ${top_srcdir}/../factory/gftables
-#       ln -snf ${top_srcdir}/../factory/gftables ${builddir}
+

libpolys/polys/Makefile.am

@@ -44 +44 @@
 LIBPOLYSHEADERS = monomials/ring.h monomials/monomials.h \
         nc/nc.h nc/sca.h nc/summator.h nc/ncSAFormula.h nc/ncSACache.h nc/ncSAMult.h \
-        operations/pShallowCopyDelete.h operations/p_Mult_q.h \
-        templates/p_Procs.h mod_raw.h \
+        operations/pShallowCopyDelete.h \
+        templates/p_Procs.h templates/p_MemAdd.h templates/p_MemCmp.h \
         monomials/p_polys.h monomials/maps.h prCopy.h \
         kbuckets.h sbuckets.h simpleideals.h weight.h matpol.h \
         sparsmat.h clapsing.h clapconv.h coeffrings.h \
-        ext_fields/algext.h ext_fields/transext.h 
+        ext_fields/algext.h ext_fields/transext.h mod_raw.h  
 
 EXTRA_DIST = \
         prCopy.pl prCopyTemplate.cc \
-        templates/p_Procs_Lib.cc templates/p_MemCmp.h templates/p_MemCopy.h templates/p_Numbers.h \
+        templates/p_Procs_Lib.cc templates/p_MemCopy.h templates/p_Numbers.h \
         templates/p_Procs_Set.h templates/p_Procs_Static.h templates/p_Procs_Dynamic.h \
         templates/p_Procs_Impl.h templates/p_Delete__T.cc templates/p_Copy__T.cc \
-        templates/p_ShallowCopyDelete__T.cc templates/p_MemAdd.h templates/p_Mult_nn__T.cc \
+        templates/p_ShallowCopyDelete__T.cc templates/p_Mult_nn__T.cc \
         templates/pp_Mult_nn__T.cc templates/pp_Mult_mm__T.cc templates/p_Mult_mm__T.cc \
         templates/pp_Mult_Coeff_mm_DivSelect__T.cc templates/pp_Mult_nn__T.cc \
         templates/pp_Mult_Coeff_mm_DivSelectMult__T.cc \
-        templates/pp_Mult_mm_Noether__T.cc \
+        templates/pp_Mult_mm_Noether__T.cc operations/p_Mult_q.h \
         templates/p_kBucketSetLm__T.cc templates/p_Minus_mm_Mult_qq__T.cc \
         templates/p_Merge_q__T.cc templates/p_Add_q__T.cc templates/p_Neg__T.cc
@@ -124 +124 @@
 libpolys_includedir=$(includedir)/singular/polys
 
-libpolys_include_HEADERS = $(LIBPOLYSHEADERS)
+nobase_libpolys_include_HEADERS = $(LIBPOLYSHEADERS)
 
 libpolys_a_SOURCES = ${SOURCES}