GNOME.org
 

ekiga r7393 - in trunk: . lib lib/engine lib/engine/account/skel lib/engine/addressbook/call-history lib/engine/addressbook/evolution lib/engine/addressbook/kab lib/engine/addressbook/ldap lib/engine/addressbook/skel lib/engine/audioinput/null lib/engine/audioinput/ptlib lib/engine/audioinput/skel lib/engine/audiooutput/null lib/engine/audiooutput/ptlib lib/engine/audiooutput/skel lib/engine/chat/echo lib/engine/chat/skel lib/engine/components/avahi-publisher lib/engine/components/gmconf-personal-details lib/engine/components/gstreamer lib/engine/components/kde lib/engine/components/opal lib/engine/components/resource-list lib/engine/components/xcap lib/engine/framework lib/engine/gui/gtk-core lib/engine/gui/gtk-frontend lib/engine/hal/dbus lib/engine/hal/skel lib/engine/presence/avahi lib/engine/presence/local-roster lib/engine/presence/skel lib/engine/protocol/skel lib/engine/videoinput/mlogo lib/engine/videoinput/ptlib lib/engine/videoinput/skel lib/engine/videoou tput/dx lib/engine/videooutput/skel lib/engine/videooutput/x lib/gmref lib/gui src

Author: jpuydt
Date: Fri Nov 21 10:12:53 2008
New Revision: 7393
URL: http://svn.gnome.org/viewvc/ekiga?rev=7393&view=rev

Log:
Moved gmref.h to lib/engine/framework : it's a single header file...

Added:
   trunk/lib/engine/framework/gmref.h
      - copied, changed from r7392, /trunk/lib/gmref/gmref.h
Removed:
   trunk/lib/engine/gui/gtk-core/gm-refcounted-boxed.cpp
   trunk/lib/engine/gui/gtk-core/gm-refcounted-boxed.h
   trunk/lib/gmref/Makefile.am
   trunk/lib/gmref/gmref.cpp
   trunk/lib/gmref/gmref.h
Modified:
   trunk/configure.ac
   trunk/lib/Makefile.am
   trunk/lib/engine/Makefile.am
   trunk/lib/engine/account/skel/Makefile.am
   trunk/lib/engine/addressbook/call-history/Makefile.am
   trunk/lib/engine/addressbook/evolution/Makefile.am
   trunk/lib/engine/addressbook/kab/Makefile.am
   trunk/lib/engine/addressbook/ldap/Makefile.am
   trunk/lib/engine/addressbook/skel/Makefile.am
   trunk/lib/engine/audioinput/null/Makefile.am
   trunk/lib/engine/audioinput/ptlib/Makefile.am
   trunk/lib/engine/audioinput/skel/Makefile.am
   trunk/lib/engine/audiooutput/null/Makefile.am
   trunk/lib/engine/audiooutput/ptlib/Makefile.am
   trunk/lib/engine/audiooutput/skel/Makefile.am
   trunk/lib/engine/chat/echo/Makefile.am
   trunk/lib/engine/chat/skel/Makefile.am
   trunk/lib/engine/components/avahi-publisher/Makefile.am
   trunk/lib/engine/components/gmconf-personal-details/Makefile.am
   trunk/lib/engine/components/gstreamer/Makefile.am
   trunk/lib/engine/components/kde/Makefile.am
   trunk/lib/engine/components/opal/Makefile.am
   trunk/lib/engine/components/resource-list/Makefile.am
   trunk/lib/engine/components/xcap/Makefile.am
   trunk/lib/engine/framework/Makefile.am
   trunk/lib/engine/gui/gtk-core/Makefile.am
   trunk/lib/engine/gui/gtk-frontend/Makefile.am
   trunk/lib/engine/hal/dbus/Makefile.am
   trunk/lib/engine/hal/skel/Makefile.am
   trunk/lib/engine/presence/avahi/Makefile.am
   trunk/lib/engine/presence/local-roster/Makefile.am
   trunk/lib/engine/presence/skel/Makefile.am
   trunk/lib/engine/protocol/skel/Makefile.am
   trunk/lib/engine/videoinput/mlogo/Makefile.am
   trunk/lib/engine/videoinput/ptlib/Makefile.am
   trunk/lib/engine/videoinput/skel/Makefile.am
   trunk/lib/engine/videooutput/dx/Makefile.am
   trunk/lib/engine/videooutput/skel/Makefile.am
   trunk/lib/engine/videooutput/x/Makefile.am
   trunk/lib/gui/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Nov 21 10:12:53 2008
@@ -749,7 +749,6 @@
 AC_PACKAGE_NAME.desktop.in
 lib/Makefile
 lib/gmconf/Makefile
