ekiga r7513 - in trunk: . lib/engine/components lib/engine/components/common-videoouput lib/engine/components/common-videooutput lib/engine/components/dx-videooutput lib/engine/components/echo lib/engine/components/mlogo-videoinput lib/engine/components/x-videooutput

[dsandras svn gnome org]

Author: dsandras
Date: Sun Jan  4 22:22:40 2009
New Revision: 7513
URL: http://svn.gnome.org/viewvc/ekiga?rev=7513&view=rev

Log:
Fixed previous commit.


Added:
   trunk/lib/engine/components/common-videooutput/
      - copied from r7506, /trunk/lib/engine/components/common-videoouput/
Removed:
   trunk/lib/engine/components/common-videoouput/
Modified:
   trunk/ChangeLog
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/dx-videooutput/Makefile.am
   trunk/lib/engine/components/echo/Makefile.am
   trunk/lib/engine/components/mlogo-videoinput/Makefile.am
   trunk/lib/engine/components/x-videooutput/Makefile.am

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Jan  4 22:22:40 2009
@@ -2,6 +2,14 @@
 LDAP_DIR = ldap
 endif
 
+if HAVE_DX
+DX_DIR = dx-videooutput
+endif
+
+if !WIN32
+X_DIR = x-videooutput
+endif
+
 if HAVE_KAB
 KAB_DIR = kab
 endif
@@ -34,6 +42,7 @@
 	call-history	        \
 	gmconf-personal-details \
         local-roster            \
+        mlogo-videoinput        \
         null-audioinput         \
         null-audiooutput        \
         opal                    \
@@ -44,4 +53,6 @@
 	$(EDS_DIR) 	        \
 	$(LDAP_DIR)	        \
 	$(KAB_DIR)              \
+	$(DX_DIR)               \
+	$(X_DIR)                \
 	$(XCAP_DIRS)

Modified: trunk/lib/engine/components/dx-videooutput/Makefile.am
==============================================================================
--- trunk/lib/engine/components/dx-videooutput/Makefile.am	(original)
+++ trunk/lib/engine/components/dx-videooutput/Makefile.am	Sun Jan  4 22:22:40 2009
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libgmvideooutput-dx.la
 
-videooutput_dir = $(top_srcdir)/lib/engine/videooutput/dx
-common_dir = $(top_srcdir)/lib/engine/videooutput/common
+videooutput_dir = $(top_srcdir)/lib/engine/components/dx-videooutput
+common_dir = $(top_srcdir)/lib/engine/components/common-videooutput
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(DX_CFLAGS) $(GLIB_CFLAGS)
 

Modified: trunk/lib/engine/components/echo/Makefile.am
==============================================================================
--- trunk/lib/engine/components/echo/Makefile.am	(original)
+++ trunk/lib/engine/components/echo/Makefile.am	Sun Jan  4 22:22:40 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmechochat.la
 
-echochat_dir = $(top_srcdir)/lib/engine/chat/echo
+echochat_dir = $(top_srcdir)/lib/engine/components/echo
 
 AM_CXXFLAGS = $(SIGC_CFLAGS)
 
@@ -19,4 +19,4 @@
 	$(echochat_dir)/echo-main.h		\
 	$(echochat_dir)/echo-main.cpp
 
-libgmechochat_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)
\ No newline at end of file
+libgmechochat_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS)

Modified: trunk/lib/engine/components/mlogo-videoinput/Makefile.am
==============================================================================
--- trunk/lib/engine/components/mlogo-videoinput/Makefile.am	(original)
+++ trunk/lib/engine/components/mlogo-videoinput/Makefile.am	Sun Jan  4 22:22:40 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmvideoinput-mlogo.la
 
-videoinput_dir = $(top_srcdir)/lib/engine/videoinput/mlogo
+videoinput_dir = $(top_srcdir)/lib/engine/components/mlogo-videoinput
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 

Modified: trunk/lib/engine/components/x-videooutput/Makefile.am
==============================================================================
--- trunk/lib/engine/components/x-videooutput/Makefile.am	(original)
+++ trunk/lib/engine/components/x-videooutput/Makefile.am	Sun Jan  4 22:22:40 2009
@@ -1,15 +1,15 @@
 noinst_LTLIBRARIES = libgmvideooutput-x.la
 
-videooutput_dir = $(top_srcdir)/lib/engine/videooutput/x
-common_dir = $(top_srcdir)/lib/engine/videooutput/common
+videooutput_dir = $(top_srcdir)/lib/engine/components/x-videooutput
+common_dir = $(top_srcdir)/lib/engine/components/common-videooutput
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(PTLIB_CFLAGS) $(GLIB_CFLAGS) $(XV_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/videooutput \
-	-I$(top_srcdir)/lib/engine/videooutput/common \
+	-I$(top_srcdir)/lib/engine/components/x-videooutput \
+	-I$(top_srcdir)/lib/engine/components/common-videooutput \
 	-I$(top_srcdir)/lib/gui
 
 libgmvideooutput_x_la_SOURCES = \