ekiga r7501 - in trunk: . lib/engine lib/engine/account lib/engine/account/skel lib/engine/addressbook lib/engine/addressbook/skel lib/engine/chat/echo lib/engine/chat/skel lib/engine/components/avahi lib/engine/components/avahi-publisher lib/engine/components/call-history lib/engine/components/evolution lib/engine/components/kab lib/engine/components/ldap lib/engine/components/local-roster lib/engine/components/opal lib/engine/components/resource-list lib/engine/gui/gtk-core lib/engine/gui/gtk-frontend lib/engine/presence lib/engine/presence/skel lib/engine/protocol lib/engine/protocol/skel lib/gui src

From: dsandras svn gnome org
To: svn-commits-list gnome org
Subject: ekiga r7501 - in trunk: . lib/engine lib/engine/account lib/engine/account/skel lib/engine/addressbook lib/engine/addressbook/skel lib/engine/chat/echo lib/engine/chat/skel lib/engine/components/avahi lib/engine/components/avahi-publisher lib/engine/components/call-history lib/engine/components/evolution lib/engine/components/kab lib/engine/components/ldap lib/engine/components/local-roster lib/engine/components/opal lib/engine/components/resource-list lib/engine/gui/gtk-core lib/engine/gui/gtk-frontend lib/engine/presence lib/engine/presence/skel lib/engine/protocol lib/engine/protocol/skel lib/gui src
Date: Sun, 4 Jan 2009 18:04:06 +0000 (UTC)
Author: dsandras
Date: Sun Jan  4 18:04:05 2009
New Revision: 7501
URL: http://svn.gnome.org/viewvc/ekiga?rev=7501&view=rev

Log:
Dropped the skel directory when it did not make sense.


Added:
   trunk/lib/engine/account/Makefile.am   (contents, props changed)
      - copied, changed from r7498, /trunk/lib/engine/account/skel/Makefile.am
   trunk/lib/engine/account/account-core.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/account/skel/account-core.cpp
   trunk/lib/engine/account/account-core.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/account/skel/account-core.h
   trunk/lib/engine/account/account.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/account/skel/account.h
   trunk/lib/engine/account/bank-impl.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/account/skel/bank-impl.h
   trunk/lib/engine/account/bank.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/account/skel/bank.h
   trunk/lib/engine/addressbook/Makefile.am   (contents, props changed)
      - copied, changed from r7498, /trunk/lib/engine/addressbook/skel/Makefile.am
   trunk/lib/engine/addressbook/book-impl.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/book-impl.h
   trunk/lib/engine/addressbook/book.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/book.h
   trunk/lib/engine/addressbook/contact-core.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/contact-core.cpp
   trunk/lib/engine/addressbook/contact-core.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/contact-core.h
   trunk/lib/engine/addressbook/contact.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/contact.h
   trunk/lib/engine/addressbook/source-impl.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/source-impl.h
   trunk/lib/engine/addressbook/source.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/addressbook/skel/source.h
   trunk/lib/engine/presence/Makefile.am   (contents, props changed)
      - copied, changed from r7498, /trunk/lib/engine/presence/skel/Makefile.am
   trunk/lib/engine/presence/cluster-impl.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/cluster-impl.h
   trunk/lib/engine/presence/cluster.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/cluster.h
   trunk/lib/engine/presence/heap-impl.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/heap-impl.h
   trunk/lib/engine/presence/heap.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/heap.h
   trunk/lib/engine/presence/presence-core.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/presence-core.cpp
   trunk/lib/engine/presence/presence-core.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/presence-core.h
   trunk/lib/engine/presence/presentity.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/presentity.h
   trunk/lib/engine/presence/proxy-presentity.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/proxy-presentity.cpp
   trunk/lib/engine/presence/proxy-presentity.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/proxy-presentity.h
   trunk/lib/engine/presence/uri-presentity.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/uri-presentity.cpp
   trunk/lib/engine/presence/uri-presentity.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/presence/skel/uri-presentity.h
   trunk/lib/engine/protocol/Makefile.am   (contents, props changed)
      - copied, changed from r7498, /trunk/lib/engine/protocol/skel/Makefile.am
   trunk/lib/engine/protocol/call-core.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/call-core.cpp
   trunk/lib/engine/protocol/call-core.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/call-core.h
   trunk/lib/engine/protocol/call-manager.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/call-manager.cpp
   trunk/lib/engine/protocol/call-manager.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/call-manager.h
   trunk/lib/engine/protocol/call-protocol-manager.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/call-protocol-manager.h
   trunk/lib/engine/protocol/call.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/call.h
   trunk/lib/engine/protocol/codec-description.cpp   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/codec-description.cpp
   trunk/lib/engine/protocol/codec-description.h   (props changed)
      - copied unchanged from r7498, /trunk/lib/engine/protocol/skel/codec-description.h