-lib/gmref/Makefile
 lib/gui/Makefile
 lib/pixops/Makefile
 lib/toolbox/Makefile

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -1,4 +1,4 @@
-SUBDIRS = gmconf gmref gui toolbox platform
+SUBDIRS = gmconf gui toolbox platform
 
 if !WIN32
 SUBDIRS += pixops
@@ -23,7 +23,6 @@
 libekiga_la_LDFLAGS = -export-dynamic
 libekiga_la_LIBADD = \
 	gmconf/libgmconf.la \
-	gmref/libgmref.la \
 	gui/libgmwidgets.la \
 	toolbox/libtoolbox.la \
 	platform/libgmplatform.la

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -4,7 +4,6 @@
 
 INCLUDES = 								\
 	-I$(top_srcdir)/lib/gmconf/	 				\
-	-I$(top_srcdir)/lib/gmref/	 				\
 	-I$(top_srcdir)/lib/engine/	 				\
 	-I$(top_srcdir)/lib/engine/gui/gtk-core				\
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend			\

Modified: trunk/lib/engine/account/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/account/skel/Makefile.am	(original)
+++ trunk/lib/engine/account/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
-	-I$(top_srcdir)/lib/gmref	 		\
-	-I$(top_srcdir)/lib/engine/include 		\
 	-I$(top_srcdir)/lib/engine/framework
 
 libaccount_la_SOURCES = \

Modified: trunk/lib/engine/addressbook/call-history/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/call-history/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/call-history/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,7 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/addressbook/skel \
 	-I$(top_srcdir)/lib/engine/protocol/skel

