GNOME.org
 

ekiga r7505 - in trunk: . lib/engine lib/engine/components/gstreamer lib/engine/components/mlogo-videoinput lib/engine/components/opal lib/engine/components/ptlib lib/engine/videoinput lib/engine/videoinput/mlogo lib/engine/videoinput/skel src

Author: dsandras
Date: Sun Jan  4 21:18:55 2009
New Revision: 7505
URL: http://svn.gnome.org/viewvc/ekiga?rev=7505&view=rev

Log:
Even more moving.


Added:
   trunk/lib/engine/components/mlogo-videoinput/   (props changed)
      - copied from r7502, /trunk/lib/engine/videoinput/mlogo/
   trunk/lib/engine/videoinput/Makefile.am   (contents, props changed)
      - copied, changed from r7502, /trunk/lib/engine/videoinput/skel/Makefile.am
   trunk/lib/engine/videoinput/videoinput-core.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videoinput/skel/videoinput-core.cpp
   trunk/lib/engine/videoinput/videoinput-core.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videoinput/skel/videoinput-core.h
   trunk/lib/engine/videoinput/videoinput-gmconf-bridge.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.cpp
   trunk/lib/engine/videoinput/videoinput-gmconf-bridge.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.h
   trunk/lib/engine/videoinput/videoinput-info.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videoinput/skel/videoinput-info.h
   trunk/lib/engine/videoinput/videoinput-manager.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videoinput/skel/videoinput-manager.h
Removed:
   trunk/lib/engine/videoinput/mlogo/
   trunk/lib/engine/videoinput/skel/Makefile.am
   trunk/lib/engine/videoinput/skel/videoinput-core.cpp
   trunk/lib/engine/videoinput/skel/videoinput-core.h
   trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.cpp
   trunk/lib/engine/videoinput/skel/videoinput-gmconf-bridge.h
   trunk/lib/engine/videoinput/skel/videoinput-info.h
   trunk/lib/engine/videoinput/skel/videoinput-manager.h
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/gstreamer/Makefile.am
   trunk/lib/engine/components/mlogo-videoinput/Makefile.am
   trunk/lib/engine/components/opal/Makefile.am
   trunk/lib/engine/components/ptlib/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan  4 21:18:55 2009
@@ -777,8 +777,6 @@
 lib/engine/videooutput/x/Makefile
 lib/engine/videooutput/dx/Makefile
 lib/engine/videoinput/Makefile
-lib/engine/videoinput/skel/Makefile
-lib/engine/videoinput/mlogo/Makefile
 lib/engine/components/ptlib/Makefile
 lib/engine/audioinput/Makefile
 lib/engine/audiooutput/Makefile
@@ -799,6 +797,7 @@
 lib/engine/components/evolution/Makefile
 lib/engine/components/null-audioinput/Makefile
 lib/engine/components/null-audiooutput/Makefile
+lib/engine/components/mlogo-videoinput/Makefile
 )
 
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -10,11 +10,11 @@
 	-I$(top_srcdir)/lib/engine/framework/		 		\
 	-I$(top_srcdir)/lib/engine/chat/skel				\
 	-I$(top_srcdir)/lib/engine/videooutput/skel			\
-	-I$(top_srcdir)/lib/engine/videoinput/skel			\
+	-I$(top_srcdir)/lib/engine/videoinput/  			\
 	-I$(top_srcdir)/lib/engine/hal/skel				\
 	-I$(top_srcdir)/lib/engine/account				\
-	-I$(top_srcdir)/lib/engine/audioinput                      \
-	-I$(top_srcdir)/lib/engine/audiooutput                     \
+	-I$(top_srcdir)/lib/engine/audioinput                           \
+	-I$(top_srcdir)/lib/engine/audiooutput                          \
 	-I$(top_srcdir)/lib/engine/addressbook				\
 	-I$(top_srcdir)/lib/engine/presence				\
 	-I$(top_srcdir)/lib/engine/protocol				\
@@ -31,9 +31,7 @@
 	-I$(top_srcdir)/lib/engine/components/avahi			\
 	-I$(top_srcdir)/lib/engine/components/local-roster		\
 	-I$(top_srcdir)/lib/engine/components/resource-list		\
-	-I$(top_srcdir)/lib/engine/components/xcap                      \
-	-I$(top_srcdir)/lib/engine/components/null-audioinput           \
-	-I$(top_srcdir)/lib/engine/components/null-audiooutput
+	-I$(top_srcdir)/lib/engine/components/xcap
 
 # XVideo/X
 if !WIN32
@@ -50,8 +48,10 @@
 endif
 
 # Default Input Devices
-INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/videoinput/mlogo
+INCLUDES +=                                                             \
+	-I$(top_srcdir)/lib/engine/components/null-audioinput           \
+	-I$(top_srcdir)/lib/engine/components/null-audiooutput          \
+	-I$(top_srcdir)/lib/engine/components/mlogo-videoinput
 
 # Default PTLIB Input Devices
 INCLUDES +=                                             \
