Changeset 125

Timestamp:

03/10/09 14:02:25 (15 years ago)

Author:

bhilburn

Message:

Header include directory now properly configured for system install, and
relavant implementation files are now compiling properly with it. Need to take
care of tinyxml and sqlite requirements before things should be back up and
running.

Location:

vtcross/branches/bhilburn

Files:

• configure.ac (modified) (1 diff)
• src/cognitive_engines/Makefile.am (modified) (1 diff)
• src/cognitive_engines/cbr.c (modified) (1 diff)
• src/cognitive_engines/cbr_demo.c (modified) (1 diff)
• src/include/Makefile.am (modified) (1 diff)
• src/include/vtcross (added)
• src/include/vtcross/Makefile.am (added)
• src/include/vtcross/cbr.h (moved) (moved from vtcross/branches/bhilburn/src/include/cbr.h)
• src/include/vtcross/components.h (moved) (moved from vtcross/branches/bhilburn/src/include/components.h)
• src/include/vtcross/containers.h (moved) (moved from vtcross/branches/bhilburn/src/include/containers.h)
• src/include/vtcross/libvtcross.h (moved) (moved from vtcross/branches/bhilburn/src/include/libvtcross.h)
• src/policy_engines/Makefile.am (modified) (1 diff)
• src/policy_engines/default_policy_engine.c (modified) (1 diff)
• src/policy_engines/policy_demo (added)

vtcross/branches/bhilburn/configure.ac

@@ -9 +9 @@
 
 AC_PROG_INSTALL
-AC_OUTPUT(Makefile doc/Makefile src/Makefile src/shell/Makefile
+AC_CONFIG_FILES(Makefile doc/Makefile src/Makefile src/shell/Makefile
           src/libvtcross/Makefile src/cognitive_engines/Makefile 
           src/policy_engines/Makefile src/service_management_layer/Makefile 
-          src/tinyxml/Makefile src/include/Makefile)
-
+          src/tinyxml/Makefile src/include/Makefile
+          src/include/vtcross/Makefile)
+AC_OUTPUT

vtcross/branches/bhilburn/src/cognitive_engines/Makefile.am

@@ +1 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
 bin_PROGRAMS = cbr_demo
 
 cbr_demo_SOURCES = cbr.c cbr_demo.c
 
+

vtcross/branches/bhilburn/src/cognitive_engines/cbr.c

@@ -7 +7 @@
 #include <stdio.h>
 
-#include "cbr.h"
+#include <vtcross/cbr.h>
 
 

vtcross/branches/bhilburn/src/cognitive_engines/cbr_demo.c

@@ -8 +8 @@
 #include <string.h>
 
-#include "cbr.h"
+#include <vtcross/cbr.h>
 
 //using namespace std;

vtcross/branches/bhilburn/src/include/Makefile.am

@@ +1 @@
+SUBDIRS = vtcross

vtcross/branches/bhilburn/src/policy_engines/Makefile.am

@@ +1 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
 bin_PROGRAMS = policy_demo
 

vtcross/branches/bhilburn/src/policy_engines/default_policy_engine.c

@@ -7 +7 @@
 #include <string.h>
 
-#include "cbr.h"
+#include <vtcross/cbr.h>
 
 #define CR_PORT 30002