Changeset 188de86 in git for Singular/Makefile.am


Ignore:
Timestamp:
Aug 2, 2012, 4:09:13 PM (11 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'c987db42cd2ec943b97ac5746c99892ceddf909c')
Children:
4f9652847609cefd5ff3b91d14f34611592ab699
Parents:
0419aba8292e7109329604d8ad03b70f8ef6542344a1c2199e33375a631289eaab7a81954c8383e2
Message:
Merge pull request #158 from alexanderdreyer/spielwiese

Transfering newstruct and pyobject fixes to Spielwiese
File:
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/Makefile.am

    r44a1c2 r188de86  
    6868   minpoly.cc\
    6969   misc_ip.cc\
    70    mpsr_Error.cc\
    71    mpsr_Get.cc\
    72    mpsr_GetMisc.cc\
    73    mpsr_GetPoly.cc\
    74    mpsr_Put.cc\
    75    mpsr_PutPoly.cc\
    76    mpsr_Timer.cc\
    77    mpsr_Tok.cc\
    78    mpsr_sl.cc\
    7970   ndbm.cc\
    8071   newstruct.cc\
     
    132123   mmalloc.h \
    133124   omSingularConfig.h \
    134    mpsr.h \
    135    mpsr_Get.h \
    136    mpsr_Put.h \
    137    mpsr_Timer.h \
    138    mpsr_Tok.h \
    139    mpsr_sl.h \
    140125   ndbm.h \
    141126   newstruct.h \
     
    158143
    159144# plural_cmd.inc
    160 nodist_libSingular_la_SOURCES = mpsr_Tok.inc iparith.inc
    161 nodist_libSingular_g_la_SOURCES = mpsr_Tok.inc iparith.inc
     145nodist_libSingular_la_SOURCES = iparith.inc
     146nodist_libSingular_g_la_SOURCES = iparith.inc
    162147
    163148noinst_HEADERS = version.h
     
    176161# handle all the generated *.inc
    177162
    178 noinst_PROGRAMS = gentable2 gentable1 feOptGen feOptES feOptTS
    179 
    180 gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
    181 gentable2_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
    182 gentable2_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
    183 gentable2_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
    184 
     163noinst_PROGRAMS = gentable1 feOptGen feOptES feOptTS
    185164
    186165gentable1_SOURCES = gentable.cc grammar.h tok.h table.h
     
    364343
    365344# These files are built first
    366 BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc mpsr_Tok.inc iparith.inc LIB/all.lib plural_cmd.inc \
     345BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc LIB/all.lib plural_cmd.inc \
    367346                gftables MOD
    368347
     
    384363# plural_cmd.inc: iparith.inc
    385364
    386 mpsr_Tok.inc: gentable2
    387         ${abs_builddir}/gentable2
    388 
    389 
    390365
    391366gftables: ${abs_top_srcdir}/factory/gftables
Note: See TracChangeset for help on using the changeset viewer.