Changeset 188de86 in git for Singular/Makefile.am

Timestamp:

Aug 2, 2012, 4:09:13 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4f9652847609cefd5ff3b91d14f34611592ab699

Parents:

0419aba8292e7109329604d8ad03b70f8ef6542344a1c2199e33375a631289eaab7a81954c8383e2

Message:

Merge pull request #158 from alexanderdreyer/spielwiese

Transfering newstruct and pyobject fixes to Spielwiese

File:

• Singular/Makefile.am (modified) (6 diffs)

Singular/Makefile.am

@@ -68 +68 @@
    minpoly.cc\
    misc_ip.cc\
-   mpsr_Error.cc\
-   mpsr_Get.cc\
-   mpsr_GetMisc.cc\
-   mpsr_GetPoly.cc\
-   mpsr_Put.cc\
-   mpsr_PutPoly.cc\
-   mpsr_Timer.cc\
-   mpsr_Tok.cc\
-   mpsr_sl.cc\
    ndbm.cc\
    newstruct.cc\
@@ -132 +123 @@
    mmalloc.h \
    omSingularConfig.h \
-   mpsr.h \
-   mpsr_Get.h \
-   mpsr_Put.h \
-   mpsr_Timer.h \
-   mpsr_Tok.h \
-   mpsr_sl.h \
    ndbm.h \
    newstruct.h \
@@ -158 +143 @@
 
 # plural_cmd.inc 
-nodist_libSingular_la_SOURCES = mpsr_Tok.inc iparith.inc
-nodist_libSingular_g_la_SOURCES = mpsr_Tok.inc iparith.inc
+nodist_libSingular_la_SOURCES = iparith.inc
+nodist_libSingular_g_la_SOURCES = iparith.inc
 
 noinst_HEADERS = version.h
@@ -176 +161 @@
 # handle all the generated *.inc
 
-noinst_PROGRAMS = gentable2 gentable1 feOptGen feOptES feOptTS
-
-gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
-gentable2_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
-gentable2_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-gentable2_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
-
+noinst_PROGRAMS = gentable1 feOptGen feOptES feOptTS
 
 gentable1_SOURCES = gentable.cc grammar.h tok.h table.h
@@ -364 +343 @@
 
 # These files are built first
-BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc mpsr_Tok.inc iparith.inc LIB/all.lib plural_cmd.inc \
+BUILT_SOURCES = feOpt.inc feOptTS.inc feOptES.inc iparith.inc LIB/all.lib plural_cmd.inc \
                 gftables MOD
 
@@ -384 +363 @@
 # plural_cmd.inc: iparith.inc
 
-mpsr_Tok.inc: gentable2
-        ${abs_builddir}/gentable2
-
-
 
 gftables: ${abs_top_srcdir}/factory/gftables