GNOME.org
 

ekiga r7506 - in trunk: . lib/engine lib/engine/components/common-videoouput lib/engine/components/dx-videooutput lib/engine/components/gstreamer lib/engine/components/mlogo-videoinput lib/engine/components/opal lib/engine/components/ptlib lib/engine/components/x-videooutput lib/engine/videoinput lib/engine/videooutput lib/engine/videooutput/common lib/engine/videooutput/dx lib/engine/videooutput/skel lib/engine/videooutput/x src

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

Log:
Yes, I'm tired of moving things.


Added:
   trunk/lib/engine/components/common-videoouput/   (props changed)
      - copied from r7502, /trunk/lib/engine/videooutput/common/
   trunk/lib/engine/components/dx-videooutput/   (props changed)
      - copied from r7502, /trunk/lib/engine/videooutput/dx/
   trunk/lib/engine/components/x-videooutput/   (props changed)
      - copied from r7502, /trunk/lib/engine/videooutput/x/
   trunk/lib/engine/videooutput/Makefile.am   (contents, props changed)
      - copied, changed from r7502, /trunk/lib/engine/videooutput/skel/Makefile.am
   trunk/lib/engine/videooutput/videooutput-core.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videooutput/skel/videooutput-core.cpp
   trunk/lib/engine/videooutput/videooutput-core.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videooutput/skel/videooutput-core.h
   trunk/lib/engine/videooutput/videooutput-gmconf-bridge.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.cpp
   trunk/lib/engine/videooutput/videooutput-gmconf-bridge.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.h
   trunk/lib/engine/videooutput/videooutput-info.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videooutput/skel/videooutput-info.h
   trunk/lib/engine/videooutput/videooutput-manager.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/videooutput/skel/videooutput-manager.h
Removed:
   trunk/lib/engine/videooutput/common/
   trunk/lib/engine/videooutput/dx/
   trunk/lib/engine/videooutput/skel/Makefile.am
   trunk/lib/engine/videooutput/skel/videooutput-core.cpp
   trunk/lib/engine/videooutput/skel/videooutput-core.h
   trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.cpp
   trunk/lib/engine/videooutput/skel/videooutput-gmconf-bridge.h
   trunk/lib/engine/videooutput/skel/videooutput-info.h
   trunk/lib/engine/videooutput/skel/videooutput-manager.h
   trunk/lib/engine/videooutput/x/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/dx-videooutput/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/lib/engine/components/x-videooutput/Makefile.am
   trunk/lib/engine/videoinput/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan  4 21:39:39 2009
@@ -773,9 +773,6 @@
 lib/engine/components/local-roster/Makefile
 lib/engine/protocol/Makefile
 lib/engine/videooutput/Makefile
-lib/engine/videooutput/skel/Makefile
-lib/engine/videooutput/x/Makefile
-lib/engine/videooutput/dx/Makefile
 lib/engine/videoinput/Makefile
 lib/engine/components/ptlib/Makefile
 lib/engine/audioinput/Makefile
@@ -798,6 +795,8 @@
 lib/engine/components/null-audioinput/Makefile
 lib/engine/components/null-audiooutput/Makefile
 lib/engine/components/mlogo-videoinput/Makefile
+lib/engine/components/x-videooutput/Makefile
+lib/engine/components/dx-videooutput/Makefile
 )
 
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Jan  4 21:39:39 2009
@@ -9,7 +9,7 @@
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend			\
 	-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/videooutput			\
 	-I$(top_srcdir)/lib/engine/videoinput/  			\
 	-I$(top_srcdir)/lib/engine/hal/skel				\
 	-I$(top_srcdir)/lib/engine/account				\
@@ -35,16 +35,16 @@
 
 # XVideo/X
 if !WIN32
-INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/videooutput/common   \
-	-I$(top_srcdir)/lib/engine/videooutput/x
+INCLUDES +=                                                             \
+	-I$(top_srcdir)/lib/engine/components/common-videooutput        \
+	-I$(top_srcdir)/lib/engine/components/x-videooutput
 endif
 
 # DirectX
 if HAVE_DX
-INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/videooutput/common   \
-	-I$(top_srcdir)/lib/engine/videooutput/dx
+INCLUDES +=                                                             \
+	-I$(top_srcdir)/lib/engine/components/common-videooutput        \
+	-I$(top_srcdir)/lib/engine/components/dx-videooutput
 endif
 
 # Default Input Devices
