Changeset 45e35b in git

Timestamp:

May 11, 2011, 4:49:43 PM (12 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '7725b5cfc1eaf99630826ecc59f559d3b6831c24')

Children:

adb2edca6f47570822acf20e418c48a4763eab41

Parents:

37ed0010c7b090336b34c30c29afd5506a1ddc80

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-11 16:49:43+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:04+01:00

Message:

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

Files:

• .gitignore (modified) (1 diff)
• factory/Makefile.am (modified) (2 diffs)
• factory/readcf.cc (deleted)
• libpolys/configure.ac (modified) (1 diff)
• m4/arithrings.m4 (deleted)
• m4/options.m4 (added)
• m4/plural.m4 (deleted)

.gitignore

@@ -11 +11 @@
 .libs
 doc/
-factory/readcf.c
+factory/readcf.cc
 factory/ylwrap
+factory/gengftables
 m4/libtool.m4
 m4/ltoptions.m4

factory/Makefile.am

@@ -82 +82 @@
                 parseutil.cc \
                 readcf.yy \
+                factory.h \
+                factoryconf.h \
                 ftmpl_inst.cc
 
@@ -195 +197 @@
                 ./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.

libpolys/configure.ac

@@ -66 +66 @@
 
 SING_CHECK_P_PROCS
+SING_CHECK_ARITH_RINGS
+SING_CHECK_FACTORY
 SING_CHECK_PLURAL
-SING_CHECK_ARITH_RINGS
 
 AC_SUBST(LIBPREFIX)