projects
/
opencv
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to 2.0.0 tree from current Fremantle build
[opencv]
/
interfaces
/
swig
/
Makefile.am
diff --git
a/interfaces/swig/Makefile.am
b/interfaces/swig/Makefile.am
index
257103c
..
d464b9e
100644
(file)
--- 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 = \
# 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
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