Moved codeconv.[ch] and unmime.[ch] to common/ subdir.
authorAndrej Kacian <ticho@claws-mail.org>
Fri, 31 Aug 2018 11:39:04 +0000 (13:39 +0200)
committerAndrej Kacian <ticho@claws-mail.org>
Fri, 31 Aug 2018 11:39:04 +0000 (13:39 +0200)
That's where they belong. This also clears up a few ugly
cases of other files in common including "../codeconv.h".

src/Makefile.am
src/common/Makefile.am
src/common/codeconv.c [moved from src/codeconv.c with 100% similarity]
src/common/codeconv.h [moved from src/codeconv.h with 100% similarity]
src/common/template.c
src/common/unmime.c [moved from src/unmime.c with 100% similarity]
src/common/unmime.h [moved from src/unmime.h with 100% similarity]
src/common/utils.c
src/common/xml.c
src/plugins/rssyl/libfeed/parser_opml.c

index 1fb6dcd..30e85a4 100644 (file)
@@ -137,7 +137,6 @@ claws_mail_SOURCES = \
        alertpanel.c \
        autofaces.c \
        avatars.c \
-       codeconv.c \
        compose.c \
        crash.c \
        customheader.c \
@@ -146,7 +145,7 @@ claws_mail_SOURCES = \
        enriched.c \
        entity.c \
        export.c \
-        file_checker.c \
+       file_checker.c \
        filtering.c \
        folder.c \
        folder_item_prefs.c \
@@ -236,7 +235,6 @@ claws_mail_SOURCES = \
        textview.c \
        toolbar.c \
        undo.c \
-       unmime.c \
        uri_opener.c \
        wizard.c \
        $(abook_source)
@@ -257,7 +255,6 @@ claws_mailinclude_HEADERS = \
        alertpanel.h \
        autofaces.h \
        avatars.h \
-       codeconv.h \
        compose.h \
        crash.h \
        customheader.h \
@@ -358,7 +355,6 @@ claws_mailinclude_HEADERS = \
        textview.h \
        toolbar.h \
        undo.h \
-       unmime.h \
        uri_opener.h \
        viewtypes.h \
        wizard.h \
index f9ad434..56b6cdb 100644 (file)
@@ -19,6 +19,7 @@ arch_header =
 endif
 
 libclawscommon_la_SOURCES = $(arch_sources) \
+       codeconv.c \
        hooks.c \
        log.c \
        md5.c \
@@ -43,10 +44,12 @@ libclawscommon_la_SOURCES = $(arch_sources) \
        uuencode.c \
        xml.c \
        xmlprops.c \
-       pkcs5_pbkdf2.c
+       pkcs5_pbkdf2.c \
+       unmime.c
 
 clawscommonincludedir = $(pkgincludedir)/common
 clawscommoninclude_HEADERS = $(arch_headers) \
+       codeconv.h \
        defs.h \
        hooks.h \
        log.h \
@@ -75,7 +78,8 @@ clawscommoninclude_HEADERS = $(arch_headers) \
        version.h \
        xml.h \
        xmlprops.h \
-       pkcs5_pbkdf2.h
+       pkcs5_pbkdf2.h \
+       unmime.h
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/intl \
similarity index 100%
rename from src/codeconv.c
rename to src/common/codeconv.c
similarity index 100%
rename from src/codeconv.h
rename to src/common/codeconv.h
index 9e9e364..9d53d88 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "utils.h"
 #include "template.h"
-#include "../codeconv.h"
+#include "codeconv.h"
 
 static GSList *template_list;
 
similarity index 100%
rename from src/unmime.c
rename to src/common/unmime.c
similarity index 100%
rename from src/unmime.h
rename to src/common/unmime.h
index 0a7f421..bf20ec3 100644 (file)
@@ -83,7 +83,7 @@
 
 #include "utils.h"
 #include "socket.h"
-#include "../codeconv.h"
+#include "codeconv.h"
 #include "tlds.h"
 
 #define BUFFSIZE       8192
index 4868d98..4127fd0 100644 (file)
@@ -24,8 +24,7 @@
 
 #include "xml.h"
 #include "utils.h"
-/* UGLY! */
-#include "../codeconv.h"
+#include "codeconv.h"
 
 #define SPARSE_MEMORY
 /* if this is defined all attr.names and tag.names are stored
index 09e34aa..dc31980 100644 (file)
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <codeconv.h>
+#include <common/codeconv.h>
 
 #include "feed.h"