projects / opencv / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update the trunk to the OpenCV's CVS (2008-07-14)
[opencv] / otherlibs / highgui / Makefile.in
diff --git a/otherlibs/highgui/Makefile.in b/otherlibs/highgui/Makefile.in
index 0a56d98..d6e666e 100644 (file)
--- a/otherlibs/highgui/Makefile.in
+++ b/otherlibs/highgui/Makefile.in
@@ -67,24 +67,28 @@ am__lib_highgui_la_SOURCES_DIST = bitstrm.cpp grfmt_base.cpp \
        grfmt_bmp.cpp grfmt_jpeg.cpp grfmt_png.cpp grfmt_pxm.cpp \
        grfmt_jpeg2000.cpp grfmt_exr.cpp grfmt_sunras.cpp \
        grfmt_tiff.cpp image.cpp loadsave.cpp precomp.cpp utils.cpp \
-       cvcap.cpp window.cpp cvcap_dc1394.cpp cvcap_v4l.cpp \
-       cvcap_ffmpeg.cpp cvcap_qt.cpp cvcap_xine.cpp window_gtk.cpp \
-       window_carbon.cpp grfmt_imageio.cpp
+       cvcap.cpp cvcap_images.cpp window.cpp cvcap_dc1394.cpp \
+       cvcap_v4l.cpp cvcap_ffmpeg.cpp cvcap_gstreamer.cpp \
+       gstappsink.c cvcap_qt.cpp cvcap_xine.cpp window_gtk.cpp \
+       window_carbon.cpp grfmt_imageio.cpp cvcap_unicap.cpp
 @BUILD_DC1394_TRUE@am__objects_1 = cvcap_dc1394.lo
 @BUILD_V4L_TRUE@am__objects_2 = cvcap_v4l.lo
 @BUILD_FFMPEG_TRUE@am__objects_3 = cvcap_ffmpeg.lo
-@BUILD_QUICKTIME_TRUE@am__objects_4 = cvcap_qt.lo
-@BUILD_XINE_TRUE@am__objects_5 = cvcap_xine.lo
-@BUILD_GTK_TRUE@am__objects_6 = window_gtk.lo
-@BUILD_CARBON_TRUE@am__objects_7 = window_carbon.lo
-@BUILD_IMAGEIO_TRUE@am__objects_8 = grfmt_imageio.lo
+@BUILD_GSTREAMER_TRUE@am__objects_4 = cvcap_gstreamer.lo gstappsink.lo
+@BUILD_QUICKTIME_TRUE@am__objects_5 = cvcap_qt.lo
+@BUILD_XINE_TRUE@am__objects_6 = cvcap_xine.lo
+@BUILD_GTK_TRUE@am__objects_7 = window_gtk.lo
+@BUILD_CARBON_TRUE@am__objects_8 = window_carbon.lo
+@BUILD_IMAGEIO_TRUE@am__objects_9 = grfmt_imageio.lo
+@BUILD_UNICAP_TRUE@am__objects_10 = cvcap_unicap.lo
 am_lib_highgui_la_OBJECTS = bitstrm.lo grfmt_base.lo grfmt_bmp.lo \
        grfmt_jpeg.lo grfmt_png.lo grfmt_pxm.lo grfmt_jpeg2000.lo \
        grfmt_exr.lo grfmt_sunras.lo grfmt_tiff.lo image.lo \
-       loadsave.lo precomp.lo utils.lo cvcap.lo window.lo \
-       $(am__objects_1) $(am__objects_2) $(am__objects_3) \
+       loadsave.lo precomp.lo utils.lo cvcap.lo cvcap_images.lo \
+       window.lo $(am__objects_1) $(am__objects_2) $(am__objects_3) \
        $(am__objects_4) $(am__objects_5) $(am__objects_6) \
-       $(am__objects_7) $(am__objects_8)
+       $(am__objects_7) $(am__objects_8) $(am__objects_9) \
+       $(am__objects_10)
 lib_highgui_la_OBJECTS = $(am_lib_highgui_la_OBJECTS)
 libhighgui_la_DEPENDENCIES = lib_highgui.la \
        $(top_builddir)/cxcore/src/libcxcore.la \