Removed:
   trunk/lib/engine/account/skel/
   trunk/lib/engine/addressbook/skel/
   trunk/lib/engine/presence/skel/
   trunk/lib/engine/protocol/skel/
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/lib/engine/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/avahi/Makefile.am
   trunk/lib/engine/components/call-history/Makefile.am
   trunk/lib/engine/components/evolution/Makefile.am
   trunk/lib/engine/components/kab/Makefile.am
   trunk/lib/engine/components/ldap/Makefile.am
   trunk/lib/engine/components/local-roster/Makefile.am
   trunk/lib/engine/components/opal/Makefile.am
   trunk/lib/engine/components/resource-list/Makefile.am
   trunk/lib/engine/gui/gtk-core/Makefile.am
   trunk/lib/engine/gui/gtk-frontend/Makefile.am
   trunk/lib/gui/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan  4 18:04:05 2009
@@ -760,12 +760,10 @@
 help/Makefile
 lib/engine/Makefile
 lib/engine/account/Makefile
-lib/engine/account/skel/Makefile
 lib/engine/addressbook/Makefile
 lib/engine/components/call-history/Makefile
 lib/engine/components/ldap/Makefile
 lib/engine/components/kab/Makefile
-lib/engine/addressbook/skel/Makefile
 lib/engine/chat/Makefile
 lib/engine/chat/echo/Makefile
 lib/engine/chat/skel/Makefile
@@ -773,9 +771,7 @@
 lib/engine/presence/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
 lib/engine/videooutput/Makefile
 lib/engine/videooutput/skel/Makefile
 lib/engine/videooutput/x/Makefile

Modified: trunk/lib/engine/Makefile.am
==============================================================================
--- trunk/lib/engine/Makefile.am	(original)
+++ trunk/lib/engine/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -8,15 +8,10 @@
 	-I$(top_srcdir)/lib/engine/gui/gtk-core				\
 	-I$(top_srcdir)/lib/engine/gui/gtk-frontend			\
 	-I$(top_srcdir)/lib/engine/framework/		 		\
-	-I$(top_srcdir)/lib/engine/chat/skel				\
-	-I$(top_srcdir)/lib/engine/protocol/skel			\
-	-I$(top_srcdir)/lib/engine/addressbook/skel			\
 	-I$(top_srcdir)/lib/engine/components/call-history		\
 	-I$(top_srcdir)/lib/engine/components/evolution		        \
 	-I$(top_srcdir)/lib/engine/components/kab			\
 	-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/components/avahi			\
 	-I$(top_srcdir)/lib/engine/components/local-roster		\
 	-I$(top_srcdir)/lib/engine/videooutput/skel			\
@@ -75,12 +70,12 @@
 	$(top_builddir)/lib/engine/gui/gtk-core/libgmgtk-core.la 					\
 	$(top_builddir)/lib/engine/gui/gtk-frontend/libgmgtk-frontend.la 				\
 	$(top_builddir)/lib/engine/chat/skel/libgmchat.la 						\
