Changeset 468b57 in git


Ignore:
Timestamp:
May 10, 2011, 4:41:49 PM (13 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c7af8613769b29c741d6c338945669719f1fc4f8')
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:
6 edited

Legend:

Unmodified
Added
Removed
  • factory/CMakeLists.txt

    r650f2d8 r468b57  
    318318if( WITH_SINGULAR )
    319319  # define libraries
    320   message(STATUS "Compiling factory for Singular: creating libsingcf.a")
     320  message(STATUS "Compiling factory for Singular: creating libfactory.a")
    321321  add_library(singcf ${basefactory_srcs} ${singfactory_srcs})
    322322  set_target_properties(singcf PROPERTIES COMPILE_DEFINITIONS "${ADD_DEFS}")
    323323  add_dependencies(singcf ${OMALLOC_TARGET} ${NTL_TARGET})
    324324else( WITH_SINGULAR )
    325   message(STATUS "Disabled creation of libsingcf.a")
     325  message(STATUS "Disabled creation of libfactory.a")
    326326endif( WITH_SINGULAR )
    327327
  • factory/GNUmakefile.in

    r650f2d8 r468b57  
    495495all:            $(alltargets)
    496496
    497 cf:             factoryconf.h factory.h  libsingcf.a  libsingcf_g.a
     497cf:             factoryconf.h factory.h  libfactory.a  libfactory_g.a
    498498
    499499mem:            libcfmem.a
     
    502502# - explicit targets.
    503503#
    504 libsingcf.a:    $(factoryobj)
     504libfactory.a:   $(factoryobj)
    505505                $(AR) $(ARFLAGS) $@ $^
    506506                $(RANLIB) $@
    507507
    508 libsingcf_g.a:  $(factorygobj)
     508libfactory_g.a: $(factorygobj)
    509509                $(AR) $(ARFLAGS) $@ $^
    510510                $(RANLIB) $@
    511511
    512 libsingcf_p.a:  $(factorypobj)
     512libfactory_p.a: $(factorypobj)
    513513                $(AR) $(ARFLAGS) $@ $^
    514514                $(RANLIB) $@
     
    637637install install-libsingular:    $(installtargets)
    638638
    639 install_all:    install libsingcf_p.a
    640                 -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
     639install_all:    install libfactory_p.a
     640                -$(INSTALL_DATA) libfactory_p.a $(libdir)/libfactory_p.a
    641641
    642642install-nolns: install
     
    647647                $(MKINSTALLDIRS) $(templatedir)
    648648                $(INSTALL_DATA) $(libfactory) $(libdir)/$(libfactory)
    649                 -$(INSTALL_DATA) libsingcf_g.a $(libdir)/libsingcf_g.a
    650                 -$(INSTALL_DATA) libsingcf_p.a $(libdir)/libsingcf_p.a
     649                -$(INSTALL_DATA) libfactory_g.a $(libdir)/libfactory_g.a
     650                -$(INSTALL_DATA) libfactory_p.a $(libdir)/libfactory_p.a
    651651                $(INSTALL_DATA) factory.h $(includedir)/factory.h
    652652                $(INSTALL_DATA) cf_gmp.h $(includedir)/cf_gmp.h
     
    696696                -rm -f $(includedir)/factory.h
    697697                -rm -f $(libdir)/$(libfactory)
    698                 -rm -f $(libdir)/libsingcf_g.a
    699                 -rm -f $(libdir)/libsingcf_p.a
     698                -rm -f $(libdir)/libfactory_g.a
     699                -rm -f $(libdir)/libfactory_p.a
    700700                -rmdir $(templatedir)
    701701                -rmdir $(includedir)
     
    734734#
    735735clean:          ftestclean
    736                 -rm -f libsingcf.a libcfmem.a libsingcf_g.a libsingcf_p.a \
     736                -rm -f libfactory.a libcfmem.a libfactory_g.a libfactory_p.a \
    737737                  $(ftestexec) gengftables test_install \
    738738                  factoryconf.h factory.h *.o *.og *.op *.d *.dtmp
  • factory/Makefile.am

    r650f2d8 r468b57  
    1 lib_LIBRARIES = libsingcf.a libsingcf_g.a
     1lib_LIBRARIES = libfactory.a libfactory_g.a
    22
    33# factory source files
     
    7575                singext.cc
    7676
    77 libsingcf_a_SOURCES = $(SOURCES)
    78 libsingcf_g_a_SOURCES = $(SOURCES)
     77libfactory_a_SOURCES = $(SOURCES)
     78libfactory_g_a_SOURCES = $(SOURCES)
    7979
    8080# factory header files
  • factory/configure.in

    r650f2d8 r468b57  
    274274#
    275275if test "x$with_Singular" = xyes; then
    276   libfactory=libsingcf.a
     276  libfactory=libfactory.a
    277277
    278278  factorysrc='$(basefactorysrc) $(singfactorysrc)'
  • libpolys/coeffs/Makefile.am

    r650f2d8 r468b57  
    4646test_g_SOURCES = test.cc
    4747
    48 test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc -lsingcf -lomalloc
    49 test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lsingcf_g -lomalloc_debug
     48test_LDADD   = -lcoeffs ${GMP_LIBS} ${NTL_LIBS} -lresources -lreporter -lmisc -lfactory -lomalloc
     49test_g_LDADD = -lcoeffs_g ${GMP_LIBS} ${NTL_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
    5050
    5151
  • libpolys/tests/Makefile.am

    r650f2d8 r468b57  
    2727rings_test_LDFLAGS = $(polys_test_LDFLAGS)
    2828
    29 coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lsingcf_g -lomalloc_debug
     29coeffs_test_LDADD = -lcoeffs_g ${GMP_LIBS} -lresources_g -lreporter_g -lmisc_g -lfactory_g -lomalloc_debug
    3030polys_test_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} $(coeffs_test_LDADD)
    3131rings_test_LDADD = $(polys_test_LDADD)
Note: See TracChangeset for help on using the changeset viewer.