X-Git-Url: http://git.maemo.org/git/?p=opencv;a=blobdiff_plain;f=interfaces%2Fswig%2Fpython%2FMakefile.am;fp=interfaces%2Fswig%2Fpython%2FMakefile.am;h=ce4a89db3e523a032b539cc43537ebfbedd82f5f;hp=63a0ab7c3d0124a3a091b5f8f31c50ec500bf1f4;hb=e4c14cdbdf2fe805e79cd96ded236f57e7b89060;hpb=454138ff8a20f6edb9b65a910101403d8b520643

diff --git a/interfaces/swig/python/Makefile.am b/interfaces/swig/python/Makefile.am
index 63a0ab7..ce4a89d 100644
--- a/interfaces/swig/python/Makefile.am
+++ b/interfaces/swig/python/Makefile.am
@@ -4,21 +4,18 @@
 # depending on the Automake conditionals set by configure, we will build the various
 # script language interfaces that SWIG is capable of generating wrappers for
 
-CV_INCLUDES = \
-  -I$(top_srcdir)/cv/include         \
-  -I$(top_srcdir)/cxcore/include     \
-  -I$(top_srcdir)/ml/include         \
-  -I$(top_srcdir)/otherlibs/highgui
+CV_INCLUDES = -I$(top_srcdir)/include/opencv -I$(srcdir)
 
 AM_CPPFLAGS = \
   $(CV_INCLUDES)                     \
   -DCV_NO_BACKWARD_COMPATIBILITY
 
-AM_CXXFLAGS = @PY_CXXFLAGS@
-
 noinst_PYTHON = setup-for-win.py
 
 EXTRA_DIST = \
+  \
+  CMakeLists.txt   \
+  \
   __init__.py      \
   \
   cv.py            \
@@ -28,9 +25,11 @@ EXTRA_DIST = \
   \
   cv.i             \
   cvaliases.i      \
+  cvaliases_autogen.i \
   cvarr.i          \
   cvseq.i          \
   cvshadow.i       \
+  cvswigmacros.i   \
   ml.i             \
   highgui.i        \
   imagedata.i      \
@@ -57,8 +56,8 @@ EXTRA_DIST = \
 if UPDATE_SWIG_WRAPPERS
 
 # this rule creates the Python wrapper sources for cxcore and cv
-_cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i pyhelpers.i       \
-         nointpb.i pytypemaps.i cvshadow.i cvseq.i              \
+_cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i cvaliases_autogen.i pyhelpers.i \
+         nointpb.i pytypemaps.i cvshadow.i cvseq.i cvswigmacros.i \
          error.cpp error.h                                      \
          pyhelpers.h cvshadow.h pycvseq.hpp                     \
          $(top_srcdir)/interfaces/swig/general/cv.i             \
