Changeset 91 for trunk

Timestamp:

Oct 6, 2005 12:57:08 PM (18 years ago)

Author:

dkearney

Message:

fixes a few things i broke with the last update,
scew_extras.o should compile ok now
change the makefile in test so it knows where to find include files properly.

Location:

trunk

Files:

• src/core/scew_extras.c (modified) (1 diff)
• test/Makefile (modified) (3 diffs)

trunk/src/core/scew_extras.c

@@ -1 @@
-#include "scew.h"
-
-#include "xelement.h"
-#include "xerror.h"
+#include "scew/scew.h"
+#include "scew/xelement.h"
+#include "scew/xerror.h"
 
 #include <assert.h>

trunk/test/Makefile

@@ +1 @@
+# you need to change this to where your version of python is installed.
+# tell make where to find python header files
+RP_INSTALL_BASE = /opt/rappture
 
-# tell make where to find the libscew sources
-SCEW_HEADERS    = /opt/rappture/include/scew
-LIB_SCEW_INCL   = -I $(SCEW_HEADERS)
-LIB_SCEW_FLAG   = -L/opt/rappture/lib -lscew
-#LIB_SCEW_FLAG  = -static -L/opt/rappture/lib -lscew
+# tell make where to find the rappture dependency include files
+INCL_RP_DEPS    = -I $(RP_INSTALL_BASE)/include
 
 # define the top of our directory structure
@@ -45 +45 @@
 INCLUDES_DIR    = $(RP_BASE)/include
 BIN_DIR         = $(RP_BASE)/bin
-LIB_DIR         = $(RP_BASE)/src
+LIB_DIR         = $(RP_INSTALL_BASE)/lib # $(RP_BASE)/src
 SRC_DIR         = $(RP_BASE)/src
 TEST_DIR        = $(RP_BASE)/test
@@ -91 +91 @@
 
 RpLibrary_test: $(SRC_TEST)/RpLibrary_test.cc
-        $(CXX) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(LIB_SCEW_INCL) -o $@ $^ $(LIB_RAPPTURE)
+        $(CXX) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ $^ $(LIB_RAPPTURE)
 
 RpLibraryC_test: $(SRC_TEST)/RpLibraryC_test.c
-        $(CC) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(LIB_SCEW_INCL) -o $@ $^ $(LIB_RAPPTURE)
+        $(CC) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ $^ $(LIB_RAPPTURE)
 
 RpLibraryF_test: $(SRC_TEST)/RpLibraryF_test.f