Update the trunk to the OpenCV's CVS (2008-07-14)

[opencv] / otherlibs / highgui / Makefile.am

diff --git a/otherlibs/highgui/Makefile.am b/otherlibs/highgui/Makefile.am
index 5340601..2b0c1e4 100644 (file)
--- a/otherlibs/highgui/Makefile.am
+++ b/otherlibs/highgui/Makefile.am
@@ -1,18 +1,24 @@
+# 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
 
@@ -25,7 +31,13 @@ endif
 if BUILD_V4L
 TMP_V4L=cvcap_v4l.cpp
 else
-TMP_V4L= 
+TMP_V4L=
+endif
+
+if BUILD_UNICAP
+TMP_UNICAP=cvcap_unicap.cpp
+else
+TMP_UNICAP=
 endif
 
 if BUILD_FFMPEG
@@ -40,6 +52,12 @@ else
 TMP_XINE=
 endif
 
+if BUILD_GSTREAMER
+TMP_GSTREAMER=cvcap_gstreamer.cpp gstappsink.c
+else
+TMP_GSTREAMER=
+endif
+
 if BUILD_QUICKTIME
 TMP_QT=cvcap_qt.cpp
 else
@@ -67,12 +85,13 @@ endif
 
 # 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@
 
 # real library
@@ -84,5 +103,6 @@ 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@