Changeset 468b57 in git

Timestamp:

May 10, 2011, 4:41:49 PM (13 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

69181b37612b63bbfd20ec69a9c0e590772cae58

Parents:

650f2d813320751a4d90da4b788c6d807b2ff833

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-10 16:41:49+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:43+01:00

Message:

renamed libsingcf -> libfactory

Files:

• factory/CMakeLists.txt (modified) (1 diff)
• factory/GNUmakefile.in (modified) (6 diffs)
• factory/Makefile.am (modified) (2 diffs)
• factory/configure.in (modified) (1 diff)
• libpolys/coeffs/Makefile.am (modified) (1 diff)
• libpolys/tests/Makefile.am (modified) (1 diff)

factory/CMakeLists.txt

@@ -318 +318 @@
 if( WITH_SINGULAR )
   # define libraries
-  message(STATUS "Compiling factory for Singular: creating libsingcf.a")
+  message(STATUS "Compiling factory for Singular: creating libfactory.a")
   add_library(singcf ${basefactory_srcs} ${singfactory_srcs})
   set_target_properties(singcf PROPERTIES COMPILE_DEFINITIONS "${ADD_DEFS}")
   add_dependencies(singcf ${OMALLOC_TARGET} ${NTL_TARGET})
 else( WITH_SINGULAR )
-  message(STATUS "Disabled creation of libsingcf.a")
+  message(STATUS "Disabled creation of libfactory.a")
 endif( WITH_SINGULAR )
 

factory/GNUmakefile.in

@@ -495 +495 @@
 all:            $(alltargets)
 
-cf:             factoryconf.h factory.h  libsingcf.a  libsingcf_g.a
+cf:             factoryconf.h factory.h  libfactory.a  libfactory_g.a
 
 mem:            libcfmem.a
@@ -502 +502 @@
 # - explicit targets.
 #
-libsingcf.a:    $(factoryobj)
+libfactory.a:   $(factoryobj)
                 $(AR) $(ARFLAGS) $@ $^
                 $(RANLIB) $@
 
-libsingcf_g.a:  $(factorygobj)
+libfactory_g.a: $(factorygobj)
                 $(AR) $(ARFLAGS) $@ $^
                 $(RANLIB) $@
 
-libsingcf_p.a:  $(factorypobj)
+libfactory_p.a: $(factorypobj)
                 $(AR) $(ARFLAGS) $@ $^
                 $(RANLIB) $@
@@ -637 +637 @@
 install install-libsingular:    $(installtargets)
 
-install_all:    install libsingcf_p.a 
-                -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a 
+install_all:    install libfactory_p.a 
+                -$(INSTALL_DATA) libfactory_p.a $(libdir)/libfactory_p.a 
 
 install-nolns: install
@@ -647 +647 @@
                 $(MKINSTALLDIRS) $(templatedir)
                 $(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) libfactory_g.a $(libdir)/libfactory_g.a
+                -$(INSTALL_DATA) libfactory_p.a $(libdir)/libfactory_p.a
                 $(INSTALL_DATA) factory.h $(includedir)/factory.h
                 $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
@@ -696 +696 @@
                 -rm -f $(includedir)/factory.h
                 -rm -f $(libdir)/$(libfactory)
-                -rm -f $(libdir)/libsingcf_g.a
-                -rm -f $(libdir)/libsingcf_p.a
+                -rm -f $(libdir)/libfactory_g.a
+                -rm -f $(libdir)/libfactory_p.a
                 -rmdir $(templatedir)
                 -rmdir $(includedir)
@@ -734 +734 @@
 #
 clean:          ftestclean
-                -rm -f libsingcf.a libcfmem.a libsingcf_g.a libsingcf_p.a \
+                -rm -f libfactory.a libcfmem.a libfactory_g.a libfactory_p.a \
                   $(ftestexec) gengftables test_install \
                   factoryconf.h factory.h *.o *.og *.op *.d *.dtmp

factory/Makefile.am

@@ -1 @@
-lib_LIBRARIES = libsingcf.a libsingcf_g.a
+lib_LIBRARIES = libfactory.a libfactory_g.a
 
 # factory source files
@@ -75 +75 @@
                 singext.cc
 
-libsingcf_a_SOURCES = $(SOURCES)
-libsingcf_g_a_SOURCES = $(SOURCES)
+libfactory_a_SOURCES = $(SOURCES)
+libfactory_g_a_SOURCES = $(SOURCES)
 
 # factory header files

factory/configure.in

@@ -274 +274 @@
 #
 if test "x$with_Singular" = xyes; then
-  libfactory=libsingcf.a
+  libfactory=libfactory.a
 
   factorysrc='$(basefactorysrc) $(singfactorysrc)'

libpolys/coeffs/Makefile.am

@@ -46 +46 @@
 test_g_SOURCES = test.cc
 
-test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc -lsingcf -lomalloc
-test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lsingcf_g -lomalloc_debug
+test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc -lfactory -lomalloc
+test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
 
 

libpolys/tests/Makefile.am

@@ -27 +27 @@
 rings_test_LDFLAGS = $(polys_test_LDFLAGS)
 
-coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lsingcf_g -lomalloc_debug
+coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
 polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD)
 rings_test_LDADD = $(polys_test_LDADD)