Changeset 91


Ignore:
Timestamp:
Oct 6, 2005 12:57:08 PM (16 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/core/scew_extras.c

    r77 r91  
    1 #include "scew.h"
    2 
    3 #include "xelement.h"
    4 #include "xerror.h"
     1#include "scew/scew.h"
     2#include "scew/xelement.h"
     3#include "scew/xerror.h"
    54
    65#include <assert.h>
  • trunk/test/Makefile

    r84 r91  
     1# you need to change this to where your version of python is installed.
     2# tell make where to find python header files
     3RP_INSTALL_BASE = /opt/rappture
    14
    2 # tell make where to find the libscew sources
    3 SCEW_HEADERS    = /opt/rappture/include/scew
    4 LIB_SCEW_INCL   = -I $(SCEW_HEADERS)
    5 LIB_SCEW_FLAG   = -L/opt/rappture/lib -lscew
    6 #LIB_SCEW_FLAG  = -static -L/opt/rappture/lib -lscew
     5# tell make where to find the rappture dependency include files
     6INCL_RP_DEPS    = -I $(RP_INSTALL_BASE)/include
    77
    88# define the top of our directory structure
     
    4545INCLUDES_DIR    = $(RP_BASE)/include
    4646BIN_DIR         = $(RP_BASE)/bin
    47 LIB_DIR         = $(RP_BASE)/src
     47LIB_DIR         = $(RP_INSTALL_BASE)/lib # $(RP_BASE)/src
    4848SRC_DIR         = $(RP_BASE)/src
    4949TEST_DIR        = $(RP_BASE)/test
     
    9191
    9292RpLibrary_test: $(SRC_TEST)/RpLibrary_test.cc
    93         $(CXX) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(LIB_SCEW_INCL) -o $@ $^ $(LIB_RAPPTURE)
     93        $(CXX) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ $^ $(LIB_RAPPTURE)
    9494
    9595RpLibraryC_test: $(SRC_TEST)/RpLibraryC_test.c
    96         $(CC) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(LIB_SCEW_INCL) -o $@ $^ $(LIB_RAPPTURE)
     96        $(CC) $(DEBUG) $(INCL_CEE) $(INCL_CORE) $(INCL_RP_DEPS) -o $@ $^ $(LIB_RAPPTURE)
    9797
    9898RpLibraryF_test: $(SRC_TEST)/RpLibraryF_test.f
Note: See TracChangeset for help on using the changeset viewer.