@@ -82,7 +82,7 @@
 	$(top_builddir)/lib/engine/account/libaccount.la 						\
 	$(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/videooutput/libgmvideooutput.la					\
 	$(top_builddir)/lib/engine/videoinput/libgmvideoinput.la					\
 	$(top_builddir)/lib/engine/audioinput/libgmaudioinput.la					\
 	$(top_builddir)/lib/engine/audiooutput/libgmaudiooutput.la					\
@@ -110,14 +110,14 @@
 # XVideo/X
 if !WIN32
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/videooutput/x/libgmvideooutput-x.la \
+	$(top_builddir)/lib/engine/components/x-videooutput/libgmvideooutput-x.la \
 	$(top_builddir)/lib/pixops/libpixops.la
 endif
 
 # DirectX
 if HAVE_DX
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/videooutput/dx/libgmvideooutput-dx.la
+	$(top_builddir)/lib/engine/components/dx-videooutput/libgmvideooutput-dx.la
 endif
 
 

Modified: trunk/lib/engine/components/dx-videooutput/Makefile.am
==============================================================================
--- /trunk/lib/engine/videooutput/dx/Makefile.am	(original)
+++ trunk/lib/engine/components/dx-videooutput/Makefile.am	Sun Jan  4 21:39:39 2009
@@ -8,7 +8,7 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videooutput \
 	-I$(top_srcdir)/lib/engine/videooutput/common \
 	-I$(top_srcdir)/lib/gui
 

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:39:39 2009
@@ -8,7 +8,7 @@
 	-I$(top_srcdir)/lib/gmconf			\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/videoinput	\
-	-I$(top_srcdir)/lib/engine/videooutput/skel	\
+	-I$(top_srcdir)/lib/engine/videooutput	\
 	-I$(top_srcdir)/lib/engine/audioinput	\
 	-I$(top_srcdir)/lib/engine/audiooutput	\
 	-I$(top_srcdir)/lib/engine/hal/skel

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 21:39:39 2009
@@ -8,7 +8,7 @@
 	-I$(top_srcdir)/pixmaps \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videooutput \
 	-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:39:39 2009
@@ -15,7 +15,7 @@
 	-I$(top_srcdir)/lib/engine/hal/skel		\
 	-I$(top_srcdir)/lib/engine/presence	\
 	-I$(top_srcdir)/lib/engine/protocol	\
-	-I$(top_srcdir)/lib/engine/videooutput/skel	\
+	-I$(top_srcdir)/lib/engine/videooutput	\
 	-I$(top_srcdir)/lib/engine/videoinput	\
 	-I$(top_srcdir)/lib/engine/audioinput	\
 	-I$(top_srcdir)/lib/engine/audiooutput	\

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:39:39 2009
@@ -10,7 +10,7 @@
 	-I$(top_srcdir)/lib/engine/audiooutput     \
 	-I$(top_srcdir)/lib/engine/audioinput      \
 	-I$(top_srcdir)/lib/engine/videoinput      \
-	-I$(top_srcdir)/lib/engine/videooutput/skel     \
+	-I$(top_srcdir)/lib/engine/videooutput     \
 	-I$(top_srcdir)/lib/engine/components/ptlib     \
 	-I$(top_srcdir)/lib/engine/hal/skel
 

Modified: trunk/lib/engine/components/x-videooutput/Makefile.am
==============================================================================
--- /trunk/lib/engine/videooutput/x/Makefile.am	(original)
+++ trunk/lib/engine/components/x-videooutput/Makefile.am	Sun Jan  4 21:39:39 2009
@@ -8,7 +8,7 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/videooutput/skel \
+	-I$(top_srcdir)/lib/engine/videooutput \
 	-I$(top_srcdir)/lib/engine/videooutput/common \
 	-I$(top_srcdir)/lib/gui
 

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

Copied: trunk/lib/engine/videooutput/Makefile.am (from r7502, /trunk/lib/engine/videooutput/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/videooutput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/Makefile.am	Sun Jan  4 21:39:39 2009
@@ -1,13 +1,13 @@
 noinst_LTLIBRARIES = libgmvideooutput.la
 
-videooutput_dir = $(top_srcdir)/lib/engine/videooutput/skel
+videooutput_dir = $(top_srcdir)/lib/engine/videooutput
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/videooutput/skel
+	-I$(top_srcdir)/lib/engine/videooutput
 
 libgmvideooutput_la_SOURCES = \
 	$(videooutput_dir)/videooutput-info.h		\

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jan  4 21:39:39 2009
@@ -12,7 +12,7 @@
 	-I$(top_srcdir)/lib/engine/presence	\
 	-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/videooutput	\
 	-I$(top_srcdir)/lib/engine/videoinput	\
 	-I$(top_srcdir)/lib/engine/audioinput	\
 	-I$(top_srcdir)/lib/engine/audiooutput	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]