X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=interfaces%2Fswig%2FMakefile.am;fp=interfaces%2Fswig%2FMakefile.am;h=d464b9e1b3c3b400efcd2aa11630d2772b147108;hb=e4c14cdbdf2fe805e79cd96ded236f57e7b89060;hp=257103c635469d3e7859b42c6ba72587de052cd6;hpb=454138ff8a20f6edb9b65a910101403d8b520643;p=opencv

diff --git a/interfaces/swig/Makefile.am b/interfaces/swig/Makefile.am
index 257103c..d464b9e 100644
--- a/interfaces/swig/Makefile.am
+++ b/interfaces/swig/Makefile.am
@@ -5,14 +5,18 @@
 # 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)/otherlibs/highgui
+  -I$(top_srcdir)/include/opencv
 
 AM_CPPFLAGS = \
   $(CV_INCLUDES)                     \
   -DCV_NO_BACKWARD_COMPATIBILITY
 
-SUBDIRS = filtered general python octave
+if BUILD_OCTAVE_WRAPPERS
+  TMP_OCTAVE_DIR = octave
+else
+  TMP_OCTAVE_DIR =
+endif
 
-EXTRA_DIST = README
+SUBDIRS = filtered general python $(TMP_OCTAVE_DIR)
+
+EXTRA_DIST = README CMakeLists.txt