ekiga r7407 - in trunk: . lib/engine lib/engine/components lib/engine/components/avahi lib/engine/components/local-roster lib/engine/presence lib/engine/presence/avahi lib/engine/presence/local-roster

[dsandras svn gnome org]

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

Log:
Moved engine components to their own directory.


Added:
   trunk/lib/engine/components/avahi/   (props changed)
      - copied from r7404, /trunk/lib/engine/presence/avahi/
   trunk/lib/engine/components/local-roster/   (props changed)
      - copied from r7404, /trunk/lib/engine/presence/local-roster/
Removed:
   trunk/lib/engine/presence/avahi/
   trunk/lib/engine/presence/local-roster/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/avahi/Makefile.am
   trunk/lib/engine/components/local-roster/Makefile.am
   trunk/lib/engine/presence/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Nov 23 17:20:32 2008
@@ -772,8 +772,8 @@
 lib/engine/chat/skel/Makefile
 lib/engine/framework/Makefile
 lib/engine/presence/Makefile
-lib/engine/presence/avahi/Makefile
-lib/engine/presence/local-roster/Makefile
+lib/engine/components/avahi/Makefile
+lib/engine/components/local-roster/Makefile
 lib/engine/presence/skel/Makefile
 lib/engine/protocol/Makefile
 lib/engine/protocol/skel/Makefile

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Nov 23 17:20:32 2008
@@ -17,8 +17,8 @@
 	-I$(top_srcdir)/lib/engine/components/ldap			\
 	-I$(top_srcdir)/lib/engine/account/skel				\
 	-I$(top_srcdir)/lib/engine/presence/skel			\
-	-I$(top_srcdir)/lib/engine/presence/avahi			\
-	-I$(top_srcdir)/lib/engine/presence/local-roster		\
+	-I$(top_srcdir)/lib/engine/components/avahi			\
+	-I$(top_srcdir)/lib/engine/components/local-roster		\
 	-I$(top_srcdir)/lib/engine/videooutput/skel			\
 	-I$(top_srcdir)/lib/engine/videoinput/skel			\
 	-I$(top_srcdir)/lib/engine/audioinput/skel			\
@@ -80,7 +80,7 @@
 	$(top_builddir)/lib/engine/components/call-history/libcall-history.la 				\
 	$(top_builddir)/lib/engine/account/skel/libaccount.la 						\
 	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la 					\
-	$(top_builddir)/lib/engine/presence/local-roster/liblocal-roster.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/audioinput/skel/libgmaudioinput.la					\
@@ -124,7 +124,7 @@
 
 if HAVE_AVAHI
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/presence/avahi/libgmavahi.la \
+	$(top_builddir)/lib/engine/components/avahi/libgmavahi.la \
 	$(top_builddir)/lib/engine/components/avahi-publisher/libavahipublisher.la
 endif
 

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Sun Nov 23 17:20:32 2008
@@ -26,9 +26,14 @@
 XCAP_DIRS = xcap resource-list
 endif
 
+if HAVE_AVAHI
+AVAHI_DIR += avahi
+endif
+
 SUBDIRS =                       \
 	call-history	        \
 	gmconf-personal-details \
+        local-roster            \
         opal                    \
 	$(AVAHI_DIR)            \
 	$(GSTREAMER_DIR)        \

Modified: trunk/lib/engine/components/avahi/Makefile.am
==============================================================================
--- /trunk/lib/engine/presence/avahi/Makefile.am	(original)
+++ trunk/lib/engine/components/avahi/Makefile.am	Sun Nov 23 17:20:32 2008
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmavahi.la
 
-avahi_dir = $(top_srcdir)/lib/engine/presence/avahi
+avahi_dir = $(top_srcdir)/lib/engine/components/avahi
 
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(AVAHI_CFLAGS)
 

Modified: trunk/lib/engine/components/local-roster/Makefile.am
==============================================================================
--- /trunk/lib/engine/presence/local-roster/Makefile.am	(original)
+++ trunk/lib/engine/components/local-roster/Makefile.am	Sun Nov 23 17:20:32 2008
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = liblocal-roster.la
 
-local_roster_dir = $(top_srcdir)/lib/engine/presence/local-roster
+local_roster_dir = $(top_srcdir)/lib/engine/components/local-roster
 
 AM_CPPFLAGS = $(XML_CFLAGS) $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 

Modified: trunk/lib/engine/presence/Makefile.am
==============================================================================
--- trunk/lib/engine/presence/Makefile.am	(original)
+++ trunk/lib/engine/presence/Makefile.am	Sun Nov 23 17:20:32 2008
@@ -1,5 +1,2 @@
-if HAVE_AVAHI
-AVAHI_DIR = avahi
-endif
 
-SUBDIRS = skel local-roster $(AVAHI_DIR)
\ No newline at end of file
+SUBDIRS = skel