-	$(top_builddir)/lib/engine/protocol/skel/libgmprotocol.la	 				\
+	$(top_builddir)/lib/engine/protocol/libgmprotocol.la	 				\
 	$(top_builddir)/lib/engine/framework/libgmframework.la 						\
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la 				\
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la 				\
 	$(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/account/libaccount.la 						\
+	$(top_builddir)/lib/engine/presence/libgmpresence.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					\

Copied: trunk/lib/engine/account/Makefile.am (from r7498, /trunk/lib/engine/account/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/account/skel/Makefile.am	(original)
+++ trunk/lib/engine/account/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libaccount.la
 
-account_dir = $(top_srcdir)/lib/engine/account/skel
+account_dir = $(top_srcdir)/lib/engine/account
 
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 

Copied: trunk/lib/engine/addressbook/Makefile.am (from r7498, /trunk/lib/engine/addressbook/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/addressbook/skel/Makefile.am	(original)
+++ trunk/lib/engine/addressbook/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmaddressbook.la
 
-addressbook_dir = $(top_srcdir)/lib/engine/addressbook/skel
+addressbook_dir = $(top_srcdir)/lib/engine/addressbook
 
 AM_CXXFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 

Modified: trunk/lib/engine/chat/echo/Makefile.am
==============================================================================
--- trunk/lib/engine/chat/echo/Makefile.am	(original)
+++ trunk/lib/engine/chat/echo/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -6,7 +6,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/presence/skel \
+	-I$(top_srcdir)/lib/engine/presence \
 	-I$(top_srcdir)/lib/engine/chat/skel
 
 libgmechochat_la_SOURCES = \

Modified: trunk/lib/engine/chat/skel/Makefile.am
==============================================================================
--- trunk/lib/engine/chat/skel/Makefile.am	(original)
+++ trunk/lib/engine/chat/skel/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -6,7 +6,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/presence/skel
+	-I$(top_srcdir)/lib/engine/presence
 
 libgmchat_la_SOURCES = \
 	$(chat_dir)/chat-core.h			\

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	Sun Jan  4 18:04:05 2009
@@ -7,9 +7,9 @@
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf	 		\
 	-I$(top_srcdir)/lib/engine/framework		\
-	-I$(top_srcdir)/lib/engine/protocol/skel 	\
-	-I$(top_srcdir)/lib/engine/presence/skel 	\
-	-I$(top_srcdir)/lib/engine/account/skel 
+	-I$(top_srcdir)/lib/engine/protocol 	\
+	-I$(top_srcdir)/lib/engine/presence 	\
+	-I$(top_srcdir)/lib/engine/account 
 
 libavahipublisher_la_SOURCES = 						\
 	$(avahi_publisher_dir)/avahi-publisher-main.cpp			\
@@ -18,8 +18,8 @@
 	$(avahi_publisher_dir)/avahi-publisher.h
 
 libavahipublisher_la_LIBADD = 						\
-	$(top_builddir)/lib/engine/account/skel/libaccount.la		\
+	$(top_builddir)/lib/engine/account/libaccount.la		\
 	$(top_builddir)/lib/engine/framework/libgmframework.la		\
-	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la
+	$(top_builddir)/lib/engine/presence/libgmpresence.la
 
 libavahipublisher_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(GLIB_LIBS) $(AVAHI_LIBS)

Modified: trunk/lib/engine/components/avahi/Makefile.am
==============================================================================
--- trunk/lib/engine/components/avahi/Makefile.am	(original)
+++ trunk/lib/engine/components/avahi/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -6,8 +6,8 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/account/skel \
-	-I$(top_srcdir)/lib/engine/presence/skel
+	-I$(top_srcdir)/lib/engine/account \
+	-I$(top_srcdir)/lib/engine/presence
 
 libgmavahi_la_SOURCES = \
 	$(avahi_dir)/avahi-heap.h \
@@ -18,6 +18,6 @@
 	$(avahi_dir)/avahi-main.cpp
 
 libgmavahi_la_LIBADD = \
-	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la
+	$(top_builddir)/lib/engine/presence/libgmpresence.la
 
 libgmavahi_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(AVAHI_LIBS)

Modified: trunk/lib/engine/components/call-history/Makefile.am
==============================================================================
--- trunk/lib/engine/components/call-history/Makefile.am	(original)
+++ trunk/lib/engine/components/call-history/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -7,8 +7,8 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/addressbook/skel \
-	-I$(top_srcdir)/lib/engine/protocol/skel
+	-I$(top_srcdir)/lib/engine/addressbook \
+	-I$(top_srcdir)/lib/engine/protocol
 
 libcall_history_la_SOURCES = \
 	$(call_history_dir)/history-contact.h \
@@ -21,6 +21,6 @@
 	$(call_history_dir)/history-main.cpp
 
 libcall_history_la_LIBADD = \
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
 libcall_history_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/components/evolution/Makefile.am
==============================================================================
--- trunk/lib/engine/components/evolution/Makefile.am	(original)
+++ trunk/lib/engine/components/evolution/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -6,7 +6,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/addressbook/skel
+	-I$(top_srcdir)/lib/engine/addressbook
 
 libgmevolution_la_SOURCES = \
 	$(evolution_dir)/evolution-contact.h \
@@ -19,6 +19,6 @@
 	$(evolution_dir)/evolution-main.cpp
 
 libgmevolution_la_LIBADD = \
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
 libgmevolution_la_LDFLAGS = -export-dynamic -no-undefined $(SIGC_LIBS) $(EDS_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/components/kab/Makefile.am
==============================================================================
--- trunk/lib/engine/components/kab/Makefile.am	(original)
+++ trunk/lib/engine/components/kab/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -10,7 +10,7 @@
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/addressbook/skel
+	-I$(top_srcdir)/lib/engine/addressbook
 
 libgmkab_la_SOURCES = \
 	$(kab_dir)/kab-contact.h \
@@ -23,6 +23,6 @@
 	$(kab_dir)/kab-main.cpp
 
 libgmkab_la_LIBADD = \
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
 libgmkab_la_LDFLAGS = -export-dynamic -no-undefined $(KAB_LIBS)

Modified: trunk/lib/engine/components/ldap/Makefile.am
==============================================================================
--- trunk/lib/engine/components/ldap/Makefile.am	(original)
+++ trunk/lib/engine/components/ldap/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -7,7 +7,7 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf 			\
 	-I$(top_srcdir)/lib/engine/framework 		\
-	-I$(top_srcdir)/lib/engine/addressbook/skel
+	-I$(top_srcdir)/lib/engine/addressbook
 
 libgmldap_la_SOURCES = \
 	$(ldap_dir)/ldap-contact.h 	\
@@ -20,6 +20,6 @@
 	$(ldap_dir)/ldap-main.cpp
 
 libgmldap_la_LIBADD = \
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
 libgmldap_la_LDFLAGS = -export-dynamic -no-undefined $(LDAP_LIBS) $(SIGC_LIBS) $(GLIB_LIBS) $(XML_LIBS)

Modified: trunk/lib/engine/components/local-roster/Makefile.am
==============================================================================
--- trunk/lib/engine/components/local-roster/Makefile.am	(original)
+++ trunk/lib/engine/components/local-roster/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -7,9 +7,9 @@
 INCLUDES = \
 	-I$(top_srcdir)/lib/gmconf	 		\
 	-I$(top_srcdir)/lib/engine/framework 		\
-	-I$(top_srcdir)/lib/engine/addressbook/skel	\
-	-I$(top_srcdir)/lib/engine/account/skel		\
-	-I$(top_srcdir)/lib/engine/presence/skel
+	-I$(top_srcdir)/lib/engine/addressbook	\
+	-I$(top_srcdir)/lib/engine/account		\
+	-I$(top_srcdir)/lib/engine/presence
 
 liblocal_roster_la_SOURCES = \
 	$(local_roster_dir)/local-presentity.h \
@@ -24,7 +24,7 @@
 	$(local_roster_dir)/local-roster-bridge.cpp
 
 liblocal_roster_la_LIBADD = \
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la \
-	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
+	$(top_builddir)/lib/engine/presence/libgmpresence.la
 
 liblocal_roster_la_LDFLAGS = -export-dynamic -no-undefined $(XML_LIBS) $(SIGC_LIBS) $(GLIB_LIBS)

Modified: trunk/lib/engine/components/opal/Makefile.am
==============================================================================
--- trunk/lib/engine/components/opal/Makefile.am	(original)
+++ trunk/lib/engine/components/opal/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -9,12 +9,12 @@
 	-I$(top_srcdir)/lib/gmconf			\
 	-I$(top_srcdir)/lib/toolbox/			\
 	-I$(top_srcdir)/lib/engine/			\
-	-I$(top_srcdir)/lib/engine/account/skel		\
-	-I$(top_srcdir)/lib/engine/addressbook/skel	\
+	-I$(top_srcdir)/lib/engine/account		\
+	-I$(top_srcdir)/lib/engine/addressbook	\
 	-I$(top_srcdir)/lib/engine/chat/skel		\
 	-I$(top_srcdir)/lib/engine/hal/skel		\
-	-I$(top_srcdir)/lib/engine/presence/skel	\
-	-I$(top_srcdir)/lib/engine/protocol/skel	\
+	-I$(top_srcdir)/lib/engine/presence	\
+	-I$(top_srcdir)/lib/engine/protocol	\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\
 	-I$(top_srcdir)/lib/engine/videoinput/skel	\
 	-I$(top_srcdir)/lib/engine/audioinput/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	Sun Jan  4 18:04:05 2009
@@ -7,8 +7,8 @@
 INCLUDES = 						\
 	-I$(top_srcdir)/lib/gmconf			\
 	-I$(top_srcdir)/lib/engine/framework		\
-	-I$(top_srcdir)/lib/engine/presence/skel	\
-	-I$(top_srcdir)/lib/engine/account/skel		\
+	-I$(top_srcdir)/lib/engine/presence	\
+	-I$(top_srcdir)/lib/engine/account		\
 	-I$(top_srcdir)/lib/engine/components/xcap
 
 libgmresource_list_la_SOURCES = \

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	Sun Jan  4 18:04:05 2009
@@ -9,8 +9,8 @@
 	-I$(top_srcdir)/lib/gui \
 	-I$(top_srcdir)/lib/engine \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/presence/skel \
-	-I$(top_srcdir)/lib/engine/addressbook/skel
+	-I$(top_srcdir)/lib/engine/presence \
+	-I$(top_srcdir)/lib/engine/addressbook
 
 libgmgtk_core_la_SOURCES = \
 	$(gtk_core_dir)/toolbar-builder-gtk.h \
@@ -26,7 +26,7 @@
 
 libgmgtk_core_la_LIBADD = \
 	$(top_builddir)/lib/gui/libgmwidgets.la \
-	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la \
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la
+	$(top_builddir)/lib/engine/presence/libgmpresence.la \
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la
 
 libgmgtk_core_la_LDFLAGS = -export-dynamic -no-undefined $(GTK_LIBS)

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	Sun Jan  4 18:04:05 2009
@@ -10,10 +10,10 @@
 	-I$(top_srcdir)/lib/gui 				\
 	-I$(top_srcdir)/lib/engine/framework 			\
 	-I$(top_srcdir)/lib/engine/chat/skel 			\
-	-I$(top_srcdir)/lib/engine/presence/skel 		\
-	-I$(top_srcdir)/lib/engine/protocol/skel 		\
-	-I$(top_srcdir)/lib/engine/account/skel 		\
-	-I$(top_srcdir)/lib/engine/addressbook/skel 		\
+	-I$(top_srcdir)/lib/engine/presence 		\
+	-I$(top_srcdir)/lib/engine/protocol 		\
+	-I$(top_srcdir)/lib/engine/account 		\
+	-I$(top_srcdir)/lib/engine/addressbook 		\
 	-I$(top_srcdir)/lib/engine/components/call-history 	\
 	-I$(top_srcdir)/lib/engine/gui/gtk-core 
 
@@ -42,8 +42,8 @@
 libgmgtk_frontend_la_LIBADD = \
 	$(top_builddir)/lib/gui/libgmwidgets.la 			\
 	$(top_builddir)/lib/engine/chat/skel/libgmchat.la 		\
-	$(top_builddir)/lib/engine/presence/skel/libgmpresence.la 	\
-	$(top_builddir)/lib/engine/addressbook/skel/libgmaddressbook.la \
+	$(top_builddir)/lib/engine/presence/libgmpresence.la 	\
+	$(top_builddir)/lib/engine/addressbook/libgmaddressbook.la \
 	$(top_builddir)/lib/engine/gui/gtk-core/libgmgtk-core.la
 
 libgmgtk_frontend_la_LDFLAGS = -export-dynamic -no-undefined $(GTK_LIBS)

Copied: trunk/lib/engine/presence/Makefile.am (from r7498, /trunk/lib/engine/presence/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/presence/skel/Makefile.am	(original)
+++ trunk/lib/engine/presence/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -1,13 +1,13 @@
 noinst_LTLIBRARIES = libgmpresence.la
 
-presence_dir = $(top_srcdir)/lib/engine/presence/skel
+presence_dir = $(top_srcdir)/lib/engine/presence
 
 AM_CXXFLAGS = $(SIGC_CFLAGS)
 
 INCLUDES = \
 	-I$(top_srcdir)/lib/engine/framework \
-	-I$(top_srcdir)/lib/engine/presence/skel \
-	-I$(top_srcdir)/lib/engine/account/skel
+	-I$(top_srcdir)/lib/engine/presence \
+	-I$(top_srcdir)/lib/engine/account
 
 libgmpresence_la_SOURCES = \
 	$(presence_dir)/presentity.h		\

Copied: trunk/lib/engine/protocol/Makefile.am (from r7498, /trunk/lib/engine/protocol/skel/Makefile.am)
==============================================================================
--- /trunk/lib/engine/protocol/skel/Makefile.am	(original)
+++ trunk/lib/engine/protocol/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libgmprotocol.la
 
-protocol_dir = $(top_srcdir)/lib/engine/protocol/skel
+protocol_dir = $(top_srcdir)/lib/engine/protocol/
 
 AM_CPPFLAGS = $(SIGC_CFLAGS) $(GLIB_CFLAGS)
 

Modified: trunk/lib/gui/Makefile.am
==============================================================================
--- trunk/lib/gui/Makefile.am	(original)
+++ trunk/lib/gui/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -71,7 +71,7 @@
 	-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)/lib/engine/protocol	\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Jan  4 18:04:05 2009
@@ -6,11 +6,11 @@
 	-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	\
+	-I$(top_srcdir)/lib/engine/account		\
+	-I$(top_srcdir)/lib/engine/addressbook	\
 	-I$(top_srcdir)/lib/engine/chat/skel		\
-	-I$(top_srcdir)/lib/engine/presence/skel	\
-	-I$(top_srcdir)/lib/engine/protocol/skel	\
+	-I$(top_srcdir)/lib/engine/presence	\
+	-I$(top_srcdir)/lib/engine/protocol	\
 	-I$(top_srcdir)/lib/engine/protocol/sip		\
 	-I$(top_srcdir)/lib/engine/videooutput/skel	\
 	-I$(top_srcdir)/lib/engine/videoinput/skel	\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]