Several inter-twined changes: -

Make system now looks in

  bindings/build/$(THORN)/make.code.defn

for additional objects to be built and linked into a library.

The CST puts a file cctk_ThornBindings.c into this directory.

This should solve the empty library problem - PR 638.

The interface to the internal routine CCTKi_RegisterThorn has changed.
The new file created by the CST uses the correct new syntax, ands passes
information about ancestors and friends into the flesh.  Hence the
commit of two separate things in one commit, as the both changes
require a -rebuild.

Please do a

make <config>-rebuild

or your code will not compile.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@2199 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 20 insertions, 4 deletions

diff --git a/src/include/cctki_ActiveThorns.h b/src/include/cctki_ActiveThorns.h
index 13568a79..a72fe854 100644
--- a/src/include/cctki_ActiveThorns.h
+++ b/src/include/cctki_ActiveThorns.h
@@ -11,14 +11,30 @@
 #ifndef __CCTKI_ACTIVETHORNS_H_
 #define __CCTKI_ACTIVETHORNS_H_
 
-#include <stdio.h>
-#include "SKBinTree.h"   
-
 #ifdef __cplusplus 
 extern "C" {
 #endif
 
-int CCTKi_RegisterThorn(const char *name, const char *imp);
+struct iFuncList
+{
+  const char *keyword;
+  const char *signature;
+  void (*func)(void);
+};
+
+union iAttributeData
+{
+  const char **StringList;
+  const struct iFuncList *FuncList;
+};
+
+struct iAttributeList
+{
+  const char *attribute;
+  union iAttributeData AttributeData;
+};
+
+int CCTKi_RegisterThorn(const struct iAttributeList *attributes);
 int CCTKi_ActivateThorn(const char *name);
 int CCTKi_PrintThorns(FILE *file, const char *format, int active);
 int CCTKi_PrintImps(FILE *file, const char *format, int active);