Changeset 502f5f6 in git

Timestamp:

May 23, 2011, 4:45:53 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

c44985a8f5ca67af1ce38a5a3fce467f6da4cc00

Parents:

cfb5000f6e3cef21c58dd8a3885a3762c287382b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-23 16:45:53+02:00

git-committer:

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

Message:

CHG: trying to fix compilation problems due to factory.h

Location:

factory

Files:

• Makefile.am (modified) (3 diffs)
• gengftables-conway.cc (modified) (2 diffs)
• gengftables.cc (modified) (1 diff)

factory/Makefile.am

@@ -2 +2 @@
 
 INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
+
 
 lib_LIBRARIES = libfactory.a libfactory_g.a
@@ -191 +192 @@
                 ftmpl_matrix.h
 
+# TODO:
+# gengftables needs libfactory.a and factory.h AND is needed for generating gftable...
+# somehow the current deps. seem to be broken... 
+# moreover factory.h needs a lot more generated headers, which wouldn't be installed yet
+
 noinst_PROGRAMS = gengftables
+gengftables_SOURCES = gengftables-conway.cc
+
+#### TODO: the following would not work...???!
+####gengftables_includedir=-I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir} -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS} ${NTL_CFLAGS}
+
 gengftables_LDADD = -L${builddir} -lfactory $(GMP_LIBS) $(NTL_LIBS)
 
-gengftables_SOURCES = gengftables-conway.cc
+gengftables: factory.h factoryconf.h
 
 gftablesdir=$(datadir)/gftables
@@ -234 +245 @@
 
 .template.h:
-                ${srcdir}/bin/makeheader $< $@
+        ${srcdir}/bin/makeheader $< $@
 
 BUILT_SOURCES = factory.h factoryconf.h

factory/gengftables-conway.cc

@@ -11 +11 @@
 //}}}
 
-#include <factory.h>
+#include "factory.h"
 
 #ifdef HAVE_IOSTREAM
@@ -29 +29 @@
 
 
-#include <cf_assert.h>
-#include <gf_tabutil.h>
+#include "cf_assert.h"
+#include "gf_tabutil.h"
 
 using namespace std;

factory/gengftables.cc

@@ -21 +21 @@
 #endif
 
-#include <factory.h>
-
-#include <cf_assert.h>
-#include <gf_tabutil.h>
+#include "factory.h"
+
+#include "cf_assert.h"
+#include "gf_tabutil.h"
 
 //{{{ constants