Changeset bd795d in git


Ignore:
Timestamp:
Jan 27, 2012, 7:44:48 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '45e267b9942dec9429fe249ce3e5e44ab80a6a3a')
Children:
7938a0f011b7631108f90c25ded16172b942b7b1
Parents:
fea2afe12a425d875d707eb7393d52b070f19b49
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-27 19:44:48+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-27 19:52:11+01:00
Message:
improved build system in Singuar/: building of libparse and [TE]Singular

ADD/CHG: distribute and install emacs/ (under $(datadir)/)
CHG: moved fegetopt.{c,h} from kernel/ to Singular/
ADD: build and install Singular/[TE]Singular
ADD: better Singular/libparse
CHG: only build the static release and debug binaries Singular&Singularg by default!
Files:
13 edited
2 moved

Legend:

Unmodified
Added
Removed
  • Makefile.am

    rfea2af rbd795d  
    1515TESTDIRS=$(ALLOC) $(USE_FACTORY) libpolys kernel Singular
    1616
    17 EXTRA_DIST = autogen.sh
     17
     18emacsdir=$(datadir)/emacs
     19dist_emacs_DATA =  emacs/BUGS \
     20    emacs/ChangeLog \
     21    emacs/cmpl.pl \
     22    emacs/COPYING \
     23    emacs/ESingular.emacs21 \
     24    emacs/lib.pl \
     25    emacs/Makefile.in \
     26    emacs/NEWS \
     27    emacs/singular.el \
     28    emacs/singular.el.decl \
     29    emacs/singular.xpm
     30
     31# emacs/test.sing
     32# TODO: remove this!
     33#all-local:
     34#       [ -d ${builddir}/emacs ] || ln -s ${srcdir}/emacs ${builddir}
     35
     36
     37EXTRA_DIST = autogen.sh emacs
     38
    1839
    1940bin_SCRIPTS = libsingular-config
  • Singular/Makefile.am

    rfea2af rbd795d  
    1414CXXTEMPLFLAGS = ## -fno-implicit-templates
    1515
    16 INCLUDES = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS)
     16AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -I${top_srcdir}/numeric -I${top_builddir}/numeric -I${top_srcdir}/kernel -I${top_builddir}/kernel -I${top_srcdir}/libpolys -I${top_builddir}/libpolys $(GMP_CFLAGS) -I${top_srcdir}/factory/include -I${top_builddir}/factory/include $(FACTORY_CFLAGS) $(NTL_CFLAGS)
    1717
    1818########################### libSingular* #########################
     
    2929
    3030
    31 libSingular_la_CPPFLAGS   = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
    32 libSingular_g_la_CPPFLAGS = -DHAVE_CONFIG_H -DLIBSINGULAR
     31libSingular_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DLIBSINGULAR
     32libSingular_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DLIBSINGULAR
    3333
    3434SOURCES =    Minor.cc\
     
    8787   ssiLink.cc\
    8888   subexpr.cc\
    89    utils.cc\
    9089   walk.cc\
    9190   walk_ip.cc\
     
    9594#   slInit_Dynamic.cc
    9695
    97 libSingular_la_SOURCES   = $(SOURCES) feOpt.inc feOptTS.inc feOptES.inc
    98 libSingular_g_la_SOURCES = $(SOURCES) feOpt.inc feOptTS.inc feOptES.inc
     96libSingular_la_SOURCES   = $(SOURCES) feOpt.inc
     97libSingular_g_la_SOURCES = $(SOURCES) feOpt.inc
    9998
    10099SingularHEADERS =    Cache.h \
     
    154153   table.h \
    155154   tok.h \
    156    utils.h \
    157155   version.h \
    158    walk.h \
    159    feOpt.h
     156   walk.h
    160157
    161158nodist_libSingular_la_SOURCES = mpsr_Tok.inc iparith.inc plural_cmd.inc
     
    171168endif
    172169
    173 # noinst_HEADERS = feOpt.h
    174 ## TODO: install all the *.inc?! 
    175 ## If not, move feOpt.h to SOURCES and remove *inc from HEADERS
    176 
    177170#########################################################
    178171# handle all the generated *.inc
     
    180173AM_LDFLAGS = -L${abs_top_builddir}/Singular -L${abs_top_builddir}/numeric -L${abs_top_builddir}/kernel -L${abs_top_builddir}/libpolys/polys  $(USE_FACTORY) -L${abs_top_builddir}/omalloc -L${abs_top_builddir}/findexec
    181174
    182 noinst_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
     175noinst_PROGRAMS = gentable2 gentable1 feOptGen feOptES feOptTS
    183176
    184177gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
    185178gentable2_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    186179gentable2_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    187 gentable2_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     180gentable2_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    188181
    189182
     
    191184gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    192185gentable1_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    193 gentable1_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    194 
    195 feOpt_SOURCES = feOptGen.cc feOptGen.h
    196 feOpt_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    197 feOpt_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     186gentable1_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     187
     188feOptGen_SOURCES = feOptGen.cc feOptGen.h
     189feOptGen_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     190feOptGen_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    198191
    199192feOptES_SOURCES = feOptGen.cc feOptGen.h
    200193feOptES_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    201 feOptES_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR
     194feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR
    202195
    203196feOptTS_SOURCES = feOptGen.cc feOptGen.h
    204197feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    205 feOptTS_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR
     198feOptTS_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR
    206199
    207200########################### Singular* #########################
    208201
    209 bin_PROGRAMS = Singular Singularg Singulard Singulardg
    210 # libparse
    211 # libparse_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DSTANDALONE_PARSER
    212 # libparse_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    213 # libparse_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     202EXTRA_PROGRAMS = Singulard Singulardg libparse
     203
     204# the "optional_programs" variable should be defined in the configure
     205# script, and listed in an AC_SUBST macro
     206optional_Singular_programs =
     207
     208bin_PROGRAMS = Singular Singularg ESingular TSingular $(optional_Singular_programs)
     209
     210Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     211Singularg_CFLAGS = -g ${PIPE}
     212
     213Singular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     214Singularg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
     215
     216nodist_Singular_SOURCES = libSingular.la
     217nodist_Singularg_SOURCES =  libSingular_g.la
     218
     219Singular_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
     220Singularg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
     221
     222Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     223Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     224
     225Singular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     226Singularg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     227
     228Singular_LDFLAGS = -static
     229Singularg_LDFLAGS = -static
     230
     231
     232Singulard_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     233Singulardg_CFLAGS = -g ${PIPE}
     234
     235Singulard_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     236Singulardg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
     237
     238Singulard_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
     239nodist_Singulard_SOURCES = libSingular.la
     240
     241Singulardg_SOURCES = tesths.cc fegetopt.c fegetopt.h utils.cc  utils.h
     242nodist_Singulardg_SOURCES =  libSingular_g.la
     243
     244Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
     245Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
     246
     247Singulard_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     248Singulardg_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
     249
     250
     251#### ESingular
     252
     253ESingular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     254ESingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     255ESingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DESINGULAR -DPROTO
     256ESingular_LDFLAGS = -static ${AM_LDFLAGS} -L${abs_top_builddir}/libpolys/resources -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
     257ESingular_LDADD =  -lresources -lreporter -lmisc -lomalloc -lfindexec
     258
     259ESingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptES.inc feOpt.cc
     260
     261#### same for TSingular
     262
     263TSingular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     264TSingular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
     265TSingular_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DTSINGULAR -DPROTO
     266TSingular_LDFLAGS = -static ${AM_LDFLAGS} -L${abs_top_builddir}/libpolys/resources -L${abs_top_builddir}/libpolys/reporter -L${abs_top_builddir}/libpolys/misc
     267TSingular_LDADD =  -lresources -lreporter -lmisc -lomalloc -lfindexec
     268
     269TSingular_SOURCES = emacs.cc fegetopt.c fegetopt.h feOptTS.inc feOpt.cc
     270# utils.cc utils.h
     271
     272
     273#### libparse
     274libparse_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG -DSTANDALONE_PARSER
     275libparse_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
     276libparse_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    214277 
    215 # libparse_SOURCES = libparse.cc
     278libparse_SOURCES = libparse.cc fegetopt.c fegetopt.h utils.cc  utils.h
    216279# nodist_libparse_SOURCES = libSingular.la
    217280 
    218281# # libSingular.la -lnumeric
    219 # libparse_LDADD = -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    220 # libparse_LDFLAGS = -static ${AM_LDFLAGS}
    221 
    222 
    223 Singular_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    224 Singularg_CFLAGS = -g ${PIPE}
    225 
    226 Singular_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    227 Singularg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    228 
    229 nodist_Singular_SOURCES = libSingular.la
    230 nodist_Singularg_SOURCES =  libSingular_g.la
    231 
    232 Singular_SOURCES = tesths.cc
    233 Singularg_SOURCES = tesths.cc
    234 
    235 Singular_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    236 Singularg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    237 
    238 Singular_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    239 Singularg_CPPFLAGS = -DHAVE_CONFIG_H
    240 
    241 Singular_LDFLAGS = -static
    242 Singularg_LDFLAGS = -static
    243 
    244 
    245 Singulard_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    246 Singulardg_CFLAGS = -g ${PIPE}
    247 
    248 Singulard_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    249 Singulardg_CXXFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE} $(CXXTEMPLFLAGS)
    250 
    251 Singulard_SOURCES = tesths.cc
    252 nodist_Singulard_SOURCES = libSingular.la
    253 
    254 Singulardg_SOURCES = tesths.cc
    255 nodist_Singulardg_SOURCES =  libSingular_g.la
    256 
    257 Singulard_LDADD = libSingular.la -lnumeric -lkernel -lpolys $(FACTORY_LIBS) -lomalloc -lfindexec $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS} ${USEPPROCSDYNAMICLD}
    258 Singulardg_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    259 
    260 Singulard_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    261 Singulardg_CPPFLAGS = -DHAVE_CONFIG_H
    262 
     282libparse_LDADD = -lomalloc
     283libparse_LDFLAGS = -static ${AM_LDFLAGS}
     284# TODO for libparse:
     285# multiple definition of `category_out': libparse.cc v.s. utils.cc
     286# undefined reference to `iiInitSingularProcinfo(procinfo*, char const*, char const*, int, long, int)'
    263287
    264288#########################################################
     
    273297
    274298# ${nobase_dist_singularlibrary_DATA}
     299
    275300LIB/all.lib: ${srcdir}/make_alllib.sh ${srcdir}/LIB/all.lib.tmpl ${singularlibrary}
    276301        $(MKDIR_P) LIB
    277302        ${srcdir}/make_alllib.sh ${srcdir}/LIB/all.lib.tmpl ${SLIB0} ${PLIBS}
    278303
     304# [ -d ${builddir}/LIB ] || ( $(MKDIR_P) LIB ; cp ${srcdir}/LIB/*.lib ${builddir}/LIB/ )
     305
    279306########################### TEST #########################
    280307
     
    299326test_s_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    300327
    301 test_s_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    302 test_s_g_CPPFLAGS = -DHAVE_CONFIG_H
     328test_s_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     329test_s_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    303330
    304331test_s_r_LDFLAGS = -static
     
    320347test_d_g_LDADD = libSingular_g.la -lnumeric_g -lkernel_g -lpolys_g $(FACTORY_LIBS) -lomalloc_g -lfindexec_g $(NTL_LIBS) $(GMP_LIBS) ${USEPPROCSDYNAMICLDFLAGS}  ${USEPPROCSDYNAMICLD}
    321348
    322 test_d_r_CPPFLAGS = -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    323 test_d_g_CPPFLAGS = -DHAVE_CONFIG_H
     349test_d_r_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
     350test_d_g_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H
    324351
    325352#########################################################
     
    328355BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc mpsr_Tok.inc iparith.inc plural_cmd.inc LIB/all.lib MOD
    329356
    330 CLEANFILES = $(BUILT_SOURCES)
     357CLEANFILES = $(BUILT_SOURCES) $(EXTRA_PROGRAMS)
    331358
    332359MOD: ${top_builddir}/libpolys/tests/MOD
    333         ln -snf ${top_builddir}/libpolys/tests/MOD ${builddir}/MOD
    334 
    335 feOpt.inc: feOpt
    336         ${abs_builddir}/feOpt
     360        [ -d ${builddir}/MOD ] || ln -snf ${top_builddir}/libpolys/tests/MOD ${builddir}/MOD
     361
     362feOpt.inc: feOptGen
     363        ${abs_builddir}/feOptGen
    337364
    338365feOptES.inc: feOptES
  • Singular/emacs.cc

    rfea2af rbd795d  
    77*/
    88
     9#include "config.h"
     10#include <kernel/mod2.h>
     11
     12
    913#include <stdio.h>
    1014#include <unistd.h>
     15
    1116#ifdef DecAlpha_OSF1
    1217#define _BSD
    1318#endif
     19
    1420#include <stdlib.h>
    1521#include <stdarg.h>
     
    1925#include <windows.h>
    2026#endif
    21 #include <kernel/mod2.h>
     27
     28#include <omalloc/omalloc.h>
    2229#include <Singular/version.h>
    23 #include <omalloc/omalloc.h>
     30#include <resources/feResource.h>
     31#include <Singular/feOpt.h>
    2432
    2533#if !defined(TSINGULAR) && !defined(ESINGULAR)
     
    8795}
    8896
    89 #include <resources/feResource.cc>
    90 #include <Singular/feOpt.cc>
    91 
    9297void mainUsage()
    9398{
    9499  error( "Use `%s --help' for a complete list of options\n", feArgv0);
    95100}
     101
     102extern char* feResourceDefault(const char id);
     103extern char* feResourceDefault(const char* key);
     104
    96105
    97106int main(int argc, char** argv)
     
    119128    switch(optc)
    120129    {
    121         case 'h':
     130      case 'h':
     131          extern void feOptHelp(const char* name);
     132       
    122133          feOptHelp(feArgv0);
    123134          exit(0);
  • Singular/feOpt.cc

    rfea2af rbd795d  
    77*/
    88
     9#include "config.h"
     10#include <kernel/mod2.h>
     11
    912#include <string.h>
    1013#include <stdlib.h>
    11 
    12 #include <kernel/mod2.h>
    1314
    1415#ifdef HAVE_FACTORY
     
    139140// Setting Values
    140141//
    141 static void feOptHelp(const char* name);
    142142//
    143143// Return: NULL -- everything ok
     
    347347
    348348// Prints help message
    349 static void feOptHelp(const char* name)
     349void feOptHelp(const char* name)
    350350{
    351351  int i = 0;
  • Singular/feOpt.h

    rfea2af rbd795d  
    99*/
    1010
    11 #include <kernel/fegetopt.h>
     11#include <Singular/fegetopt.h>
    1212
    1313#include <Singular/feOptTab.h>
     
    3333#endif
    3434
     35
    3536#ifdef __cplusplus
    3637extern "C" {
    3738#endif
     39
     40void feOptHelp(const char* name);
    3841
    3942void* feGetOptValue(feOptIndex opt);
  • Singular/feOptGen.h

    rfea2af rbd795d  
    99*/
    1010
    11 #include <kernel/fegetopt.h>
     11#include <Singular/fegetopt.h>
    1212
    1313extern const char SHORT_OPTS_STRING[];
  • Singular/fegetopt.c

    rfea2af rbd795d  
    8484   they can distinguish the relative order of options and other arguments.  */
    8585
    86 #include <kernel/fegetopt.h>
     86#include <Singular/fegetopt.h>
    8787
    8888/* For communication from `getopt' to the caller.
  • Singular/mmstd.c

    rfea2af rbd795d  
    3232
    3333#else
    34 #include <stdlib.h>
     34#include <Singular/mmalloc.h>
     35
    3536void freeSize(void* addr, size_t size)
    3637{
  • Singular/test.cc

    rfea2af rbd795d  
    9595#include <kernel/eigenval.h>
    9696#include <kernel/units.h>
    97 #include <kernel/fegetopt.h>
    9897#include <kernel/ratgring.h>
    9998#include <kernel/shiftgb.h>
     
    111110#include <kernel/fast_mult.h>
    112111#include <kernel/febase.h>
    113 #include <kernel/fegetopt.h>
    114112
    115113#include <kernel/fglmgauss.h>
     
    198196#include "distrib.h"
    199197#include "eigenval_ip.h"
    200 #include "feOpt.h"
    201198#include "gms.h"
    202199#include "grammar.h"
     
    242239#include "walk.h"
    243240
     241#include "fegetopt.h"
    244242
    245243void siInit(char *);
  • Singular/tesths.cc

    rfea2af rbd795d  
    88*/
    99
     10#include "config.h"
    1011#include <kernel/mod2.h>
    1112
    1213#include <omalloc/omalloc.h>
    1314
     15#include <misc/auxiliary.h>
    1416#include <misc/options.h>
    15 #include <misc/auxiliary.h>
    1617
    1718#ifdef HAVE_FACTORY
     
    2223#include <kernel/febase.h>
    2324#include <kernel/timer.h>
    24 #include <kernel/fegetopt.h>
    2525
    2626#ifdef HAVE_FANS
     
    4242#include "mmalloc.h"
    4343#include "tok.h"
     44#include "fegetopt.h"
    4445
    4546// #include "pyobject_setup.h"
  • Singular/utils.cc

    rfea2af rbd795d  
    33#include <stdlib.h>
    44#include <ctype.h>
    5 #include <kernel/fegetopt.h>
     5
     6#include <Singular/fegetopt.h>
    67#include <Singular/utils.h>
    78#include <Singular/libparse.h>
  • kernel/Makefile.am

    rfea2af rbd795d  
    4747    ratgring.cc shiftgb.cc gfan.cc \
    4848    linearAlgebra.cc nc.cc preimage.cc \
    49     fegetopt.c mod2.h
     49    mod2.h
    5050
    5151libkernel_la_SOURCES   = $(SOURCES)
     
    6464        GMPrat.h multicnt.h npolygon.h semic.h spectrum.h splist.h \
    6565        eigenval.h units.h \
    66         fegetopt.h \
    6766        ratgring.h shiftgb.h nc.h \
    6867        gfan.h bbcone.h bbfan.h \
  • kernel/test.cc

    rfea2af rbd795d  
    102102#include "eigenval.h"
    103103#include "units.h"
    104 #include "fegetopt.h"
    105104#include "ratgring.h"
    106105#include "shiftgb.h"
     
    118117#include "fast_mult.h"
    119118#include "febase.h"
    120 #include "fegetopt.h"
    121119
    122120#include "fglmgauss.h"
  • libpolys/resources/feResource.cc

    rfea2af rbd795d  
    8787  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
    8888  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
     89  {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share",          (char *)""},
    8990  {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
    9091  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", (char *)""},
     
    102103  {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
    103104  {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
    104   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
     105  {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%D/emacs",             (char *)""},
    105106  {"SingularXterm",'M', feResBinary,"TSINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
    106107#ifdef ix86_Win
Note: See TracChangeset for help on using the changeset viewer.