@@ -137,14 +141,20 @@ 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@
 BUILD_QUICKTIME_TRUE = @BUILD_QUICKTIME_TRUE@
+BUILD_UNICAP_FALSE = @BUILD_UNICAP_FALSE@
+BUILD_UNICAP_TRUE = @BUILD_UNICAP_TRUE@
 BUILD_V4L_FALSE = @BUILD_V4L_FALSE@
 BUILD_V4L_TRUE = @BUILD_V4L_TRUE@
 BUILD_XINE_FALSE = @BUILD_XINE_FALSE@
@@ -163,6 +173,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEBUG = @DEBUG@
 DEFS = @DEFS@
+DEF_CXXFLAGS = @DEF_CXXFLAGS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
@@ -175,6 +186,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@
@@ -193,11 +206,16 @@ LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_VERSION = @LT_VERSION@
 MAKEINFO = @MAKEINFO@
+MKOCTFILE = @MKOCTFILE@
 MMAJOR = @MMAJOR@
 MMINOR = @MMINOR@
 MSUBMINOR = @MSUBMINOR@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OCTAVE = @OCTAVE@
+OCTAVE_ARCH = @OCTAVE_ARCH@
+OCTAVE_INCFLAGS = @OCTAVE_INCFLAGS@
+OCT_CXXFLAGS = @OCT_CXXFLAGS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -221,10 +239,15 @@ 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@
 SWIG_VERSION = @SWIG_VERSION@
+UCIL_PACKAGE_CFLAGS = @UCIL_PACKAGE_CFLAGS@
+UCIL_PACKAGE_LIBS = @UCIL_PACKAGE_LIBS@
+UNICAP_PACKAGE_CFLAGS = @UNICAP_PACKAGE_CFLAGS@
+UNICAP_PACKAGE_LIBS = @UNICAP_PACKAGE_LIBS@
 UPDATE_SWIG_WRAPPERS_FALSE = @UPDATE_SWIG_WRAPPERS_FALSE@
 UPDATE_SWIG_WRAPPERS_TRUE = @UPDATE_SWIG_WRAPPERS_TRUE@
 VERSION = @VERSION@
@@ -284,21 +307,27 @@ 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@
 EXTRA_DIST = highgui.dsp highgui.vcproj highgui.rc resource.h    \
     cvcap_cmu.cpp cvcap_tyzx.cpp cvcap_vfw.cpp cvcap_mil.cpp     \
     cvcap_qt.cpp cvcap_dc1394.cpp cvcap_ffmpeg.cpp               \
-    cvcap_v4l.cpp cvcap_xine.cpp                                 \
+    cvcap_v4l.cpp cvcap_xine.cpp cvcap_images.cpp                \
+    cvcap_unicap.cpp                                             \
     window_carbon.cpp window_gtk.cpp window_w32.cpp              \
     grfmt_imageio.cpp
 
 INCLUDES = -I. -I$(top_srcdir)/cxcore/include \
     -I$(top_srcdir)/cv/include @GTHREAD_CFLAGS@ @GTK_CFLAGS@ \
-    @QUICKTIME_CFLAGS@ @CARBON_CFLAGS@
+    @GSTREAMER_CFLAGS@ @QUICKTIME_CFLAGS@ @CARBON_CFLAGS@    \
+    @UNICAP_PACKAGE_CFLAGS@ @UCIL_PACKAGE_CFLAGS@
 
 noinst_HEADERS = \
     _highgui.h bitstrm.h grfmt_base.h grfmt_bmp.h \
-    grfmt_jpeg.h grfmt_jpeg2000.h grfmt_exr.h grfmt_imageio.h \
-    grfmt_pxm.h grfmt_png.h grfmt_sunras.h grfmt_tiff.h grfmts.h utils.h
+    grfmt_jpeg.h grfmt_jpeg2000.h grfmt_exr.h grfmt_imageio.h      \
+    grfmt_pxm.h grfmt_png.h grfmt_sunras.h grfmt_tiff.h grfmts.h   \
+    utils.h gstappsink.h
 
 noinst_LTLIBRARIES = lib_highgui.la
 lib_LTLIBRARIES = libhighgui.la
