Changeset 547f64 in git

Timestamp:

Jun 17, 2010, 2:41:29 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

04dd0ce998a4a58df8fc3aaf1bd42b662efc847c

Parents:

7bf14550d613edf557228ca502041b4a91b07ce3

Message:

changes for new factorization


git-svn-id: file:///usr/local/Singular/svn/trunk@12874 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• factory/GNUmakefile.in (modified) (10 diffs)

factory/GNUmakefile.in

@@ -133 +133 @@
                 cf_char.cc \
                 cf_chinese.cc \
-                cf_cyclo.cc\
+                cf_cyclo.cc \
                 cf_eval.cc \
                 cf_factor.cc \
@@ -157 +157 @@
                 cf_util.cc \
                 debug.cc \
+                DegreePattern.cc \
+                ExtensionInfo.cc \
                 fac_berlekamp.cc \
                 fac_cantzass.cc \
@@ -167 +169 @@
                 fac_univar.cc \
                 fac_util.cc \
+                facFqBivar.cc \
+                facFqBivarUtil.cc \
+                facFqFactorize.cc \
+                facFqFactorizeUtil.cc \
+                facFqSquarefree.cc \
+                facHensel.cc \
                 fieldGCD.cc \
                 ffops.cc \
@@ -202 +210 @@
 
 # factory object files and dependencies
-factoryobj1 :=  $(factorysrc:%.cc=%.o)
-factoryobj :=   $(factoryobj1:%.y=%.o)
+factoryobj :=   $(factorysrc:%.cc=%.o) $(factorysrc:%.y=%.o)
 factorygobj :=  $(factorysrc:%.cc=%.og)
 factorypobj :=  $(factorysrc:%.cc=%.op)
@@ -215 +222 @@
                 cf_algorithm.h \
                 cf_binom.h \
-                cf_cyclo.h\
                 cf_defs.h \
                 cf_eval.h \
                 cf_factory.h \
-                cf_gcd_smallp.h \
                 cf_generator.h \
                 cf_globals.h \
+                cf_gcd_smallp.h \
                 cf_irred.h \
                 cf_iter.h \
                 cf_map.h \
-                cf_map_ext.h \
                 cf_primes.h \
                 cf_primetab.h \
@@ -233 +238 @@
                 cf_util.h \
                 debug.h \
+                DegreePattern.h \
+                ExtensionInfo.h \
                 fac_berlekamp.h \
                 fac_cantzass.h \
@@ -241 +248 @@
                 fac_univar.h \
                 fac_util.h \
+                facFqBivar.h \
+                facFqBivarUtil.h \
+                facFqFactorize.h \
+                facFqFactorizeUtil.h \
+                facFqSquarefree.h \
+                facHensel.h \
                 fieldGCD.h \
                 ffops.h \
@@ -470 +483 @@
 all:            $(alltargets)
 
-cf:             factoryconf.h factory.h $(libfactory) libsingcf_g.a
+cf:             factoryconf.h factory.h $(libfactory) libsingcf_g.a libsingcf_p.a
 
 mem:            libcfmem.a
@@ -612 +625 @@
 install:        $(installtargets)
 
-install_all:    install libsingcf_p.a
-                -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
-
 install-nolns: install
 
@@ -623 +633 @@
                 $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
                 -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
+                -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
                 $(INSTALL_DATA) factory.h $(includedir)/factory.h
                 $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h