Changeset c2eb2e in git for factory

Timestamp:

Sep 28, 2011, 6:22:34 PM (13 years ago)

Author:

Volker Braun <vbraun.name@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

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:

factory

Files:

• Makefile.am (modified) (9 diffs)
• configure.ac (modified) (1 diff)

factory/Makefile.am

@@ -5 +5 @@
 lib_LIBRARIES = libfactory.a libfactory_g.a
 
-libfactory_a_includedir=$(includedir)/factory
-libfactory_g_a_includedir=$(includedir)/factory
-
-libfactory_a_libdir=$(libdir)/factory
-libfactory_g_a_libdir=$(libdir)/factory
+libfactory_a_libdir = $(libdir)
+libfactory_g_a_libdir = $(libdir)
 
 libfactory_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti ${CXXTEMPLFLAGS}
@@ -90 +87 @@
                 singext.cc \
                 parseutil.cc \
-                ftmpl_inst.cc \
-                factory.h factoryconf.h
+                ftmpl_inst.cc
 
 if WITH_PARSER_FOR_CANONICAL_FORM
     SOURCES +=  readcf.yy
 endif
-
 
 libfactory_a_SOURCES = $(SOURCES)
@@ -106 +101 @@
                 canonicalform.h \
                 cf_algorithm.h \
+                cf_cyclo.h \
                 cf_binom.h \
                 cf_defs.h \
@@ -113 +109 @@
                 cf_globals.h \
                 cf_gcd_smallp.h \
+                cf_gmp.h \
                 cf_hnf.h \
                 cf_irred.h \
                 cf_iter.h \
                 cf_map.h \
+                cf_map_ext.h \
                 cfNewtonPolygon.h \
                 cfModResultant.h \
@@ -168 +166 @@
                 lgs.h \
                 algext.h \
-                singext.h
+                singext.h \
+                parseutil.h
 
 noinst_HEADERS = $(factory_headers)
+
+libfactory_includedir=$(includedir)/factory
+libfactory_include_HEADERS = cplusplus.h factory.h factoryconf.h
+
 
 # Documentation
@@ -185 +188 @@
                 rm -rf doxygen
 
-# Support for building GF(q)-tables
-
-templatesrc =   \
-                ftmpl_array.cc \
-                ftmpl_factor.cc \
-                ftmpl_functions.h \
-                ftmpl_list.cc \
-                ftmpl_matrix.cc
-templateincl =  \
-                ftmpl_array.h \
-                ftmpl_factor.h \
-                ftmpl_list.h \
-                ftmpl_matrix.h
-
-# TODO:
-# gengftables needs libfactory.a and factory.h AND is needed for generating gftable...
-# somehow the current deps. seem to be broken... 
-# moreover factory.h needs a lot more generated headers, which wouldn't be installed yet
-
-EXTRA_PROGRAMS = gengftables cplusplus
-
-
-gengftables_SOURCES = gengftables-conway.cc
-
-gengftables_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
+# the precomputed GF(q)-tables
 
 gftablesdir=$(datadir)/gftables
-gftables_DATA = gftables/10201 gftables/1024 gftables/10609 gftables/11449 \
+dist_gftables_DATA = gftables/10201 gftables/1024 gftables/10609 gftables/11449 \
 gftables/11881 gftables/121 gftables/12167 gftables/125 gftables/12769 \
 gftables/128 gftables/1331 gftables/1369 gftables/14641 \
@@ -235 +214 @@
 
 
-gftables: gengftables
-                @if test -x ${srcdir}/gftables; then \
-                        if test ! -x ${builddir}/gftables; then \
-                          ln -snf ${srcdir}/gftables ${builddir}; \
-                        fi; \
-                else \
-                        echo "This command will take quite a long time to execute;"; \
-                        echo "maybe you want to get the tables directly via ftp (see"; \
-                        echo "the INSTALL file)."; \
-                        ${builddir}/gengftables; \
-                fi
-
-.template.h:
-        ${srcdir}/bin/makeheader $< $@
-
-BUILT_SOURCES = cplusplus.h factory.h factoryconf.h readcf.cc
-
-
-libfactory_a_include_HEADERS=$(BUILT_SOURCES)
-libfactory_g_a_include_HEADERS=$(BUILT_SOURCES)
+# Support for building GF(q)-tables
+#
+# gengftables needs libfactory.a and factory.h AND is needed for
+# generating gftable but the tables are not necessarily needed to
+# compile and use libfactory (though it will be a lot slower).
+
+EXTRA_PROGRAMS = gengftables 
+gengftables_SOURCES = gengftables-conway.cc
+gengftables_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
+
 
 # These files listed below are not used anywhere but are included in
 # the distribution. So they will be tacked on to EXTRA_DIST.
 
+templatesrc =   templates/ftmpl_array.cc \
+                templates/ftmpl_factor.cc \
+                templates/ftmpl_functions.h \
+                templates/ftmpl_list.cc \
+                templates/ftmpl_matrix.cc
+
+templateincl =  templates/ftmpl_array.h \
+                templates/ftmpl_factor.h \
+                templates/ftmpl_list.h \
+                templates/ftmpl_matrix.h
+
 # header templates
