GNOME.org
 

ekiga r7504 - in trunk: . lib/engine lib/engine/audioinput lib/engine/audioinput/skel lib/engine/audiooutput lib/engine/audiooutput/skel lib/engine/components lib/engine/components/gstreamer lib/engine/components/null-audioinput lib/engine/components/null-audiooutput lib/engine/components/opal lib/engine/components/ptlib src

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

Log:
More moving.


Added:
   trunk/lib/engine/audioinput/Makefile.am   (contents, props changed)
      - copied, changed from r7502, /trunk/lib/engine/audioinput/skel/Makefile.am
   trunk/lib/engine/audioinput/audioinput-core.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audioinput/skel/audioinput-core.cpp
   trunk/lib/engine/audioinput/audioinput-core.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audioinput/skel/audioinput-core.h
   trunk/lib/engine/audioinput/audioinput-gmconf-bridge.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audioinput/skel/audioinput-gmconf-bridge.cpp
   trunk/lib/engine/audioinput/audioinput-gmconf-bridge.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audioinput/skel/audioinput-gmconf-bridge.h
   trunk/lib/engine/audioinput/audioinput-info.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audioinput/skel/audioinput-info.h
   trunk/lib/engine/audioinput/audioinput-manager.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audioinput/skel/audioinput-manager.h
   trunk/lib/engine/audiooutput/Makefile.am   (contents, props changed)
      - copied, changed from r7502, /trunk/lib/engine/audiooutput/skel/Makefile.am
   trunk/lib/engine/audiooutput/audiooutput-core.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-core.cpp
   trunk/lib/engine/audiooutput/audiooutput-core.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-core.h
   trunk/lib/engine/audiooutput/audiooutput-gmconf-bridge.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-gmconf-bridge.cpp
   trunk/lib/engine/audiooutput/audiooutput-gmconf-bridge.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-gmconf-bridge.h
   trunk/lib/engine/audiooutput/audiooutput-info.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-info.h
   trunk/lib/engine/audiooutput/audiooutput-manager.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-manager.h
   trunk/lib/engine/audiooutput/audiooutput-scheduler.cpp   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.cpp
   trunk/lib/engine/audiooutput/audiooutput-scheduler.h   (props changed)
      - copied unchanged from r7502, /trunk/lib/engine/audiooutput/skel/audiooutput-scheduler.h
Removed:
   trunk/lib/engine/audioinput/skel/
   trunk/lib/engine/audiooutput/skel/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/gstreamer/Makefile.am
   trunk/lib/engine/components/null-audioinput/Makefile.am
   trunk/lib/engine/components/null-audiooutput/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 20:55:20 2009
@@ -779,11 +779,9 @@
 lib/engine/videoinput/Makefile
 lib/engine/videoinput/skel/Makefile
 lib/engine/videoinput/mlogo/Makefile
-lib/engine/audioinput/Makefile
-lib/engine/audioinput/skel/Makefile
 lib/engine/components/ptlib/Makefile
+lib/engine/audioinput/Makefile
 lib/engine/audiooutput/Makefile
-lib/engine/audiooutput/skel/Makefile
 lib/engine/hal/Makefile
 lib/engine/hal/skel/Makefile
 lib/engine/hal/dbus/Makefile

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -13,8 +13,8 @@
 	-I$(top_srcdir)/lib/engine/videoinput/skel			\
 	-I$(top_srcdir)/lib/engine/hal/skel				\
 	-I$(top_srcdir)/lib/engine/account				\
