Changeset 9a4834 in git

Timestamp:

May 24, 2013, 12:09:08 AM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b5d6f029419b1616c60cb73fcd2c05ec0aa4ae9c

Parents:

b5c26ceea134a59045fa059dc743890650cc31af

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-05-24 00:09:08+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-05-24 14:45:27+02:00

Message:

Fixed building of gentable1, pyobject and feOpt{Gen,ES,TS} using shared compiler flags

File:

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

Singular/Makefile.am

@@ -183 +183 @@
 noinst_PROGRAMS = gentable1 feOptGen feOptES feOptTS
 
-CXXTEMPLFLAGS =-ftrapv ## -fno-implicit-templates
+# CXXTEMPLFLAGS =-ftrapv ## -fno-implicit-templates
 
 gentable1_SOURCES = gentable.cc grammar.h tok.h table.h
-gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
-gentable1_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-gentable1_CPPFLAGS = ${AM_CPPFLAGS} -DNDEBUG -DOM_NDEBUG
+# gentable1_CFLAGS = -O3 -fomit-frame-pointer ${PIPE}
+# gentable1_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
+gentable1_CPPFLAGS = ${AM_CPPFLAGS}
 
 feOptGen_SOURCES = feOptGen.cc feOptGen.h
-feOptGen_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptGen_CPPFLAGS = ${AM_CPPFLAGS} -DNDEBUG -DOM_NDEBUG
+# feOptGen_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
+feOptGen_CPPFLAGS = ${AM_CPPFLAGS}
 
 feOptES_SOURCES = feOptGen.cc feOptGen.h
-feOptES_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DNDEBUG -DOM_NDEBUG -DESINGULAR
+# feOptES_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
+feOptES_CPPFLAGS = ${AM_CPPFLAGS} -DESINGULAR
 
 feOptTS_SOURCES = feOptGen.cc feOptGen.h
-feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
-feOptTS_CPPFLAGS = ${AM_CPPFLAGS} -DNDEBUG -DOM_NDEBUG -DTSINGULAR
+# feOptTS_CXXFLAGS = -O3 -fomit-frame-pointer -Wextra -Wall -Wno-long-long ${PIPE} $(CXXTEMPLFLAGS)
+feOptTS_CPPFLAGS = ${AM_CPPFLAGS} -DTSINGULAR
 
 ########################### Singular* #########################
@@ -435 +435 @@
 
 pyobject_la_SOURCES = pyobject.cc
-pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
-pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
-
-pyobject_la_CXXFLAGS   = ${NODEBUGCXXFLAGS} @PYTHON_CSPEC@
-pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@
-
-pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version \
-  ${AMLDFLAGS} @PYTHON_LSPEC@
+# pyobject_la_CPPFLAGS   = ${AM_CPPFLAGS} ${NODEBUGDEFS}
+# pyobject_g_la_CPPFLAGS = ${AM_CPPFLAGS}
+
+pyobject_la_CXXFLAGS   = @PYTHON_CSPEC@ 
+# ${NODEBUGCXXFLAGS} 
+# pyobject_g_la_CXXFLAGS = ${DEBUGCXXFLAGS} @PYTHON_CSPEC@
+
+pyobject_la_LDFLAGS = -export-dynamic -shared -module -avoid-version ${AMLDFLAGS} @PYTHON_LSPEC@
+###  -export-dynamic -shared -module -avoid-version (add to all DMs?)