GNOME.org
 

[evolution-kolab: 2/13] Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

commit 6684704daafb21a274365fa90f0f965ea8600eb9
Merge: f70d492 6ee13a7
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue May 22 09:36:04 2012 +0200

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx
    
    Conflicts:
    	src/camel/providers/imapx/Makefile.am
    	src/camel/providers/imapx/camel-imapx-conn-manager.c
    	src/camel/providers/imapx/camel-imapx-conn-manager.h
    	src/camel/providers/imapx/camel-imapx-folder.c
    	src/camel/providers/imapx/camel-imapx-server.c
    	src/camel/providers/imapx/camel-imapx-utils.c
    	src/camel/providers/imapx/camel-imapx-utils.h

 src/camel/providers/imapx/Makefile.am              |   19 +
 src/camel/providers/imapx/camel-imapx-command.c    |  724 ---
 src/camel/providers/imapx/camel-imapx-command.h    |  161 -
 .../providers/imapx/camel-imapx-conn-manager.c     |  809 ---
 .../providers/imapx/camel-imapx-conn-manager.h     |   83 -
 src/camel/providers/imapx/camel-imapx-folder.c     |  797 ---
 src/camel/providers/imapx/camel-imapx-folder.h     |   90 -
 src/camel/providers/imapx/camel-imapx-job.c        |  262 -
 src/camel/providers/imapx/camel-imapx-job.h        |   82 -
 src/camel/providers/imapx/camel-imapx-provider.c   |  203 -
 src/camel/providers/imapx/camel-imapx-server.c     | 6665 --------------------
 src/camel/providers/imapx/camel-imapx-server.h     |  232 -
 src/camel/providers/imapx/camel-imapx-settings.c   | 1396 ----
 src/camel/providers/imapx/camel-imapx-settings.h   |  146 -
 .../providers/imapx/camel-imapx-store-summary.c    |  670 --
 .../providers/imapx/camel-imapx-store-summary.h    |  150 -
 src/camel/providers/imapx/camel-imapx-store.c      | 1779 ------
 src/camel/providers/imapx/camel-imapx-store.h      |  101 -
 src/camel/providers/imapx/camel-imapx-stream.c     |  839 ---
 src/camel/providers/imapx/camel-imapx-stream.h     |  159 -
 src/camel/providers/imapx/camel-imapx-summary.c    |  369 --
 src/camel/providers/imapx/camel-imapx-summary.h    |   99 -
 src/camel/providers/imapx/camel-imapx-tokens.txt   |   46 -
 src/camel/providers/imapx/camel-imapx-utils.c      | 2133 -------
 src/camel/providers/imapx/camel-imapx-utils.h      |  295 -
 src/camel/providers/imapx/libcamelimapx.urls       |    1 -
 src/camel/providers/imapx/test-imapx.c             |    4 +-
 27 files changed, 20 insertions(+), 18294 deletions(-)
---
diff --cc src/camel/providers/imapx/Makefile.am
index 4d8e944,8ba0185..0dd8eab
--- a/src/camel/providers/imapx/Makefile.am
+++ b/src/camel/providers/imapx/Makefile.am
@@@ -3,83 -3,25 +3,98 @@@ noinst_LTLIBRARIES = libcamelimapx.l
  
  libcamelimapx_la_CPPFLAGS = \
  	$(AM_CPPFLAGS)				\
 -	-I..					\
 -	-I$(srcdir)/..				\
 -	-I$(top_srcdir)/camel			\
 -	-I$(top_srcdir)				\
  	$(CAMEL_CFLAGS)				\