-	-I$(top_srcdir)/lib/engine/audioinput/skel                      \
-	-I$(top_srcdir)/lib/engine/audiooutput/skel                     \
+	-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				\
@@ -84,8 +84,8 @@
 	$(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/audioinput/skel/libgmaudioinput.la					\
-	$(top_builddir)/lib/engine/audiooutput/skel/libgmaudiooutput.la					\
+	$(top_builddir)/lib/engine/audioinput/libgmaudioinput.la					\
+	$(top_builddir)/lib/engine/audiooutput/libgmaudiooutput.la					\
 	$(top_builddir)/lib/engine/hal/skel/libgmhal.la							\
 	$(top_builddir)/lib/engine/components/gmconf-personal-details/libgmconfpersonaldetails.la	\
 	$(top_builddir)/lib/engine/components/opal/libopal.la                                           \
@@ -93,7 +93,7 @@
 
 # Default Input Devices
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/videoinput/mlogo/libgmvideoinput-mlogo.la                    \ 
+	$(top_builddir)/lib/engine/videoinput/mlogo/libgmvideoinput-mlogo.la                    \
 	$(top_builddir)/lib/engine/components/null-audioinput/libgmaudioinput-null.la           \
 	$(top_builddir)/lib/engine/components/null-audiooutput/libgmaudiooutput-null.la 
 

Copied: trunk/lib/engine/audioinput/Makefile.am (from r7502, /trunk/lib/engine/audioinput/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/audioinput/skel/Makefile.am	(original)
+++ trunk/lib/engine/audioinput/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -1,14 +1,14 @@
 noinst_LTLIBRARIES = libgmaudioinput.la
 
-audioinput_dir = $(top_srcdir)/lib/engine/audioinput/skel
+audioinput_dir = $(top_srcdir)/lib/engine/audioinput
 
 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/audiooutput/skel \
-	-I$(top_srcdir)/lib/engine/audioinput/skel \
+	-I$(top_srcdir)/lib/engine/audiooutput \
+	-I$(top_srcdir)/lib/engine/audioinput \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
 libgmaudioinput_la_SOURCES = \

Copied: trunk/lib/engine/audiooutput/Makefile.am (from r7502, /trunk/lib/engine/audiooutput/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/audiooutput/skel/Makefile.am	(original)
+++ trunk/lib/engine/audiooutput/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -1,13 +1,13 @@
 noinst_LTLIBRARIES = libgmaudiooutput.la
 
-audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput/skel
+audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput
 
 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/audiooutput/skel \
+	-I$(top_srcdir)/lib/engine/audiooutput \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
 

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -35,7 +35,7 @@
 	gmconf-personal-details \
         local-roster            \
         null-audioinput         \
-        null-audiooutput        \ 
+        null-audiooutput        \
         opal                    \
         ptlib                   \
 	$(AVAHI_DIR)            \

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

Modified: trunk/lib/engine/components/null-audioinput/Makefile.am
==============================================================================
--- trunk/lib/engine/components/null-audioinput/Makefile.am	(original)
+++ trunk/lib/engine/components/null-audioinput/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -7,8 +7,8 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/audiooutput/skel \
-	-I$(top_srcdir)/lib/engine/audioinput/skel \
+	-I$(top_srcdir)/lib/engine/audiooutput \
+	-I$(top_srcdir)/lib/engine/audioinput \
 	-I$(top_srcdir)/lib/engine/audioinput/null \
 	-I$(top_srcdir)/lib/engine/hal/skel
 

Modified: trunk/lib/engine/components/null-audiooutput/Makefile.am
==============================================================================
--- trunk/lib/engine/components/null-audiooutput/Makefile.am	(original)
+++ trunk/lib/engine/components/null-audiooutput/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -7,7 +7,7 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/audiooutput/skel \
+	-I$(top_srcdir)/lib/engine/audiooutput \
 	-I$(top_srcdir)/lib/engine/audiooutput/null \
 	-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 20:55:20 2009
@@ -17,8 +17,8 @@
 	-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/audioinput/skel	\
-	-I$(top_srcdir)/lib/engine/audiooutput/skel	\
+	-I$(top_srcdir)/lib/engine/audioinput	\
+	-I$(top_srcdir)/lib/engine/audiooutput	\
 	-I$(top_srcdir)/lib/engine/framework
 
 # Endpoints 

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 20:55:20 2009
@@ -7,8 +7,8 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf                      \
 	-I$(top_srcdir)/lib/engine/framework            \
-	-I$(top_srcdir)/lib/engine/audiooutput/skel     \
-	-I$(top_srcdir)/lib/engine/audioinput/skel      \
+	-I$(top_srcdir)/lib/engine/audiooutput     \
+	-I$(top_srcdir)/lib/engine/audioinput      \
 	-I$(top_srcdir)/lib/engine/videoinput/skel      \
 	-I$(top_srcdir)/lib/engine/videooutput/skel     \
 	-I$(top_srcdir)/lib/engine/components/ptlib     \

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jan  4 20:55:20 2009
@@ -14,8 +14,8 @@
 	-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/audioinput/skel	\
-	-I$(top_srcdir)/lib/engine/audiooutput/skel	\
+	-I$(top_srcdir)/lib/engine/audioinput	\
+	-I$(top_srcdir)/lib/engine/audiooutput	\
 	-I$(top_srcdir)/lib/engine/hal/skel		\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/gui/gtk-core		\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]