Changeset b9e11ba in git

Timestamp:

Sep 27, 2011, 2:08:00 PM (12 years ago)

Author:

Volker Braun <vbraun.name@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

d44785a8156c784941520a04a858b1fab8213861

Parents:

de7521eef6abc64c1312e46961fc93fb053d9bd5

git-author:

Volker Braun <vbraun.name@gmail.com>2011-09-27 14:08:00+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:40+01:00

Message:

FIX: race with generated include files (in particular feOpt.inc).
Some general cleanup in Singular/Makefile.am

File:

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

Singular/Makefile.am

@@ -1 @@
-lib_LIBRARIES = libSingular.a libSingular_g.a
-
-all: libSingular.a libSingular_g.a Singular Singularg
-
 # ACLOCAL_AMFLAGS = -I m4
-
 # PIPE = -pipe
 # ???
@@ -18 +13 @@
 NODEBUGDEFS = -DNDEBUG -DOM_NDEBUG 
 
-
-
-
 CXXTEMPLFLAGS = --no-exceptions ## -fno-implicit-templates
 
-
-
 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) $(FACTORY_CFLAGS) $(NTL_CFLAGS)
-AM_CPPFLAGS     = -DHAVE_CONFIG_H
-
-########################### liSingular* #########################
+
+########################### libSingular* #########################
+
+lib_LIBRARIES = libSingular.a libSingular_g.a
 
 libSingular_a_CFLAGS   = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE}
 libSingular_g_a_CFLAGS = -g -Wextra -Wall -Wno-long-long -pedantic ${PIPE}
-## -pedantic
 
 libSingular_a_CXXFLAGS   = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
@@ -101 +91 @@
    walk_ip.cc\
    wrapper.cc\
-   fereadl.c mmstd.c claptmpl.cc feOpt.h
-   
-#   tesths.cc
+   fereadl.c mmstd.c claptmpl.cc
 
 
@@ -169 +157 @@
    utils.h \
    walk.h \
-   feOpt.inc mpsr_Tok.inc iparith.inc feOptTS.inc feOptES.inc
+   feOpt.h feOpt.inc \
+   mpsr_Tok.inc iparith.inc feOptTS.inc feOptES.inc
 
 
@@ -182 +171 @@
 
 # noinst_HEADERS = feOpt.h
-## TODO: install all the *.inc?!
-
-#EXTRA_libSingular_a_SOURCES = feOpt.h
-#EXTRA_libSingular_g_a_SOURCES = feOpt.h
-
-BUILT_SOURCES=feOpt.inc mpsr_Tok.inc iparith.inc feOptTS.inc feOptES.inc
-# plural_cmd.inc
+## TODO: install all the *.inc?!  
+## If not, move feOpt.h to SOURCES and remove *inc from HEADERS
 
 #########################################################
@@ -195 +179 @@
 AM_LDFLAGS = -L${top_builddir}/Singular -L${top_builddir}/numeric -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
 
-EXTRA_PROGRAMS=gentable2 gentable1 feOpt feOptES feOptTS
+EXTRA_PROGRAMS = gentable2 gentable1 feOpt feOptES feOptTS
 
 gentable2_SOURCES = gentable2.cc grammar.h tok.h table.h
@@ -211 +195 @@
 
 # plural_cmd.inc: iparith.inc                          
-                                 
+
 feOpt_SOURCES = feOptGen.cc feOptGen.h
 feOpt_CXXFLAGS = -O3 -fomit-frame-pointer --no-rtti -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
@@ -268 +252 @@
 #########################################################
 
-CLEANFILES = $(TESTS) $(EXTRA_PROGRAMS)
-
-
-#########################################################
-
-#mpsr_Tok.cc: mpsr_Tok.inc
-#iparith.cc: iparith.inc
-#cntrlc.cc: feOpt.inc
-#misc_ip.cc: feOpt.inc
+BUILT_SOURCES = feOpt.inc mpsr_Tok.inc iparith.inc feOptTS.inc feOptES.inc  # files are built first
+# plural_cmd.inc
+
+CLEANFILES = $(TESTS) $(EXTRA_PROGRAMS) $(BUILT_SOURCES)
 
 feOpt.inc: feOpt