++<<<<<<< HEAD
 +	$(SQLITE_CFLAGS)			\
 +	$(GLIB_CFLAGS)				\
 +	$(KOLAB_INCLUDE)			\
 +	-DG_LOG_DOMAIN=\"camel-imapx-extd\"
 +
 +libcamelimapx_la_CFLAGS = \
 +	$(CFLAGS)				\
 +	$(ADD_CFLAGS)				\
 +	$(CAMEL_CFLAGS)				\
 +	$(SQLITE_CFLAGS)			\
 +	$(GLIB_CFLAGS)				\
 +	-std=gnu99				\
 +	-Wno-missing-field-initializers		\
 +	-Wno-unused-parameter			\
 +	-Wno-switch-default			\
 +	-Wno-format
 +
 +libcamelimapx_la_SOURCES =			\
 +	camel-imapx-command.c			\
 +	camel-imapx-conn-manager.c		\
 +	camel-imapx-extd-conn-manager.c		\
 +	camel-imapx-folder.c			\
 +	camel-imapx-extd-folder.c		\
 +	camel-imapx-job.c			\
 +	camel-imapx-metadata.c			\
 +	camel-imapx-provider.c			\
 +	camel-imapx-server.c			\
 +	camel-imapx-extd-server.c		\
 +	camel-imapx-settings.c			\
 +	camel-imapx-store-summary.c		\
 +	camel-imapx-store.c			\
 +	camel-imapx-extd-store.c		\
 +	camel-imapx-stream.c			\
 +	camel-imapx-summary.c			\
 +	camel-imapx-utils.c
 +
 +noinst_HEADERS =				\
 +	camel-imapx-command.h			\
 +	camel-imapx-conn-manager.h		\
 +	camel-imapx-conn-manager-defs.h		\
 +	camel-imapx-conn-manager-friend.h	\
 +	camel-imapx-extd-conn-manager.h		\
 +	camel-imapx-extd-conn-manager-friend.h	\
 +	camel-imapx-folder.h			\
 +	camel-imapx-folder-defs.h		\
 +	camel-imapx-folder-friend.h		\
 +	camel-imapx-extd-folder.h		\
 +	camel-imapx-job.h			\
 +	camel-imapx-metadata.h			\
 +	camel-imapx-server.h			\
 +	camel-imapx-server-defs.h		\
 +	camel-imapx-server-friend.h		\
 +	camel-imapx-extd-server.h		\
 +	camel-imapx-settings.h			\
 +	camel-imapx-store-summary.h		\
 +	camel-imapx-store.h			\
 +	camel-imapx-extd-store.h		\
 +	camel-imapx-stream.h			\
 +	camel-imapx-summary.h			\
 +	camel-imapx-utils.h
 +
 +camel-imapx-tokenise.h: camel-imapx-tokens.txt
 +	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
 +camel-imapx-extd-tokenise.h: camel-imapx-extd-tokens.txt
 +	@GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
++=======
+ 	-DG_LOG_DOMAIN=\"camel-imapx\"		\
+ 	$(CODE_COVERAGE_CFLAGS)			\
+ 	$(NULL)
+ 
+ libcamelimapx_la_SOURCES =			\
+ 	camel-imapx-provider.c
++>>>>>>> EDS_IMAPX_nobuild
  
  libcamelimapx_la_LIBADD = \
 -        $(top_builddir)/camel/libcamel-1.2.la	\
 -        $(CAMEL_LIBS)
 +        $(CAMEL_LIBS)				\
 +        $(SQLITE_LIBS)				\
 +	$(GLIB_LIBS)				\
 +        $(KOLAB_LIB_EKOLABUTIL)
  
++<<<<<<< HEAD
 +libcamelimapx_la_LDFLAGS =			\
 +	-avoid-version				\
 +	-static					\
 +	$(NO_UNDEFINED)
++=======
+ libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
+ 	$(CODE_COVERAGE_LDFLAGS) \
+ 	$(NULL)
++>>>>>>> EDS_IMAPX_nobuild
  
  noinst_PROGRAMS = test-imapx
  
@@@ -87,27 -29,15 +102,31 @@@ test_imapx_CPPFLAGS = 
  	$(AM_CPPFLAGS)				\
  	-I..					\
  	-I$(srcdir)/..				\
 -	-I$(top_srcdir)/camel			\
  	-I$(top_srcdir)				\
  	$(CAMEL_CFLAGS)				\
 +	$(ADD_CFLAGS)				\
 +	$(GLIB_CFLAGS)				\
  	-DG_LOG_DOMAIN=\"camel-imapx\"
 +
 +test_imapx_CFLAGS = \
 +	$(CFLAGS)				\
 +	$(ADD_CFLAGS)
 +
  test_imapx_SOURCES = test-imapx.c
 +
  test_imapx_LDADD =				\
  	$(CAMEL_LIBS)				\
 -	$(top_builddir)/camel/libcamel-1.2.la
 +	$(SQLITE_LIBS)				\
 +	$(GLIB_LIBS)
 +
++<<<<<<< HEAD
 +BUILT_SOURCES = camel-imapx-tokenise.h camel-imapx-extd-tokenise.h
 +CLEANFILES = $(BUILT_SOURCES)
  
 +#EXTRA_DIST = libcamelimapx.urls camel-imapx-tokens.txt
 +EXTRA_DIST = camel-imapx-tokens.txt camel-imapx-extd-tokens.txt
++=======
+ EXTRA_DIST = libcamelimapx.urls
++>>>>>>> EDS_IMAPX_nobuild
  
  -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]