@@ -306,10 +335,14 @@ lib_LTLIBRARIES = libhighgui.la
 @BUILD_DC1394_TRUE@TMP_DC1394 = cvcap_dc1394.cpp
 @BUILD_V4L_FALSE@TMP_V4L = 
 @BUILD_V4L_TRUE@TMP_V4L = cvcap_v4l.cpp
+@BUILD_UNICAP_FALSE@TMP_UNICAP = 
+@BUILD_UNICAP_TRUE@TMP_UNICAP = cvcap_unicap.cpp
 @BUILD_FFMPEG_FALSE@TMP_FFMPEG = 
 @BUILD_FFMPEG_TRUE@TMP_FFMPEG = cvcap_ffmpeg.cpp
 @BUILD_XINE_FALSE@TMP_XINE = 
 @BUILD_XINE_TRUE@TMP_XINE = cvcap_xine.cpp
+@BUILD_GSTREAMER_FALSE@TMP_GSTREAMER = 
+@BUILD_GSTREAMER_TRUE@TMP_GSTREAMER = cvcap_gstreamer.cpp gstappsink.c
 @BUILD_QUICKTIME_FALSE@TMP_QT = 
 @BUILD_QUICKTIME_TRUE@TMP_QT = cvcap_qt.cpp
 @BUILD_CARBON_FALSE@TMP_CARBON = 
@@ -321,12 +354,13 @@ lib_LTLIBRARIES = libhighgui.la
 
 # convenience library
 lib_highgui_la_SOURCES = \
-    bitstrm.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp      \
-    grfmt_png.cpp grfmt_pxm.cpp grfmt_jpeg2000.cpp grfmt_exr.cpp \
-    grfmt_sunras.cpp grfmt_tiff.cpp image.cpp loadsave.cpp       \
-    precomp.cpp utils.cpp cvcap.cpp window.cpp                   \
-    $(TMP_DC1394) $(TMP_V4L) $(TMP_FFMPEG) $(TMP_QT)             \
-    $(TMP_XINE) $(TMP_GTK) $(TMP_CARBON) $(TMP_IMAGEIO)
+    bitstrm.cpp grfmt_base.cpp grfmt_bmp.cpp grfmt_jpeg.cpp       \
+    grfmt_png.cpp grfmt_pxm.cpp grfmt_jpeg2000.cpp grfmt_exr.cpp  \
+    grfmt_sunras.cpp grfmt_tiff.cpp image.cpp loadsave.cpp        \
+    precomp.cpp utils.cpp cvcap.cpp cvcap_images.cpp window.cpp   \
+    $(TMP_DC1394) $(TMP_V4L) $(TMP_FFMPEG) $(TMP_GSTREAMER)       \
+    $(TMP_QT) $(TMP_XINE) $(TMP_GTK) $(TMP_CARBON) $(TMP_IMAGEIO) \
+    $(TMP_UNICAP)
 
 lib_highgui_la_LDFLAGS = -no-undefined @LDFLAGS@
 
@@ -339,8 +373,9 @@ libhighgui_la_LIBADD = \
     lib_highgui.la \
     $(top_builddir)/cxcore/src/libcxcore.la \
     $(top_builddir)/cv/src/libcv.la         \
-    @GTHREAD_LIBS@ @GTK_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@ @IEEE1394LIBS@ \
-    @QUICKTIME_LIBS@ @CARBON_LIBS@ @XINE_LIBS@ @LTLIBOBJS@
+    @GTHREAD_LIBS@ @GTK_LIBS@ @GSTREAMER_LIBS@ @IMAGELIBS@ @FFMPEGLIBS@   \
+    @IEEE1394LIBS@ @QUICKTIME_LIBS@ @CARBON_LIBS@ @XINE_LIBS@ @LTLIBOBJS@ \
+    @UNICAP_PACKAGE_LIBS@ @UCIL_PACKAGE_LIBS@
 
 all: all-am
 
@@ -426,7 +461,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_dc1394.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_ffmpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_gstreamer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_images.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_qt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_unicap.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_v4l.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cvcap_xine.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Plo@am__quote@
@@ -440,6 +478,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grfmt_pxm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grfmt_sunras.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grfmt_tiff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gstappsink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadsave.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/precomp.Plo@am__quote@
Unnamed repository; edit this file to name it for gitweb.