Skip to content
Browse files

further fixes to build system

- merged arithrings.m4 and plural.m4 into options.m4
- added new macro SING_CHECK_FACTORY in options.m4
- invoke SING_CHECK_FACTORY IN libpolys/configure.ac
- fixed the output of the macros in options.m4
- removed readcf.cc from the repo because it is generated
- generate factory.h and factoryconf.h in factory
  • Loading branch information...
1 parent 37ed001 commit 45e35b62b6f04314377865c4eb8cad555c42f584 @mohamed-barakat mohamed-barakat committed
Showing with 77 additions and 1,802 deletions.
  1. +2 −1 .gitignore
  2. +7 −0 factory/Makefile.am
  3. +0 −1,758 factory/readcf.cc
  4. +2 −1 libpolys/configure.ac
  5. +0 −21 m4/arithrings.m4
  6. +66 −0 m4/options.m4
  7. +0 −21 m4/plural.m4
View
3 .gitignore
@@ -10,8 +10,9 @@ LIB
*.la
.libs
doc/
-factory/readcf.c
+factory/readcf.cc
factory/ylwrap
+factory/gengftables
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
View
7 factory/Makefile.am
@@ -81,6 +81,8 @@ SOURCES = \
singext.cc \
parseutil.cc \
readcf.yy \
+ factory.h \
+ factoryconf.h \
ftmpl_inst.cc
libfactory_a_SOURCES = $(SOURCES)
@@ -194,6 +196,11 @@ gftables: gengftables
$(MKINSTALLDIRS) gftables
./gengftables
+.template.h:
+ ${srcdir}/bin/makeheader $< $@
+
+BUILT_SOURCES = factory.h factoryconf.h
+
# These files listed below are not used anywhere but are included in
# the distribution. So they will be tacked on to EXTRA_DIST.
View
1,758 factory/readcf.cc
0 additions, 1,758 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
3 libpolys/configure.ac
@@ -65,8 +65,9 @@ dnl esac
dnl AC_SUBST(INCLUDES)
SING_CHECK_P_PROCS
-SING_CHECK_PLURAL
SING_CHECK_ARITH_RINGS
+SING_CHECK_FACTORY
+SING_CHECK_PLURAL
AC_SUBST(LIBPREFIX)
View
21 m4/arithrings.m4
@@ -1,21 +0,0 @@
-AC_DEFUN([SING_CHECK_ARITH_RINGS],
-[
-AC_MSG_CHECKING(whether arithmetical rings should be enabled)
-
-AC_ARG_ENABLE(arith-rings,
-[ --enable-arith-rings Enable arithmetical rings
-],
-[if test $enableval = yes; then
- ENABLE_RINGS="yes"
- else
- ENABLE_RINGS="no"
- fi
-],[ENABLE_RINGS="yes"])
-
-if test x$ENABLE_RINGS = xyes; then
- AC_MSG_NOTICE([Arithmetical rings are enabled])
- AC_DEFINE(HAVE_RINGS,1,Enable arithmetical rings)
-fi
-
-AM_CONDITIONAL([ENABLE_RINGS],[test x$ENABLE_RINGS = xyes])
-])
View
66 m4/options.m4
@@ -0,0 +1,66 @@
+AC_DEFUN([SING_CHECK_ARITH_RINGS],
+[
+AC_MSG_CHECKING(whether arithmetical rings should be enabled)
+
+AC_ARG_ENABLE(arith-rings,
+[ --enable-arith-rings Enable arithmetical rings
+],
+[if test $enableval = yes; then
+ ENABLE_RINGS="yes"
+ else
+ ENABLE_RINGS="no"
+ fi
+],[ENABLE_RINGS="yes"])
+
+if test x$ENABLE_RINGS = xyes; then
+ AC_DEFINE(HAVE_RINGS,1,Enable arithmetical rings)
+fi
+
+AM_CONDITIONAL([ENABLE_RINGS],[test x$ENABLE_RINGS = xyes])
+AC_MSG_RESULT($ENABLE_RINGS)
+])
+
+AC_DEFUN([SING_CHECK_FACTORY],
+[
+AC_MSG_CHECKING(whether factory should be enabled)
+
+AC_ARG_ENABLE(factory,
+[ --enable-factory Enable factory
+],
+[if test $enableval = yes; then
+ ENABLE_FACTORY="yes"
+ else
+ ENABLE_FACTORY="no"
+ fi
+],[ENABLE_FACTORY="yes"])
+
+if test x$ENABLE_FACTORY = xyes; then
+ AC_DEFINE(HAVE_FACTORY,1,Enable factory)
+fi
+
+AM_CONDITIONAL([ENABLE_FACTORY],[test x$ENABLE_FACTORY = xyes])
+AC_MSG_RESULT($ENABLE_FACTORY)
+])
+
+AC_DEFUN([SING_CHECK_PLURAL],
+[
+AC_MSG_CHECKING(whether non-commutative subsystem should be enabled)
+
+AC_ARG_ENABLE(plural,
+[ --enable-plural Enable non-commutative subsystem
+],
+[if test $enableval = yes; then
+ ENABLE_PLURAL="yes"
+ else
+ ENABLE_PLURAL="no"
+ fi
+],[ENABLE_PLURAL="yes"])
+
+if test x$ENABLE_PLURAL = xyes; then
+ AC_DEFINE(HAVE_PLURAL,1,Enable non-commutative subsystem)
+fi
+
+AM_CONDITIONAL([ENABLE_PLURAL],[test x$ENABLE_PLURAL = xyes])
+
+AC_MSG_RESULT($ENABLE_PLURAL)
+])
View
21 m4/plural.m4
@@ -1,21 +0,0 @@
-AC_DEFUN([SING_CHECK_PLURAL],
-[
-AC_MSG_CHECKING(whether non-commutative subsystem should be enabled)
-
-AC_ARG_ENABLE(plural,
-[ --enable-plural Enable non-commutative subsystem
-],
-[if test $enableval = yes; then
- ENABLE_PLURAL="yes"
- else
- ENABLE_PLURAL="no"
- fi
-],[ENABLE_PLURAL="yes"])
-
-if test x$ENABLE_PLURAL = xyes; then
- AC_MSG_NOTICE([PLURAL is enabled])
- AC_DEFINE(HAVE_PLURAL,1,Enable non-commutative subsystem)
-fi
-
-AM_CONDITIONAL([ENABLE_PLURAL],[test x$ENABLE_PLURAL = xyes])
-])

0 comments on commit 45e35b6

Please sign in to comment.
Something went wrong with that request. Please try again.