merge of '6347af950ec1a0ff98214a570984c55df668fad7'
[vuplus_openembedded] / packages / opencv / opencv / debian / 020_python_linking.diff
1 Index: opencv-1.0.0/interfaces/swig/python/Makefile.am
2 ===================================================================
3 --- opencv-1.0.0.orig/interfaces/swig/python/Makefile.am        2008-06-09 00:03:26.000000000 +0000
4 +++ opencv-1.0.0/interfaces/swig/python/Makefile.am     2008-06-09 00:04:02.000000000 +0000
5 @@ -105,14 +105,14 @@
6                      pycvseq.hpp cvshadow.cpp cvshadow.h \
7                      cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
8  _cv_la_CXXFLAGS   = $(PYTHON_CSPEC)
9 -_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la
10 +_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la $(top_builddir)/cxcore/src/libcxcore.la
11  _cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
12                      -L$(SWIG_PYTHON_LIBS)
13  
14  _highgui_la_SOURCES    = _highgui.cpp pyhelpers.cpp pyhelpers.h \
15                           highgui.i
16  _highgui_la_CXXFLAGS     = $(PYTHON_CSPEC)
17 -_highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la
18 +_highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la $(top_builddir)/cv/src/libcv.la $(top_builddir)/cxcore/src/libcxcore.la
19  _highgui_la_LDFLAGS      = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
20                             -L$(SWIG_PYTHON_LIBS)
21