GNOME.org
 

ekiga r7503 - in trunk: . lib/engine lib/engine/audioinput lib/engine/audioinput/null lib/engine/audiooutput lib/engine/audiooutput/null lib/engine/components lib/engine/components/null-audioinput lib/engine/components/null-audiooutput

Author: dsandras
Date: Sun Jan  4 19:06:38 2009
New Revision: 7503
URL: http://svn.gnome.org/viewvc/ekiga?rev=7503&view=rev

Log:
Some more moving.


Added:
   trunk/lib/engine/components/null-audioinput/   (props changed)
      - copied from r7502, /trunk/lib/engine/audioinput/null/
   trunk/lib/engine/components/null-audiooutput/   (props changed)
      - copied from r7502, /trunk/lib/engine/audiooutput/null/
Removed:
   trunk/lib/engine/audioinput/null/
   trunk/lib/engine/audiooutput/null/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/audioinput/Makefile.am
   trunk/lib/engine/audiooutput/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/null-audioinput/Makefile.am
   trunk/lib/engine/components/null-audiooutput/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan  4 19:06:38 2009
@@ -781,11 +781,9 @@
 lib/engine/videoinput/mlogo/Makefile
 lib/engine/audioinput/Makefile
 lib/engine/audioinput/skel/Makefile
-lib/engine/audioinput/null/Makefile
 lib/engine/components/ptlib/Makefile
 lib/engine/audiooutput/Makefile
 lib/engine/audiooutput/skel/Makefile
-lib/engine/audiooutput/null/Makefile
 lib/engine/hal/Makefile
 lib/engine/hal/skel/Makefile
 lib/engine/hal/dbus/Makefile
@@ -801,6 +799,8 @@
 lib/engine/components/xcap/Makefile
 lib/engine/components/opal/Makefile
 lib/engine/components/evolution/Makefile
+lib/engine/components/null-audioinput/Makefile
+lib/engine/components/null-audiooutput/Makefile
 )
 
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Jan  4 19:06:38 2009
@@ -11,10 +11,10 @@
 	-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/audioinput/skel			\
-	-I$(top_srcdir)/lib/engine/audiooutput/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/addressbook				\
 	-I$(top_srcdir)/lib/engine/presence				\
 	-I$(top_srcdir)/lib/engine/protocol				\
@@ -31,7 +31,9 @@
 	-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/xcap                      \
+	-I$(top_srcdir)/lib/engine/components/null-audioinput           \
+	-I$(top_srcdir)/lib/engine/components/null-audiooutput
 
 # XVideo/X
 if !WIN32
@@ -49,9 +51,7 @@
 
 # Default Input Devices
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/videoinput/mlogo	\
-	-I$(top_srcdir)/lib/engine/audioinput/null      \
-	-I$(top_srcdir)/lib/engine/audiooutput/null
+	-I$(top_srcdir)/lib/engine/videoinput/mlogo
 
 # Default PTLIB Input Devices
 INCLUDES +=                                             \
@@ -75,12 +75,12 @@
 	$(top_builddir)/lib/engine/gui/gtk-core/libgmgtk-core.la 					\
 	$(top_builddir)/lib/engine/gui/gtk-frontend/libgmgtk-frontend.la 				\
 	$(top_builddir)/lib/engine/chat/skel/libgmchat.la 						\
-	$(top_builddir)/lib/engine/protocol/libgmprotocol.la	 				\
+	$(top_builddir)/lib/engine/protocol/libgmprotocol.la	 				        \
 	$(top_builddir)/lib/engine/framework/libgmframework.la 						\
-	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la 				\
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la 				        \
 	$(top_builddir)/lib/engine/components/call-history/libcall-history.la 				\
 	$(top_builddir)/lib/engine/account/libaccount.la 						\
-	$(top_builddir)/lib/engine/presence/libgmpresence.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/videoinput/skel/libgmvideoinput.la					\
@@ -93,9 +93,9 @@
 
 # Default Input Devices
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/videoinput/mlogo/libgmvideoinput-mlogo.la \
-	$(top_builddir)/lib/engine/audioinput/null/libgmaudioinput-null.la \
-	$(top_builddir)/lib/engine/audiooutput/null/libgmaudiooutput-null.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 
 
 # PTLIB Input Devices
 libekiga_engine_la_LIBADD += \

Modified: trunk/lib/engine/audioinput/Makefile.am
==============================================================================
--- trunk/lib/engine/audioinput/Makefile.am	(original)
+++ trunk/lib/engine/audioinput/Makefile.am	Sun Jan  4 19:06:38 2009
@@ -1 +1 @@
-SUBDIRS = skel null
+SUBDIRS = skel

Modified: trunk/lib/engine/audiooutput/Makefile.am
==============================================================================
--- trunk/lib/engine/audiooutput/Makefile.am	(original)
+++ trunk/lib/engine/audiooutput/Makefile.am	Sun Jan  4 19:06:38 2009
@@ -1 +1 @@
-SUBDIRS = skel null
+SUBDIRS = skel

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Jan  4 19:06:38 2009
@@ -34,6 +34,8 @@
 	call-history	        \
 	gmconf-personal-details \
         local-roster            \
+        null-audioinput         \
+        null-audiooutput        \ 
         opal                    \
         ptlib                   \
 	$(AVAHI_DIR)            \

Modified: trunk/lib/engine/components/null-audioinput/Makefile.am
==============================================================================
--- /trunk/lib/engine/audioinput/null/Makefile.am	(original)
+++ trunk/lib/engine/components/null-audioinput/Makefile.am	Sun Jan  4 19:06:38 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmaudioinput-null.la
 
-audioinput_dir = $(top_srcdir)/lib/engine/audioinput/null
+audioinput_dir = $(top_srcdir)/lib/engine/components/null-audioinput/
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
 

Modified: trunk/lib/engine/components/null-audiooutput/Makefile.am
==============================================================================
--- /trunk/lib/engine/audiooutput/null/Makefile.am	(original)
+++ trunk/lib/engine/components/null-audiooutput/Makefile.am	Sun Jan  4 19:06:38 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmaudiooutput-null.la
 
-audiooutput_dir = $(top_srcdir)/lib/engine/audiooutput/null
+audiooutput_dir = $(top_srcdir)/lib/engine/components/null-audiooutput/
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(PTLIB_CFLAGS)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]