Changeset 386

Show
Ignore:
Timestamp:
07/28/09 10:56:50 (15 years ago)
Author:
trnewman
Message:

Improving swig installation.

Location:
vtcross/trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • vtcross/trunk/src/include/vtcross/containers.h

    r299 r386  
    8686    int32_t componentID; 
    8787    uint16_t num_conds; 
    88     //bool cond_flag; 
    8988    std::string parameter; 
    9089    std::string input[10]; 

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

    r377 r386  
    88 
    99 
    10 pkgpython_PYTHON = cross.py 
     10pkgpython_PYTHON = cross.py __init__.py 
    1111pkgpyexec_LTLIBRARIES = _cross.la 
    12 _cross_la_SOURCES = $(srcdir)/libvtcross_wrap.cpp $(SWIG_SOURCES) 
     12 
     13_cross_la_SOURCES = libvtcross_wrap.cpp $(SWIG_SOURCES) 
    1314_cross_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src/libvtcross 
    14 _cross_la_LDFLAGS = -module 
    15 _cross_la_LIBADD = $(CROSS_LA)  
     15_cross_la_LDFLAGS = -module -avoid-version 
     16_cross_la_LIBADD = $(CROSS_LA) $(CROSS_SOCKETCOMM_LA) 
    1617 
    1718$(srcdir)/libvtcross_wrap.cpp : $(SWIG_SOURCES)