ekiga r7515 - in trunk: . lib/engine lib/engine/components lib/engine/components/dbus lib/engine/components/hal-dbus

[dsandras svn gnome org]

Author: dsandras
Date: Mon Jan  5 11:14:39 2009
New Revision: 7515
URL: http://svn.gnome.org/viewvc/ekiga?rev=7515&view=rev

Log:
Fixed previous commit.


Added:
   trunk/lib/engine/components/hal-dbus/
      - copied from r7514, /trunk/lib/engine/components/dbus/
Removed:
   trunk/lib/engine/components/dbus/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/Makefile.am
   trunk/lib/engine/components/hal-dbus/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan  5 11:14:39 2009
@@ -793,7 +793,7 @@
 lib/engine/components/mlogo-videoinput/Makefile
 lib/engine/components/x-videooutput/Makefile
 lib/engine/components/dx-videooutput/Makefile
-lib/engine/components/dbus/Makefile
+lib/engine/components/hal-dbus/Makefile
 lib/engine/components/echo/Makefile
 )
 

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Mon Jan  5 11:14:39 2009
@@ -62,7 +62,7 @@
 # DBus / HALd
 if HAVE_DBUS
 INCLUDES +=                                             \
-	-I$(top_srcdir)/lib/engine/components/dbus
+	-I$(top_srcdir)/lib/engine/components/hal-dbus
 endif
 
 libekiga_engine_la_SOURCES = engine.h engine.cpp
@@ -104,7 +104,7 @@
 # DBus/HALd
 if HAVE_DBUS
 libekiga_engine_la_LIBADD += \
-	$(top_builddir)/lib/engine/hal/dbus/libgmhal-dbus.la
+	$(top_builddir)/lib/engine/components/hal-dbus/libgmhal-dbus.la
 endif
 
 # XVideo/X

Modified: trunk/lib/engine/components/Makefile.am
==============================================================================
--- trunk/lib/engine/components/Makefile.am	(original)
+++ trunk/lib/engine/components/Makefile.am	Mon Jan  5 11:14:39 2009
@@ -1,3 +1,7 @@
+if HAVE_DBUS
+DBUS_DIR = hal-dbus
+endif
+
 if HAVE_LDAP
 LDAP_DIR = ldap
 endif
@@ -48,6 +52,7 @@
         opal                    \
         ptlib                   \
 	$(AVAHI_DIR)            \
+	$(DBUS_DIR)             \
 	$(GSTREAMER_DIR)        \
 	$(KDE_DIR)              \
 	$(EDS_DIR) 	        \

Modified: trunk/lib/engine/components/hal-dbus/Makefile.am
==============================================================================
--- /trunk/lib/engine/components/dbus/Makefile.am	(original)
+++ trunk/lib/engine/components/hal-dbus/Makefile.am	Mon Jan  5 11:14:39 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmhal-dbus.la
 
-hal_dir = $(top_srcdir)/lib/engine/hal/dbus
+hal_dir = $(top_srcdir)/lib/engine/components/hal-dbus
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(PTLIB_CFLAGS)