Modified: trunk/lib/engine/addressbook/evolution/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/evolution/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/evolution/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(EDS_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/addressbook/skel
 

Modified: trunk/lib/engine/addressbook/kab/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/kab/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/kab/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -9,7 +9,6 @@
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(KAB_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/addressbook/skel
 

Modified: trunk/lib/engine/addressbook/ldap/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/ldap/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/ldap/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,7 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf 			\
-	-I$(top_srcdir)/lib/gmref 			\
 	-I$(top_srcdir)/lib/engine/framework 		\
 	-I$(top_srcdir)/lib/engine/addressbook/skel
 

Modified: trunk/lib/engine/addressbook/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/addressbook/skel/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework
 
 libgmaddressbook_la_SOURCES = \

Modified: trunk/lib/engine/audioinput/null/Makefile.am
==============================================================================
--- trunk/lib/engine/audioinput/null/Makefile.am	(original)
+++ trunk/lib/engine/audioinput/null/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel \
 	-I$(top_srcdir)/lib/engine/audioinput/skel \

Modified: trunk/lib/engine/audioinput/ptlib/Makefile.am
==============================================================================
--- trunk/lib/engine/audioinput/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/audioinput/ptlib/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel \
 	-I$(top_srcdir)/lib/engine/audioinput/skel \

Modified: trunk/lib/engine/audioinput/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/audioinput/skel/Makefile.am	(original)
+++ trunk/lib/engine/audioinput/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel \
 	-I$(top_srcdir)/lib/engine/audioinput/skel \

Modified: trunk/lib/engine/audiooutput/null/Makefile.am
==============================================================================
--- trunk/lib/engine/audiooutput/null/Makefile.am	(original)
+++ trunk/lib/engine/audiooutput/null/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel \
 	-I$(top_srcdir)/lib/engine/audiooutput/null \

Modified: trunk/lib/engine/audiooutput/ptlib/Makefile.am
==============================================================================
--- trunk/lib/engine/audiooutput/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/audiooutput/ptlib/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel \
 	-I$(top_srcdir)/lib/engine/audiooutput/ptlib \

Modified: trunk/lib/engine/audiooutput/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/audiooutput/skel/Makefile.am	(original)
+++ trunk/lib/engine/audiooutput/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/audiooutput/skel \
 	-I$(top_srcdir)/lib/engine/hal/skel

Modified: trunk/lib/engine/chat/echo/Makefile.am
==============================================================================
--- trunk/lib/engine/chat/echo/Makefile.am	(original)
+++ trunk/lib/engine/chat/echo/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/presence/skel \
 	-I$(top_srcdir)/lib/engine/chat/skel

Modified: trunk/lib/engine/chat/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/chat/skel/Makefile.am	(original)
+++ trunk/lib/engine/chat/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/presence/skel
 

Modified: trunk/lib/engine/components/avahi-publisher/Makefile.am
==============================================================================
--- trunk/lib/engine/components/avahi-publisher/Makefile.am	(original)
+++ trunk/lib/engine/components/avahi-publisher/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf	 		\
-	-I$(top_srcdir)/lib/gmref	 		\
-	-I$(top_srcdir)/lib/engine/include 		\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/protocol/skel 	\
 	-I$(top_srcdir)/lib/engine/presence/skel 	\

Modified: trunk/lib/engine/components/gmconf-personal-details/Makefile.am
==============================================================================
--- trunk/lib/engine/components/gmconf-personal-details/Makefile.am	(original)
+++ trunk/lib/engine/components/gmconf-personal-details/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = 					\
 	-I$(top_srcdir)/lib/gmconf	 	\
-	-I$(top_srcdir)/lib/gmref	 	\
-	-I$(top_srcdir)/lib/engine/include 	\
 	-I$(top_srcdir)/lib/engine/framework 
 
 libgmconfpersonaldetails_la_SOURCES = 						\

Modified: trunk/lib/engine/components/gstreamer/Makefile.am
==============================================================================
--- trunk/lib/engine/components/gstreamer/Makefile.am	(original)
+++ trunk/lib/engine/components/gstreamer/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,7 +6,6 @@
 
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf			\
-	-I$(top_srcdir)/lib/gmref			\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/videoinput/skel	\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\

Modified: trunk/lib/engine/components/kde/Makefile.am
==============================================================================
--- trunk/lib/engine/components/kde/Makefile.am	(original)
+++ trunk/lib/engine/components/kde/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(KDE_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework
 
 libgmkde_la_SOURCES = \

Modified: trunk/lib/engine/components/opal/Makefile.am
==============================================================================
--- trunk/lib/engine/components/opal/Makefile.am	(original)
+++ trunk/lib/engine/components/opal/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -7,7 +7,6 @@
 INCLUDES = 					        \
 	-I$(top_srcdir)/lib				\
 	-I$(top_srcdir)/lib/gmconf			\
-	-I$(top_srcdir)/lib/gmref			\
 	-I$(top_srcdir)/lib/toolbox/			\
 	-I$(top_srcdir)/lib/engine/			\
 	-I$(top_srcdir)/lib/engine/account/skel		\

Modified: trunk/lib/engine/components/resource-list/Makefile.am
==============================================================================
--- trunk/lib/engine/components/resource-list/Makefile.am	(original)
+++ trunk/lib/engine/components/resource-list/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,7 +6,6 @@
 
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf			\
-	-I$(top_srcdir)/lib/gmref			\
 	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/presence/skel	\
 	-I$(top_srcdir)/lib/engine/account/skel		\

Modified: trunk/lib/engine/components/xcap/Makefile.am
==============================================================================
--- trunk/lib/engine/components/xcap/Makefile.am	(original)
+++ trunk/lib/engine/components/xcap/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(SOUP_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework
 
 libgmxcap_la_SOURCES = \

Modified: trunk/lib/engine/framework/Makefile.am
==============================================================================
--- trunk/lib/engine/framework/Makefile.am	(original)
+++ trunk/lib/engine/framework/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf			\
-	-I$(top_srcdir)/lib/gmref			\
-	-I$(top_srcdir)/lib/engine/include 		\
 	-I$(top_srcdir)/lib/engine/framework
 
 libgmframework_la_SOURCES = \

Copied: trunk/lib/engine/framework/gmref.h (from r7392, /trunk/lib/gmref/gmref.h)
==============================================================================

Modified: trunk/lib/engine/gui/gtk-core/Makefile.am
==============================================================================
--- trunk/lib/engine/gui/gtk-core/Makefile.am	(original)
+++ trunk/lib/engine/gui/gtk-core/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(GTK_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/toolbox \
 	-I$(top_srcdir)/lib/gui \
 	-I$(top_srcdir)/lib/engine \

Modified: trunk/lib/engine/gui/gtk-frontend/Makefile.am
==============================================================================
--- trunk/lib/engine/gui/gtk-frontend/Makefile.am	(original)
+++ trunk/lib/engine/gui/gtk-frontend/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -7,7 +7,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/ 					\
 	-I$(top_srcdir)/lib/gmconf 				\
-	-I$(top_srcdir)/lib/gmref 				\
 	-I$(top_srcdir)/lib/gui 				\
 	-I$(top_srcdir)/lib/engine/framework 			\
 	-I$(top_srcdir)/lib/engine/chat/skel 			\

Modified: trunk/lib/engine/hal/dbus/Makefile.am
==============================================================================
--- trunk/lib/engine/hal/dbus/Makefile.am	(original)
+++ trunk/lib/engine/hal/dbus/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -7,7 +7,6 @@
 AM_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/hal/skel \
 	-I$(top_srcdir)/lib/engine/hal/dbus

Modified: trunk/lib/engine/hal/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/hal/skel/Makefile.am	(original)
+++ trunk/lib/engine/hal/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/hal/skel
 

Modified: trunk/lib/engine/presence/avahi/Makefile.am
==============================================================================
--- trunk/lib/engine/presence/avahi/Makefile.am	(original)
+++ trunk/lib/engine/presence/avahi/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(AVAHI_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/account/skel \
 	-I$(top_srcdir)/lib/engine/presence/skel

Modified: trunk/lib/engine/presence/local-roster/Makefile.am
==============================================================================
--- trunk/lib/engine/presence/local-roster/Makefile.am	(original)
+++ trunk/lib/engine/presence/local-roster/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,7 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
-	-I$(top_srcdir)/lib/gmref	 		\
 	-I$(top_srcdir)/lib/engine/framework 		\
 	-I$(top_srcdir)/lib/engine/addressbook/skel	\
 	-I$(top_srcdir)/lib/engine/account/skel		\

Modified: trunk/lib/engine/presence/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/presence/skel/Makefile.am	(original)
+++ trunk/lib/engine/presence/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CXXFLAGS = $(SIGC_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/presence/skel \
 	-I$(top_srcdir)/lib/engine/account/skel

Modified: trunk/lib/engine/protocol/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/protocol/skel/Makefile.am	(original)
+++ trunk/lib/engine/protocol/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -5,7 +5,6 @@
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 
 INCLUDES = \
-	-I$(top_srcdir)/lib/gmref \
 	-I$(top_srcdir)/lib/engine/framework
 
 libgmprotocol_la_SOURCES = \

Modified: trunk/lib/engine/videoinput/mlogo/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/mlogo/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/mlogo/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -7,8 +7,6 @@
 INCLUDES = \
 	-I$(top_srcdir)/pixmaps \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
 	-I$(top_srcdir)/lib/engine/videoinput/skel \

Modified: trunk/lib/engine/videoinput/ptlib/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/ptlib/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/ptlib/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
 	-I$(top_srcdir)/lib/engine/videoinput/skel \

Modified: trunk/lib/engine/videoinput/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/videoinput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videoinput/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
 	-I$(top_srcdir)/lib/engine/videoinput/skel \

Modified: trunk/lib/engine/videooutput/dx/Makefile.am
==============================================================================
--- trunk/lib/engine/videooutput/dx/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/dx/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -7,8 +7,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
 	-I$(top_srcdir)/lib/engine/videooutput/common \

Modified: trunk/lib/engine/videooutput/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/videooutput/skel/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/skel/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -6,8 +6,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel
 

Modified: trunk/lib/engine/videooutput/x/Makefile.am
==============================================================================
--- trunk/lib/engine/videooutput/x/Makefile.am	(original)
+++ trunk/lib/engine/videooutput/x/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -7,8 +7,6 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
-	-I$(top_srcdir)/lib/gmref \
-	-I$(top_srcdir)/lib/engine/include \
 	-I$(top_srcdir)/lib/engine/framework \
 	-I$(top_srcdir)/lib/engine/videooutput/skel \
 	-I$(top_srcdir)/lib/engine/videooutput/common \

Modified: trunk/lib/gui/Makefile.am
==============================================================================
--- trunk/lib/gui/Makefile.am	(original)
+++ trunk/lib/gui/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -68,6 +68,7 @@
 INCLUDES =						\
 	-I$(top_srcdir)/lib/gmconf			\
 	-I$(top_srcdir)/lib				\
+	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/protocol/skel	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)
@@ -77,8 +78,8 @@
 	-I$(top_srcdir)/lib/pixops
 endif
 
-AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_CFLAGS) $(DX_CFLAGS) $(SIGC_CFLAGS) -I ../../lib/engine/protocol/skel/ -I ../../lib/engine/framework/ -I ../../lib/gmref/
 AM_CFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS)
+AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(XV_CFLAGS) $(DX_CFLAGS) $(SIGC_CFLAGS)
 AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(XV_LIBS) $(DX_LIBS) $(GNOME_LIBS) $(SIGC_LIBS)
 
 libgmwidgets_la_LDFLAGS = -export-dynamic

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Nov 21 10:12:53 2008
@@ -1,10 +1,10 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib				\
 	-I$(top_srcdir)/lib/gmconf			\
-	-I$(top_srcdir)/lib/gmref			\
 	-I$(top_srcdir)/lib/toolbox			\
 	-I$(top_srcdir)/lib/gui				\
 	-I$(top_srcdir)/lib/engine/			\
+	-I$(top_srcdir)/lib/engine/framework		\
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend	\
 	-I$(top_srcdir)/lib/engine/account/skel		\
 	-I$(top_srcdir)/lib/engine/addressbook/skel	\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]