ekiga r7408 - in trunk: . lib/engine lib/engine/audioinput lib/engine/audioinput/ptlib lib/engine/audiooutput lib/engine/audiooutput/ptlib lib/engine/components lib/engine/components/ptlib

[dsandras svn gnome org]

Author: dsandras
Date: Sun Nov 23 18:20:41 2008
New Revision: 7408
URL: http://svn.gnome.org/viewvc/ekiga?rev=7408&view=rev

Log:
Some more moving.


Added:
   trunk/lib/engine/components/ptlib/
   trunk/lib/engine/components/ptlib/Makefile.am   (contents, props changed)
      - copied, changed from r7404, /trunk/lib/engine/audioinput/ptlib/Makefile.am
   trunk/lib/engine/components/ptlib/audioinput-main-ptlib.cpp   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audioinput/ptlib/audioinput-main-ptlib.cpp
   trunk/lib/engine/components/ptlib/audioinput-main-ptlib.h   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audioinput/ptlib/audioinput-main-ptlib.h
   trunk/lib/engine/components/ptlib/audioinput-manager-ptlib.cpp   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.cpp
   trunk/lib/engine/components/ptlib/audioinput-manager-ptlib.h   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.h
   trunk/lib/engine/components/ptlib/audiooutput-main-ptlib.cpp   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audiooutput/ptlib/audiooutput-main-ptlib.cpp
   trunk/lib/engine/components/ptlib/audiooutput-main-ptlib.h   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audiooutput/ptlib/audiooutput-main-ptlib.h
   trunk/lib/engine/components/ptlib/audiooutput-manager-ptlib.cpp   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.cpp
   trunk/lib/engine/components/ptlib/audiooutput-manager-ptlib.h   (props changed)
      - copied unchanged from r7404, /trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.h
Removed:
   trunk/lib/engine/audioinput/ptlib/Makefile.am
   trunk/lib/engine/audioinput/ptlib/audioinput-main-ptlib.cpp
   trunk/lib/engine/audioinput/ptlib/audioinput-main-ptlib.h
   trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.cpp
   trunk/lib/engine/audioinput/ptlib/audioinput-manager-ptlib.h
   trunk/lib/engine/audiooutput/ptlib/audiooutput-main-ptlib.cpp
   trunk/lib/engine/audiooutput/ptlib/audiooutput-main-ptlib.h
   trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.cpp
   trunk/lib/engine/audiooutput/ptlib/audiooutput-manager-ptlib.h
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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 23 18:20:41 2008
@@ -788,11 +788,10 @@
 lib/engine/audioinput/Makefile
 lib/engine/audioinput/skel/Makefile
 lib/engine/audioinput/null/Makefile
-lib/engine/audioinput/ptlib/Makefile
+lib/engine/components/ptlib/Makefile
 lib/engine/audiooutput/Makefile
 lib/engine/audiooutput/skel/Makefile
 lib/engine/audiooutput/null/Makefile
-lib/engine/audiooutput/ptlib/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 Nov 23 18:20:41 2008
@@ -29,6 +29,7 @@
 	-I$(top_srcdir)/lib/engine/components/gstreamer			\
 	-I$(top_srcdir)/lib/engine/components/kde			\
 	-I$(top_srcdir)/lib/engine/components/opal	                \
+	-I$(top_srcdir)/lib/engine/components/ptlib	                \
 	-I$(top_srcdir)/lib/engine/components/resource-list		\
 	-I$(top_srcdir)/lib/engine/components/xcap
 
@@ -99,8 +100,7 @@
 # PTLIB Input Devices
 libekiga_engine_la_LIBADD += \
 	$(top_builddir)/lib/engine/videoinput/ptlib/libgmvideoinput-ptlib.la \
-	$(top_builddir)/lib/engine/audioinput/ptlib/libgmaudioinput-ptlib.la \
-	$(top_builddir)/lib/engine/audiooutput/ptlib/libgmaudiooutput-ptlib.la
+	$(top_builddir)/lib/engine/components/ptlib/libgmptlib.la
 
 # DBus/HALd
 if HAVE_DBUS

Modified: trunk/lib/engine/audioinput/Makefile.am
==============================================================================
--- trunk/lib/engine/audioinput/Makefile.am	(original)
+++ trunk/lib/engine/audioinput/Makefile.am	Sun Nov 23 18:20:41 2008
@@ -1 +1 @@
-SUBDIRS = skel null ptlib
+SUBDIRS = skel null

Modified: trunk/lib/engine/audiooutput/Makefile.am
==============================================================================
--- trunk/lib/engine/audiooutput/Makefile.am	(original)
+++ trunk/lib/engine/audiooutput/Makefile.am	Sun Nov 23 18:20:41 2008
@@ -1 +1 @@
-SUBDIRS = skel null ptlib
+SUBDIRS = skel null

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Nov 23 18:20:41 2008
@@ -35,6 +35,7 @@
 	gmconf-personal-details \
         local-roster            \
         opal                    \
+        ptlib                   \
 	$(AVAHI_DIR)            \
 	$(GSTREAMER_DIR)        \
 	$(KDE_DIR)              \

Copied: trunk/lib/engine/components/ptlib/Makefile.am (from r7404, /trunk/lib/engine/audioinput/ptlib/Makefile.am)
==============================================================================
--- /trunk/lib/engine/audioinput/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/components/ptlib/Makefile.am	Sun Nov 23 18:20:41 2008
@@ -1,21 +1,25 @@
-noinst_LTLIBRARIES = libgmaudioinput-ptlib.la
+noinst_LTLIBRARIES = libgmptlib.la
 
-audioinput_dir = $(top_srcdir)/lib/engine/audioinput/ptlib
+ptlib_dir = $(top_srcdir)/lib/engine/components/ptlib
 
 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/audioinput/ptlib \
+	-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/components/ptlib     \
 	-I$(top_srcdir)/lib/engine/hal/skel
 
-libgmaudioinput_ptlib_la_SOURCES = \
-	$(audioinput_dir)/audioinput-manager-ptlib.h \
-	$(audioinput_dir)/audioinput-manager-ptlib.cpp \
-	$(audioinput_dir)/audioinput-main-ptlib.h \
-	$(audioinput_dir)/audioinput-main-ptlib.cpp 
+libgmptlib_la_SOURCES = \
+	$(ptlib_dir)/audioinput-manager-ptlib.h         \
+	$(ptlib_dir)/audioinput-manager-ptlib.cpp       \
+	$(ptlib_dir)/audioinput-main-ptlib.h            \
+	$(ptlib_dir)/audioinput-main-ptlib.cpp          \
+	$(ptlib_dir)/audiooutput-manager-ptlib.h        \
+	$(ptlib_dir)/audiooutput-manager-ptlib.cpp      \
+	$(ptlib_dir)/audiooutput-main-ptlib.h           \
+	$(ptlib_dir)/audiooutput-main-ptlib.cpp 
 
-libgmaudioinput_ptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)
+libgmptlib_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(PTLIB_LIBS)