Changeset b4a676 in git


Ignore:
Timestamp:
Mar 29, 2012, 1:34:51 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '1d362c315e551a5b527ab0759f8839cf0e94f3a5')
Children:
fca452a782a426cceaa9e98f3a95b5a5acccd04f
Parents:
da4e5cb9371055727eda739b44f619c7eabeab5e
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 13:34:51+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 13:49:42+02:00
Message:
made findexec into a standalone library + removal of resources

add: findexec/configure.ac
del: removed the rests of libpolys/resources & references to it from everywhere
fix: findexec/feResource.cc should better not use S_UNAME
chg: factory should only need findexec & omalloc for testing
Files:
1 added
2 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    rda4e5c rb4a676  
    1111SUBDIRS=$(PACKAGES)
    1212
    13 TESTDIRS=$(ALLOC) $(USE_FACTORY) libpolys kernel Singular
     13TESTDIRS=$(PACKAGES)
    1414
    1515

  • Singular/Makefile.am

    rda4e5c rb4a676  
    259259ESingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    260260ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO
    261 ESingular_LDFLAGS = -static ${AM_LDFLAGS} -L${abs_top_builddir}/libpolys/resources -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
    262 ESingular_LDADD =  -lresources -lreporter -lmisc -lomalloc -lfindexec
     261ESingular_LDFLAGS = -static ${AM_LDFLAGS} -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
     262ESingular_LDADD =  -lreporter -lmisc -lomalloc -lfindexec
    263263
    264264ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
    … …  
    269269TSingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    270270TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO
    271 TSingular_LDFLAGS = -static ${AM_LDFLAGS} -L${abs_top_builddir}/libpolys/resources -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
    272 TSingular_LDADD =  -lresources -lreporter -lmisc -lomalloc -lfindexec
     271TSingular_LDFLAGS = -static ${AM_LDFLAGS} -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
     272TSingular_LDADD =  -lreporter -lmisc -lomalloc -lfindexec
    273273
    274274TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc

  • configure.ac

    rda4e5c rb4a676  
    123123fi
    124124
     125AC_CONFIG_SUBDIRS([findexec])
    125126AC_CONFIG_SUBDIRS([omalloc])
    126127
    … …  
    131132AC_CONFIG_SUBDIRS([libpolys])
    132133AC_CONFIG_FILES([Makefile])
    133 AC_CONFIG_FILES([findexec/Makefile])
    134134AC_CONFIG_FILES([kernel/Makefile])
    135135AC_CONFIG_FILES([numeric/Makefile])

  • factory/Makefile.am

    rda4e5c rb4a676  
    338338
    339339# The following ('..') is a hack for a while...
    340 TESTADDLIBDIRS = ${OMALLOC_LDFLAGS} -L${builddir}/../findexec -L${builddir}/../libpolys
     340TESTADDLIBDIRS = ${OMALLOC_LDFLAGS}
    341341TESTADDLIB = $(TESTADDLIBDIRS) $(OMALLOC_R_LDADD)
    342342TESTADDLIBDEBUG = $(TESTADDLIBDIRS) $(OMALLOC_G_LDADD)

  • factory/configure.ac

    rda4e5c rb4a676  
    372372  if test "x$with_omalloc_extra_dir" != "x"; then
    373373    OMALLOC_CFLAGS="$OMALLOC_CFLAGS -I${with_omalloc_extra_dir}"
    374     OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/findexec -L${with_omalloc_extra_dir}/libpolys/resources -L${with_omalloc_extra_dir}/libpolys/reporter -L${with_omalloc_extra_dir}/libpolys/misc"
     374    OMALLOC_LDFLAGS="$OMALLOC_LDFLAGS -L${with_omalloc_extra_dir}/omalloc -L${with_omalloc_extra_dir}/findexec"
    375375  fi
    376376 
    … …  
    385385  CPPFLAGS="$CPPFLAGS_save"
    386386
    387   OMALLOC_G_LDADD="-lresources_g -lreporter_g -lmisc_g -lfindexec_g -lomalloc_g"
    388   OMALLOC_R_LDADD="-lresources -lreporter -lmisc -lfindexec -lomalloc"
     387  OMALLOC_G_LDADD="-lfindexec_g -lomalloc_g"
     388  OMALLOC_R_LDADD="-lfindexec -lomalloc"
    389389 
    390390  AC_DEFINE(HAVE_OMALLOC, 1, [omalloc support])

  • findexec/Makefile.am

    rda4e5c rb4a676  
     1ACLOCAL_AMFLAGS = -I ../m4
     2
    13libfindexec_LTLIBRARIES = libfindexec.la libfindexec_g.la
    24libfindexecdir = $(libdir)/singular

  • findexec/feFopen.cc

    rda4e5c rb4a676  
    1111
    1212#include "feFopen.h"
    13 #include <findexec/feResource.h>
     13#include "feResource.h"
    1414
    1515

  • findexec/feResource.cc

    rda4e5c rb4a676  
    1414#include "config.h"
    1515
    16 #include <findexec/omFindExec.h>
     16#include "omFindExec.h"
    1717
    1818#include "feResource.h"
    … …  
    4040// #define RESOURCE_DEBUG
    4141
    42 #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"PACKAGE_VERSION
     42#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"
    4343
    4444/*****************************************************************
    … …  
    7171   "%b/../../factory",
    7272   ""},
    73   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
    74   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
     73  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/Singular",          (char *)""},
     74  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/",                  (char *)""},
    7575  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
    7676  {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share",          (char *)""},
    … …  
    8282  {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
    8383#endif
    84   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"PACKAGE_VERSION,    (char *)""},
     84  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/index.php/singular-manual.html",    (char *)""},
    8585  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
    8686  {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},

  • kernel/Makefile.am

    rda4e5c rb4a676  
    8080endif
    8181
    82 AM_LDFLAGS = -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/resources -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
     82AM_LDFLAGS = -L${top_builddir}/kernel -L${top_builddir}/libpolys/polys -L${top_builddir}/libpolys/coeffs -L${top_builddir}/libpolys/reporter -L${top_builddir}/libpolys/misc $(USE_FACTORY) -L${top_builddir}/omalloc -L${top_builddir}/findexec
    8383
    8484
    … …  
    100100test_s_g_SOURCES = $(testsources)
    101101
    102 test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    103 test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     102test_s_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     103test_s_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    104104
    105105test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    … …  
    119119test_d_g_SOURCES = $(testsources)
    120120
    121 test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lresources -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    122 test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     121test_d_r_LDADD = -lkernel -lpolys -lcoeffs -lreporter -lmisc $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     122test_d_g_LDADD = -lkernel_g -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    123123
    124124test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG

  • libpolys/Makefile.am

    rda4e5c rb4a676  
    33bin_SCRIPTS = libpolys-config
    44
    5 PACKAGES=misc reporter resources coeffs polys tests
     5PACKAGES=misc reporter coeffs polys tests
    66SUBDIRS=$(PACKAGES)
    77

  • libpolys/coeffs/Makefile.am

    rda4e5c rb4a676  
    4343
    4444## for testing...
    45 AM_LDFLAGS = -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
     45AM_LDFLAGS = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${abs_top_builddir}/../findexec -L${abs_builddir}
    4646
    4747
    … …  
    6060
    6161
    62 test_s_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    63 test_s_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     62test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     63test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    6464
    65 test_d_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    66 test_d_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     65test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     66test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    6767
    6868

  • libpolys/configure.ac

    rda4e5c rb4a676  
    121121AC_CONFIG_FILES([misc/Makefile])
    122122AC_CONFIG_FILES([reporter/Makefile])
    123 AC_CONFIG_FILES([resources/Makefile])
    124123AC_CONFIG_FILES([coeffs/Makefile])
    125124AC_CONFIG_FILES([polys/Makefile])

  • libpolys/polys/Makefile.am

    rda4e5c rb4a676  
    1111
    1212INCLUDES        = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} -I${top_srcdir}/../factory/include -I${top_builddir}/../factory/include ${GMP_CFLAGS}
    13 AM_LDFLAGS      = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/resources -L${abs_top_builddir}/../omalloc -L${abs_builddir}
     13AM_LDFLAGS      = -L${abs_top_builddir}/coeffs -L${abs_top_builddir}/reporter -L${abs_top_builddir}/../omalloc -L${abs_builddir}
    1414
    1515if ENABLE_P_PROCS_STATIC
    … …  
    136136
    137137
    138 libpolys_la_LIBADD = ${abs_top_builddir}/misc/libmisc.la ${abs_top_builddir}/reporter/libreporter.la ${abs_top_builddir}/resources/libresources.la ${abs_top_builddir}/coeffs/libcoeffs.la
    139 libpolys_g_la_LIBADD = ${abs_top_builddir}/misc/libmisc_g.la ${abs_top_builddir}/reporter/libreporter_g.la ${abs_top_builddir}/resources/libresources_g.la ${abs_top_builddir}/coeffs/libcoeffs_g.la
     138libpolys_la_LIBADD = ${abs_top_builddir}/misc/libmisc.la ${abs_top_builddir}/reporter/libreporter.la ${abs_top_builddir}/coeffs/libcoeffs.la
     139libpolys_g_la_LIBADD = ${abs_top_builddir}/misc/libmisc_g.la ${abs_top_builddir}/reporter/libreporter_g.la ${abs_top_builddir}/coeffs/libcoeffs_g.la
    140140
    141141

  • libpolys/tests/Makefile.am

    rda4e5c rb4a676  
    9999rings_test_s_g_CPPFLAGS = ${DEBUGCPPFLAGS}
    100100
    101 AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/resources -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
     101AM_LDFLAGS = -L${top_builddir}/polys -L${top_builddir}/coeffs -L${top_builddir}/reporter -L${top_builddir}/misc ${USE_FACTORY} -L${top_builddir}/../omalloc -L${top_builddir}/../findexec
    102102
    103103coeffs_test_s_r_LDFLAGS = ${AM_LDFLAGS} -static
    … …  
    118118
    119119
    120 coeffs_test_s_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     120coeffs_test_s_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    121121polys_test_s_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    122122rings_test_s_r_LDADD = $(polys_test_s_r_LDADD)
    123123
    124 coeffs_test_s_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     124coeffs_test_s_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    125125polys_test_s_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    126126rings_test_s_g_LDADD = $(polys_test_s_g_LDADD)
    127127
    128 coeffs_test_d_r_LDADD = -lcoeffs -lresources -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
     128coeffs_test_d_r_LDADD = -lcoeffs -lreporter -lmisc ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    129129polys_test_d_r_LDADD = -lpolys ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc -lfindexec ${NTL_LIBS} ${GMP_LIBS}
    130130rings_test_d_r_LDADD = $(polys_test_d_r_LDADD)
    131131
    132 coeffs_test_d_g_LDADD = -lcoeffs_g -lresources_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
     132coeffs_test_d_g_LDADD = -lcoeffs_g -lreporter_g -lmisc_g ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    133133polys_test_d_g_LDADD = -lpolys_g ${USEPPROCSDYNAMICLD} ${FACTORY_LIBS} -lomalloc_g -lfindexec_g ${NTL_LIBS} ${GMP_LIBS}
    134134rings_test_d_g_LDADD = $(polys_test_d_g_LDADD)

  • standalone.test/libpolys-config.sample

    rda4e5c rb4a676  
    6363
    6464    --libs)
    65         ${ECHOn} " -L${libdir} -lpolys_g -lcoeffs_g -lresources_g -lreporter_g -lmisc_g -lomalloc_g -ldl -lgmp  "
     65        ${ECHOn} " -L${libdir} -lpolys_g -lcoeffs_g -lreporter_g -lmisc_g -lomalloc_g -ldl -lgmp  "
    6666        ;;
    6767
Note: See TracChangeset for help on using the changeset viewer.