ekiga r7835 - in trunk/lib/engine: . components/opal

[jpuydt svn gnome org]

Author: jpuydt
Date: Mon Mar 30 17:43:18 2009
New Revision: 7835
URL: http://svn.gnome.org/viewvc/ekiga?rev=7835&view=rev

Log:
Fixed bug where modifying something in lib/engine/components/opal/ lead to a compiler error

Modified:
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/components/opal/Makefile.am

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Mon Mar 30 17:43:18 2009
@@ -92,7 +92,7 @@
 	$(top_builddir)/lib/engine/audiooutput/libgmaudiooutput.la					\
 	$(top_builddir)/lib/engine/hal/libgmhal.la							\
 	$(top_builddir)/lib/engine/components/gmconf-personal-details/libgmconfpersonaldetails.la	\
-	$(top_builddir)/lib/engine/components/opal/libopal.la                                           \
+	$(top_builddir)/lib/engine/components/opal/libgmopal.la                                           \
 	$(AM_LIBS)
 
 # Default Input Devices

Modified: trunk/lib/engine/components/opal/Makefile.am
==============================================================================
--- trunk/lib/engine/components/opal/Makefile.am	(original)
+++ trunk/lib/engine/components/opal/Makefile.am	Mon Mar 30 17:43:18 2009
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libopal.la
+noinst_LTLIBRARIES = libgmopal.la
 
 opal_dir = $(top_srcdir)/lib/engine/components/opal
 
@@ -22,7 +22,7 @@
 	-I$(top_srcdir)/lib/engine/framework
 
 # Endpoints 
-libopal_la_SOURCES =                            \
+libgmopal_la_SOURCES =                          \
 	$(opal_dir)/opal-call-manager.h         \
 	$(opal_dir)/opal-call-manager.cpp       \
 	$(opal_dir)/pcss-endpoint.h             \
@@ -47,13 +47,13 @@
 	$(opal_dir)/opal-videooutput.cpp
 
 if HAVE_H323
-libopal_la_SOURCES += \
+libgmopal_la_SOURCES += \
 	$(opal_dir)/h323-endpoint.h \
 	$(opal_dir)/h323-endpoint.cpp
 endif
 
 if HAVE_SIP
-libopal_la_SOURCES += \
+libgmopal_la_SOURCES += \
 	$(opal_dir)/sip-chat-simple.h \
 	$(opal_dir)/sip-chat-simple.cpp \
 	$(opal_dir)/sip-dialect.h \
@@ -62,4 +62,4 @@
 	$(opal_dir)/sip-endpoint.cpp
 endif
 
-libopal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)
+libgmopal_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS)