Changeset 439

Timestamp:

08/26/09 17:19:39 (15 years ago)

Author:

bhilburn

Message:

Fixed local includes. In order for autofoo installs to work, the
install breaks.

Location:

vtcross/trunk/src

Files:

• libvtcross/swig/Makefile.am (modified) (1 diff)
• libvtcross/swig/libvtcross.i (modified) (2 diffs)
• service_management_layer/ServiceManagementLayer.cpp (modified) (2 diffs)

vtcross/trunk/src/libvtcross/swig/Makefile.am

@@ -15 +15 @@
 include $(top_srcdir)/Makefile.common
 
-
 BUILT_SOURCES = $(srcdir)/libvtcross_wrap.cpp
 SWIG_SOURCES = libvtcross.i
 
-INCLUDES = -I$(top_srcdir)/src/include/vtcross
-
+INCLUDES = -I$(top_srcdir)/src/include
 
 pkgpython_PYTHON = cross.py __init__.py

vtcross/trunk/src/libvtcross/swig/libvtcross.i

@@ -17 +17 @@
 %module cross
 %{
-#include "libvtcross.h"
-#include "containers.h"
+#include "vtcross/libvtcross.h"
+#include "vtcross/containers.h"
 %}
 
@@ -25 +25 @@
 %include "std_string.i"
 
-%include "containers.h"
-%include "libvtcross.h"
+%include "vtcross/containers.h"
+%include "vtcross/libvtcross.h"
 
 %apply const std::string & { std::string * };

vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp

@@ -27 +27 @@
 
 
+#include <cmath>
+#include <cstring>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <cstring>
 #include <stdint.h>
-
-#include "vtcross/common.h"
-
-#include "components.h"
-#include "vtcross/containers.h"
-#include "vtcross/debug.h"
-#include "vtcross/error.h"
-#include "vtcross/socketcomm.h"
-#include <cstring>
-#include <stdint.h>
-#include <math.h>
 
 #include <arpa/inet.h>
@@ -58 +48 @@
 #include "tinyxml/tinystr.h"
 
-#include "sqlite3.h"
+#include <sqlite3.h>
+
+#include "vtcross/debug.h"
+#include "vtcross/error.h"
+#include "vtcross/common.h"
+#include "vtcross/components.h"
+#include "vtcross/containers.h"
+#include "vtcross/socketcomm.h"
+
 
 typedef struct services_s *services_DB;