[maemo-commits] [maemo-commits] r17856 - in projects/haf/trunk/gvfs-1.0.3: . daemon

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2009-03-27 21:21:56 +0200 (Fri, 27 Mar 2009)
New Revision: 17856

Added:
   projects/haf/trunk/gvfs-1.0.3/shlib.patch
Modified:
   projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am
Log:
Applied shlib.patch.


Modified: projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am	2009-03-27 19:21:08 UTC (rev 17855)
+++ projects/haf/trunk/gvfs-1.0.3/daemon/Makefile.am	2009-03-27 19:21:56 UTC (rev 17856)
@@ -16,10 +16,10 @@
 	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
 	-DG_DISABLE_DEPRECATED
 
-noinst_LTLIBRARIES=libdaemon.la
+lib_LTLIBRARIES=libgvfsdaemon.la
 
 libraries =						\
-	libdaemon.la					\
+	libgvfsdaemon.la					\
 	$(top_builddir)/common/libgvfscommon.la		\
 	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
 
@@ -104,7 +104,7 @@
 	gvfsd-test			\
 	$(NULL)
 
-libdaemon_la_SOURCES = \
+libgvfsdaemon_la_SOURCES = \
 	gvfsdaemon.c gvfsdaemon.h \
 	gvfsbackend.c gvfsbackend.h \
 	gvfschannel.c gvfschannel.h \

Added: projects/haf/trunk/gvfs-1.0.3/shlib.patch
===================================================================
--- projects/haf/trunk/gvfs-1.0.3/shlib.patch	2009-03-27 19:21:08 UTC (rev 17855)
+++ projects/haf/trunk/gvfs-1.0.3/shlib.patch	2009-03-27 19:21:56 UTC (rev 17856)
@@ -0,0 +1,26 @@
+Index: daemon/Makefile.am
+===================================================================
+--- daemon/Makefile.am	(revision 17849)
++++ daemon/Makefile.am	(working copy)
+@@ -16,10 +16,10 @@ INCLUDES =					\
+ 	-DGVFS_LOCALEDIR=\""$(localedir)"\"     \
+ 	-DG_DISABLE_DEPRECATED
+ 
+-noinst_LTLIBRARIES=libdaemon.la
++lib_LTLIBRARIES=libgvfsdaemon.la
+ 
+ libraries =						\
+-	libdaemon.la					\
++	libgvfsdaemon.la					\
+ 	$(top_builddir)/common/libgvfscommon.la		\
+ 	$(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS)
+ 
+@@ -104,7 +104,7 @@ noinst_PROGRAMS =				\
+ 	gvfsd-test			\
+ 	$(NULL)
+ 
+-libdaemon_la_SOURCES = \
++libgvfsdaemon_la_SOURCES = \
+ 	gvfsdaemon.c gvfsdaemon.h \
+ 	gvfsbackend.c gvfsbackend.h \
+ 	gvfschannel.c gvfschannel.h \