X-Git-Url: http://git.maemo.org/git/?p=opencv;a=blobdiff_plain;f=apps%2Fhaartraining%2Fsrc%2FMakefile.in;fp=apps%2Fhaartraining%2Fsrc%2FMakefile.in;h=37c67305b4d9c71a3388a91233ebcba01128bd79;hp=225632fc74435ce5107bb77d5aa4ae16ea92820c;hb=80cd7b93506cc1926882d5fd08a2c74ee9359e29;hpb=467a270adf12425827305759c0c4ea8f5b2b3854

diff --git a/apps/haartraining/src/Makefile.in b/apps/haartraining/src/Makefile.in
index 225632f..37c6730 100644
--- a/apps/haartraining/src/Makefile.in
+++ b/apps/haartraining/src/Makefile.in
@@ -126,10 +126,14 @@ BUILD_DC1394_FALSE = @BUILD_DC1394_FALSE@
 BUILD_DC1394_TRUE = @BUILD_DC1394_TRUE@
 BUILD_FFMPEG_FALSE = @BUILD_FFMPEG_FALSE@
 BUILD_FFMPEG_TRUE = @BUILD_FFMPEG_TRUE@
+BUILD_GSTREAMER_FALSE = @BUILD_GSTREAMER_FALSE@
+BUILD_GSTREAMER_TRUE = @BUILD_GSTREAMER_TRUE@
 BUILD_GTK_FALSE = @BUILD_GTK_FALSE@
 BUILD_GTK_TRUE = @BUILD_GTK_TRUE@
 BUILD_IMAGEIO_FALSE = @BUILD_IMAGEIO_FALSE@
 BUILD_IMAGEIO_TRUE = @BUILD_IMAGEIO_TRUE@
+BUILD_OCTAVE_WRAPPERS_FALSE = @BUILD_OCTAVE_WRAPPERS_FALSE@
+BUILD_OCTAVE_WRAPPERS_TRUE = @BUILD_OCTAVE_WRAPPERS_TRUE@
 BUILD_PYTHON_WRAPPERS_FALSE = @BUILD_PYTHON_WRAPPERS_FALSE@
 BUILD_PYTHON_WRAPPERS_TRUE = @BUILD_PYTHON_WRAPPERS_TRUE@
 BUILD_QUICKTIME_FALSE = @BUILD_QUICKTIME_FALSE@
@@ -152,8 +156,10 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEBUG = @DEBUG@
 DEFS = @DEFS@
+DEF_CXXFLAGS = @DEF_CXXFLAGS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -164,6 +170,8 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FFMPEGLIBS = @FFMPEGLIBS@
 GREP = @GREP@
+GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+GSTREAMER_LIBS = @GSTREAMER_LIBS@
 GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 GTHREAD_LIBS = @GTHREAD_LIBS@
 GTK_CFLAGS = @GTK_CFLAGS@
@@ -182,11 +190,16 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
 MAKEINFO = @MAKEINFO@
+MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
+NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OCTAVE = @OCTAVE@
+OCTAVE_ARCH = @OCTAVE_ARCH@
+OCT_CXXFLAGS = @OCT_CXXFLAGS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -206,10 +219,12 @@ PY_CXXFLAGS = @PY_CXXFLAGS@
 QUICKTIME_CFLAGS = @QUICKTIME_CFLAGS@
 QUICKTIME_LIBS = @QUICKTIME_LIBS@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SWIG = @SWIG@
+SWIG_OCTAVE_OPT = @SWIG_OCTAVE_OPT@
 SWIG_PYTHON_LIBS = @SWIG_PYTHON_LIBS@
 SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@
 SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
@@ -273,6 +288,9 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+
+# use the default c++ flags
+AM_CXXFLAGS = @DEF_CXXFLAGS@
 lib_LIBRARIES = libcvhaartraining.a
 ALL_CV_LIBS = \
     libcvhaartraining.a                             \