-hdrtemplsrc = \
-                factoryconf.template \
+hdrtemplsrc =   factoryconf.template \
                 factory.template
 
 # FTE source files
-ftestsrc =      \
-                ftest_io.cc \
-                ftest_util.cc \
-                ntl_util.cc
+ftestsrc =      ftest/ftest_io.cc \
+                ftest/ftest_util.cc \
+                ftest/ntl_util.cc
 
 # FTE header files
-ftestincl =     \
-                ftest_io.h \
-                ftest_util.h \
-                ntl_util.h
-
-# FTE m4 source files (exported for `GNUmakefile' in `ftest/').
-# The variable `$(ftestm4develsrc)' may be already initialized
-# from the development `GNUmakefile'.
-ftestm4src =    $(ftestm4develsrc) \
-                commonden.m4 \
-                degree.m4 \
-                deriv.m4 \
-                divides.m4 \
-                divrem.m4 \
-                extgcd.m4 \
-                factorize.m4 \
-                fbinops.m4 \
-                feval.m4 \
-                gcd.m4 \
-                gcd.ntl.m4 \
-                insert.m4 \
-                norm.m4 \
-                resultant.m4 \
-                revert.m4 \
-                sqrfree.m4 \
-                size.m4 \
-                totaldegree.m4
-
-# other files from the FTE
+ftestincl =     ftest/ftest_io.h \
+                ftest/ftest_util.h \
+                ftest/ntl_util.h
+
+ftestm4src =    ftest/commonden.m4 \
+                ftest/degree.m4 \
+                ftest/deriv.m4 \
+                ftest/divides.m4 \
+                ftest/divrem.m4 \
+                ftest/extgcd.m4 \
+                ftest/factorize.m4 \
+                ftest/fbinops.m4 \
+                ftest/feval.m4 \
+                ftest/gcd.m4 \
+                ftest/gcd.ntl.m4 \
+                ftest/insert.m4 \
+                ftest/norm.m4 \
+                ftest/resultant.m4 \
+                ftest/revert.m4 \
+                ftest/sqrfree.m4 \
+                ftest/size.m4 \
+                ftest/totaldegree.m4
+
 ftestdistfiles = \
-                ftest_util.m4
-
-# gengftables.cc gengftables-conway.cc 
+                ftest/ftest_util.m4
+
 EXTRA_DIST =    test_install.cc \
                 $(templatesrc) $(templateincl) $(hdrtemplsrc) \
                 $(ftestsrc) $(ftestincl) $(ftestm4src) $(ftestdistfiles) \
-                doxygen.cfg factory.cfg gen_cf_gmp.template \
+                doxygen.cfg factory.cfg \
                 examples/application.cc \
                 examples/factorize.cc examples/gcd.cc \
                 bin/folding.el bin/fold-docu.el \
-                bin/makeheader bin/gen-readcf $(gftables_DATA)
-
-CLEANFILES = factory.h factoryconf.h cplusplus.h readcf.cc
-
-
+                bin/makeheader bin/gen-readcf 
+
+##################################################
+# autogenerated sources
+
+noinst_PROGRAMS = cplusplus
+
+BUILT_SOURCES = cplusplus.h factory.h factoryconf.h readcf.cc 
+
+CLEANFILES = $(BUILT_SOURCES)
 
 cplusplus_SOURCES = cplusplus.cc
@@ -322 +298 @@
         ${builddir}/cplusplus > ${builddir}/cplusplus.h
 
-#ftmpl_inst.o:  ftmpl_inst.cc factoryconf.h factory.h \
-#               $(addprefix templates/,$(templatesrc)) \
-#               $(addprefix templates/,$(templateincl))
-#               $(CXX) -c $< $(libfactory_a_CXXFLAGS)  $(INCLUDES) -o $@
+.template.h:
+        ${srcdir}/bin/makeheader $< $@
+
+# factory/gfops.cc has the gftables path hardcoded in, so we create a
+# symlink. Remove this rule once gfopts.cc has been fixed. Note that
+# check-local would run in parallel with check, so we can't use it
+# here!
+all-local:
+        [ -d ${builddir}/gftables ] || ln -s ${srcdir}/gftables ${builddir}
 
 ####################################################
@@ -335 +316 @@
 TESTSSOURCES = test.cc 
 
-test_g: libfactory_g.a
-
 test_g_SOURCES = $(TESTSSOURCES)
 test_g_CFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long -fomit-frame-pointer --no-rtti #ftmpl_inst.o
 test_g_LDADD = -L${builddir} -lfactory_g $(GMP_LIBS) $(NTL_LIBS)
 
-test_r: libfactory.a
-
 test_r_SOURCES = $(TESTSSOURCES)
 test_r_CFLAGS = -O3 -fomit-frame-pointer --no-rtti #ftmpl_inst.o
 test_r_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
+

factory/configure.ac

@@ -422 +422 @@
     [test x$with_Singular != xyes && test x$enable_streamio != xno])
 
-AC_OUTPUT(Makefile ftest/GNUmakefile)
-
+AC_CONFIG_FILES([Makefile ftest/GNUmakefile])
+AC_OUTPUT
+