@@ -83,7 +83,7 @@
 	$(top_builddir)/lib/engine/presence/libgmpresence.la 					        \
 	$(top_builddir)/lib/engine/components/local-roster/liblocal-roster.la 				\
 	$(top_builddir)/lib/engine/videooutput/skel/libgmvideooutput.la					\
-	$(top_builddir)/lib/engine/videoinput/skel/libgmvideoinput.la					\
+	$(top_builddir)/lib/engine/videoinput/libgmvideoinput.la					\
 	$(top_builddir)/lib/engine/audioinput/libgmaudioinput.la					\
 	$(top_builddir)/lib/engine/audiooutput/libgmaudiooutput.la					\
 	$(top_builddir)/lib/engine/hal/skel/libgmhal.la							\
@@ -93,8 +93,8 @@
 
 # Default Input Devices
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/videoinput/mlogo/libgmvideoinput-mlogo.la                    \
-	$(top_builddir)/lib/engine/components/null-audioinput/libgmaudioinput-null.la           \
+	$(top_builddir)/lib/engine/components/mlogo-videoinput/libgmvideoinput-mlogo.la                 \
+	$(top_builddir)/lib/engine/components/null-audioinput/libgmaudioinput-null.la                   \
 	$(top_builddir)/lib/engine/components/null-audiooutput/libgmaudiooutput-null.la 
 
 # PTLIB Input Devices

Modified: trunk/lib/engine/components/gstreamer/Makefile.am
==============================================================================
--- trunk/lib/engine/components/gstreamer/Makefile.am	(original)
+++ trunk/lib/engine/components/gstreamer/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -7,7 +7,7 @@
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf			\
 	-I$(top_srcdir)/lib/engine/framework		\
-	-I$(top_srcdir)/lib/engine/videoinput/skel	\
+	-I$(top_srcdir)/lib/engine/videoinput	\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\
 	-I$(top_srcdir)/lib/engine/audioinput	\
 	-I$(top_srcdir)/lib/engine/audiooutput	\

Modified: trunk/lib/engine/components/mlogo-videoinput/Makefile.am
==============================================================================
--- /trunk/lib/engine/videoinput/mlogo/Makefile.am	(original)
+++ trunk/lib/engine/components/mlogo-videoinput/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -9,7 +9,7 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
-	-I$(top_srcdir)/lib/engine/videoinput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput \
 	-I$(top_srcdir)/lib/engine/videoinput/mlogo \
 	-I$(top_srcdir)/lib/engine/hal/skel
 

Modified: trunk/lib/engine/components/opal/Makefile.am
==============================================================================
--- trunk/lib/engine/components/opal/Makefile.am	(original)
+++ trunk/lib/engine/components/opal/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -16,7 +16,7 @@
 	-I$(top_srcdir)/lib/engine/presence	\
 	-I$(top_srcdir)/lib/engine/protocol	\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\
-	-I$(top_srcdir)/lib/engine/videoinput/skel	\
+	-I$(top_srcdir)/lib/engine/videoinput	\
 	-I$(top_srcdir)/lib/engine/audioinput	\
 	-I$(top_srcdir)/lib/engine/audiooutput	\
 	-I$(top_srcdir)/lib/engine/framework

Modified: trunk/lib/engine/components/ptlib/Makefile.am
==============================================================================
--- trunk/lib/engine/components/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/components/ptlib/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -9,7 +9,7 @@
 	-I$(top_srcdir)/lib/engine/framework            \
 	-I$(top_srcdir)/lib/engine/audiooutput     \
 	-I$(top_srcdir)/lib/engine/audioinput      \
-	-I$(top_srcdir)/lib/engine/videoinput/skel      \
+	-I$(top_srcdir)/lib/engine/videoinput      \
 	-I$(top_srcdir)/lib/engine/videooutput/skel     \
 	-I$(top_srcdir)/lib/engine/components/ptlib     \
 	-I$(top_srcdir)/lib/engine/hal/skel

Copied: trunk/lib/engine/videoinput/Makefile.am (from r7502, /trunk/lib/engine/videoinput/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/videoinput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmvideoinput.la
 
-videoinput_dir = $(top_srcdir)/lib/engine/videoinput/skel
+videoinput_dir = $(top_srcdir)/lib/engine/videoinput
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
@@ -8,7 +8,7 @@
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
-	-I$(top_srcdir)/lib/engine/videoinput/skel \
+	-I$(top_srcdir)/lib/engine/videoinput \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
 libgmvideoinput_la_SOURCES = \

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jan  4 21:18:55 2009
@@ -13,7 +13,7 @@
 	-I$(top_srcdir)/lib/engine/protocol	\
 	-I$(top_srcdir)/lib/engine/protocol/sip		\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\
-	-I$(top_srcdir)/lib/engine/videoinput/skel	\
+	-I$(top_srcdir)/lib/engine/videoinput	\
 	-I$(top_srcdir)/lib/engine/audioinput	\
 	-I$(top_srcdir)/lib/engine/audiooutput	\
 	-I$(top_srcdir)/lib/engine/hal/skel		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]