evolution-data-server r10083 - in trunk: . servers/google/libgdata servers/google/libgdata-google

[tobiasmue svn gnome org]

Author: tobiasmue
Date: Mon Feb 23 15:10:17 2009
New Revision: 10083
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=10083&view=rev

Log:
2009-02-23  Tobias Mueller  <tobiasmue svn gnome org>

    * servers/google/libgdata-google/libgdata-google.pc.in 
    servers/google/libgdata-google/Makefile.am
    servers/google/libgdata/Makefile.am
    servers/google/libgdata/libgdata.pc.in:
    Remove unnecessary dependencies from libgdata. Patch by Daniel Macks.
    Fixes bug 570696.
                        


Modified:
   trunk/ChangeLog
   trunk/servers/google/libgdata-google/Makefile.am
   trunk/servers/google/libgdata-google/libgdata-google.pc.in
   trunk/servers/google/libgdata/Makefile.am
   trunk/servers/google/libgdata/libgdata.pc.in

Modified: trunk/servers/google/libgdata-google/Makefile.am
==============================================================================
--- trunk/servers/google/libgdata-google/Makefile.am	(original)
+++ trunk/servers/google/libgdata-google/Makefile.am	Mon Feb 23 15:10:17 2009
@@ -3,8 +3,7 @@
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
 	-I$(top_srcdir)/servers/google/libgdata			\
-	$(SOUP_CFLAGS)						\
-	$(E_DATA_SERVER_CFLAGS)
+	$(SOUP_CFLAGS)
 
 lib_LTLIBRARIES = libgdata-google-1.2.la
 
@@ -14,7 +13,6 @@
 
 libgdata_google_1_2_la_LIBADD =					\
 	$(top_builddir)/servers/google/libgdata/libgdata-1.2.la	\
-	$(E_DATA_SERVER_LIBS)					\
 	$(SOUP_LIBS)
 
 libgdata_google_1_2_la_LDFLAGS =	                       \

Modified: trunk/servers/google/libgdata-google/libgdata-google.pc.in
==============================================================================
--- trunk/servers/google/libgdata-google/libgdata-google.pc.in	(original)
+++ trunk/servers/google/libgdata-google/libgdata-google.pc.in	Mon Feb 23 15:10:17 2009
@@ -5,14 +5,12 @@
 datarootdir= datarootdir@
 datadir= datadir@
 
-idldir= idldir@
-IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
-
 privincludedir= privincludedir@
 
 Name: libgdata-google
 Description: Client library for accessing google POA through SOAP interface
 Version: @VERSION@
 Requires: libsoup-2.4 >= @LIBSOUP_REQUIRED@ 
+Requires.private: libgdata-1.2
 Libs: -L${libdir} -lgdata-google-1.2
-Cflags: -I${privincludedir}/google/libgdata -I${privincludedir}/google/libgdata-google
+Cflags: -I${privincludedir}/google/libgdata-google

Modified: trunk/servers/google/libgdata/Makefile.am
==============================================================================
--- trunk/servers/google/libgdata/Makefile.am	(original)
+++ trunk/servers/google/libgdata/Makefile.am	Mon Feb 23 15:10:17 2009
@@ -2,8 +2,7 @@
 	-DG_LOG_DOMAIN=\"libgdata\"			\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
-	$(SOUP_CFLAGS)					\
-	$(E_DATA_SERVER_CFLAGS)
+	$(SOUP_CFLAGS)
 
 lib_LTLIBRARIES = libgdata-1.2.la
 
@@ -16,7 +15,6 @@
 	gdata-service-iface.h			
 
 libgdata_1_2_la_LIBADD =			\
-	$(E_DATA_SERVER_LIBS)			\
 	$(SOUP_LIBS)
 
 libgdata_1_2_la_LDFLAGS =                       \

Modified: trunk/servers/google/libgdata/libgdata.pc.in
==============================================================================
--- trunk/servers/google/libgdata/libgdata.pc.in	(original)
+++ trunk/servers/google/libgdata/libgdata.pc.in	Mon Feb 23 15:10:17 2009
@@ -5,9 +5,6 @@
 datarootdir= datarootdir@
 datadir= datadir@
 
-idldir= idldir@
-IDL_INCLUDES=-I${idldir} @IDL_INCLUDES@
-
 privincludedir= privincludedir@
 
 Name: libgdata