[Commits] Makefile.am 1.2 1.3 vcard-utils.c 1.6 NONE vcard-utils.h 1.2 NONE

[miras at claws-mail.org]

Update of /home/claws-mail/contacts/extensions/vcard/src
In directory claws-mail:/tmp/cvs-serv25973/extensions/vcard/src

Modified Files:
	Makefile.am 
Removed Files:
	vcard-utils.c vcard-utils.h 
Log Message:
2012-01-05 [mir]	0.6.0cvs77

	* Makefile.am
	* extensions/vcard/src/Makefile.am
	* extensions/vcard/src/vcard-utils.c
	* extensions/vcard/src/vcard-utils.h
	* libversit/Makefile.am
	* libversit/vcard-utils.c
	* libversit/vcard-utils.h
	    move libversit and vcard-utils to project
	    wide library to be able to add vcard features
	    to claws-mail.

Index: Makefile.am
===================================================================
RCS file: /home/claws-mail/contacts/extensions/vcard/src/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	31 Dec 2011 15:07:11 -0000	1.2
+++ Makefile.am	5 Jan 2012 01:45:06 -0000	1.3
@@ -1,8 +1,6 @@
 # $Id$
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = libversit
-
 extensiondir = $(CLAWS_CONTACTS_EXTENSIONDIR)
 
 extension_LTLIBRARIES = vcard-extension.la
@@ -14,26 +12,21 @@
 	   -I${top_srcdir} \
 	   -I${top_srcdir}/src \
 	   -I${top_srcdir}/src/dbus \
-	   -I${abs_srcdir}/libversit \
+	   -I${top_srcdir}/libversit \
 	   -I${top_builddir} \
 	   @GLIB_CFLAGS@ \
 	   @GTK_CFLAGS@
 
 
-vcard_extensionincludedir = \
-		$(includedir)/claws-contacts/extensions/@PACKAGE@
-
 AM_CPPFLAGS = \
 		$(CLAWS_CONTACTS_CFLAGS) \
 		-DG_LOG_DOMAIN=\"Claws-Contacts\"
 
 vcard_extension_la_SOURCES = \
-		    vcard-extension.c \
-		    vcard-utils.h \
-			vcard-utils.c
+		    vcard-extension.c
 
 vcard_extension_la_LIBADD = \
 		    @GLIB_LIBS@ \
 		    @GTK_LIBS@ \
-		    libversit/libversit.la
+		    ${top_builddir}/libversit/libversit.la
 

--- vcard-utils.c DELETED ---

--- vcard-utils.h DELETED ---