@@ -74,29 +73,29 @@ _cv.cpp: cv.i imagedata.i cvarr.i cvaliases.i pyhelpers.i       \
 	$(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -o $@ $<
 
 # this rule creates the Python wrapper sources for ml
-_ml.cpp: ml.i nointpb.i pytypemaps.i                            \
+_ml.cpp: ml.i nointpb.i pytypemaps.i cvswigmacros.i             \
               $(top_srcdir)/interfaces/swig/general/typemaps.i  \
               $(top_srcdir)/interfaces/swig/general/memory.i    \
-              $(top_srcdir)/ml/include/ml.h                     \
+              $(top_srcdir)/include/opencv/ml.h                 \
               Makefile.in
 	$(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
 # this rule creates the Python wrapper sources for highgui
-_highgui.cpp: highgui.i nointpb.i pytypemaps.i                  \
+_highgui.cpp: highgui.i nointpb.i pytypemaps.i cvswigmacros.i   \
               $(top_srcdir)/interfaces/swig/general/highgui.i   \
               $(top_srcdir)/interfaces/swig/general/typemaps.i  \
               $(top_srcdir)/interfaces/swig/general/memory.i    \
-              $(top_srcdir)/otherlibs/highgui/highgui.h         \
+              $(top_srcdir)/include/opencv/highgui.h            \
               Makefile.in
 	$(SWIG) $(SWIG_PYTHON_OPT) $(CV_INCLUDES) -DSKIP_INCLUDES -o $@ $<
 
 CV_HEADER_FILES = \
-  $(top_srcdir)/cxcore/include/cxtypes.h \
-  $(top_srcdir)/cxcore/include/cxcore.h  \
-  $(top_srcdir)/cv/include/cvtypes.h \
-  $(top_srcdir)/cv/include/cv.h
+  $(top_srcdir)/include/opencv/cxtypes.h \
+  $(top_srcdir)/include/opencv/cxcore.h  \
+  $(top_srcdir)/include/opencv/cvtypes.h \
+  $(top_srcdir)/include/opencv/cv.h
 
-cvaliases.i: $(CV_HEADER_FILES) Makefile.in
+cvaliases_autogen.i: $(CV_HEADER_FILES) Makefile.in
 	$(PYTHON) $(top_srcdir)/utils/extract_aliases.py $(CV_HEADER_FILES) > $@
 
 endif
@@ -106,10 +105,9 @@ endif
 
 if BUILD_PYTHON_WRAPPERS
 
-#pkgpython_LTLIBRARIES = _cv.la _highgui.la
-pkgpython_LTLIBRARIES = _cv.la _ml.la _highgui.la
+pkgpyexec_LTLIBRARIES = _cv.la _ml.la _highgui.la
 
-pkgpython_PYTHON = \
+pkgpyexec_PYTHON = \
   __init__.py    \
   cv.py          \
   ml.py          \
@@ -120,22 +118,19 @@ pkgpython_PYTHON = \
 _cv_la_SOURCES    = _cv.cpp error.cpp error.h pyhelpers.cpp pyhelpers.h \
                     pycvseq.hpp cvshadow.cpp cvshadow.h \
                     cv.i imagedata.i cvarr.i nointpb.i pytypemaps.i cvseq.i cvshadow.i
-_cv_la_CXXFLAGS   = $(PYTHON_CSPEC)
-_cv_la_LIBADD     = $(top_builddir)/cv/src/libcv.la
-_cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-                    -L$(SWIG_PYTHON_LIBS)
+_cv_la_CXXFLAGS   = $(PYTHON_CSPEC) $(AM_CXXFLAGS)
+_cv_la_LIBADD     = $(top_builddir)/src/libcv.la $(top_builddir)/src/libcxcore.la
+_cv_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) $(SWIG_PYTHON_LIBS) @LDFLAGS@
 
 _ml_la_SOURCES    = _ml.cpp pyhelpers.cpp pyhelpers.h
-_ml_la_CXXFLAGS   = $(PYTHON_CSPEC)
-_ml_la_LIBADD     = $(top_builddir)/ml/src/libml.la
-_ml_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-                    -L$(SWIG_PYTHON_LIBS)
+_ml_la_CXXFLAGS   = $(PYTHON_CSPEC) $(AM_CXXFLAGS)
+_ml_la_LIBADD     = $(top_builddir)/src/libml.la
+_ml_la_LDFLAGS    = -module -avoid-version -no-undefined $(PYTHON_LSPEC) $(SWIG_PYTHON_LIBS) @LDFLAGS@
 
 _highgui_la_SOURCES    = _highgui.cpp pyhelpers.cpp pyhelpers.h \
                          highgui.i
-_highgui_la_CXXFLAGS     = $(PYTHON_CSPEC)
-_highgui_la_LIBADD       = $(top_builddir)/otherlibs/highgui/libhighgui.la
-_highgui_la_LDFLAGS      = -module -avoid-version -no-undefined $(PYTHON_LSPEC) \
-                           -L$(SWIG_PYTHON_LIBS)
+_highgui_la_CXXFLAGS     = $(PYTHON_CSPEC) $(AM_CXXFLAGS)
+_highgui_la_LIBADD       = $(top_builddir)/src/libhighgui.la
+_highgui_la_LDFLAGS      = -module -avoid-version -no-undefined $(PYTHON_LSPEC) $(SWIG_PYTHON_LIBS) @LDFLAGS@
 
 endif