From 9de1a9b318fb0068a280330f8aa85eed3b7576f0 Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andywilliams.me>
Date: Sun, 4 Jan 2015 12:00:40 +0000
Subject: [PATCH] Elm_Code now compiling on Windows, thanks to Vincent Torri
 for the patch. Next to tackle some non-standard EDI code to complete the
 compilation

---
 elm_code/bin/Makefile.am            | 16 +++++++---------
 elm_code/lib/Elm_Code.h             | 16 ++++++++--------
 elm_code/lib/Makefile.am            |  6 ++----
 elm_code/lib/elm_code_common.h      |  3 ---
 elm_code/lib/elm_code_diff_widget.c |  4 ----
 elm_code/lib/elm_code_diff_widget.h |  3 ---
 elm_code/lib/elm_code_file.h        |  4 ----
 elm_code/lib/elm_code_parse.h       |  4 ----
 elm_code/lib/elm_code_widget.c      |  3 ---
 elm_code/lib/elm_code_widget.h      |  5 -----
 10 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/elm_code/bin/Makefile.am b/elm_code/bin/Makefile.am
index 363beb8..b204d98 100644
--- a/elm_code/bin/Makefile.am
+++ b/elm_code/bin/Makefile.am
@@ -2,19 +2,17 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_PROGRAMS = elm_code_test
 
-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--I$(top_builddir)/elm_code/bin/ \
--I$(top_srcdir)/elm_code/bin/ \
--I$(top_builddir)/elm_code/lib/ \
+AM_CPPFLAGS = \
 -I$(top_srcdir)/elm_code/lib/ \
+-DLOCALEDIR=\"$(datadir)/locale\" \
 -DEFL_BETA_API_SUPPORT \
 @EFL_CFLAGS@
 
-elm_code_test_SOURCES = elm_code_test_main.c
-elm_code_test_LDADD = @EFL_LIBS@ $(top_builddir)/elm_code/lib/libelm_code.la
+elm_code_test_SOURCES = \
+elm_code_test_main.c \
+elm_code_test_private.h
 
-localedir = $(datadir)/locale
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+elm_code_test_LDADD = @EFL_LIBS@ $(top_builddir)/elm_code/lib/libelm_code.la -lintl
 
-EXTRA_DIST = elm_code_test_private.h
+elm_code_test_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 
diff --git a/elm_code/lib/Elm_Code.h b/elm_code/lib/Elm_Code.h
index 866ccc7..35071a2 100644
--- a/elm_code/lib/Elm_Code.h
+++ b/elm_code/lib/Elm_Code.h
@@ -1,15 +1,9 @@
 #ifndef ELM_CODE_H_
 # define ELM_CODE_H_
 
-#include <Elementary.h>
-#include <Eo.h>
 #include <Eina.h>
-
-#include <elm_code_common.h>
-#include <elm_code_file.h>
-#include <elm_code_parse.h>
-#include <elm_code_widget.h>
-#include <elm_code_diff_widget.h>
+#include <Eo.h>
+#include <Elementary.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -37,6 +31,12 @@
 # endif
 #endif /* ! _WIN32 */
 
+#include "elm_code_common.h"
+#include "elm_code_file.h"
+#include "elm_code_parse.h"
+#include "elm_code_widget.h"
+#include "elm_code_diff_widget.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/elm_code/lib/Makefile.am b/elm_code/lib/Makefile.am
index 36ecc74..9510cad 100644
--- a/elm_code/lib/Makefile.am
+++ b/elm_code/lib/Makefile.am
@@ -2,9 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 AM_CPPFLAGS = \
 -I$(top_srcdir)/elm_code/lib \
--I$(top_builddir)/elm_code/lib \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
 -DEFL_BETA_API_SUPPORT \
 @EFL_CFLAGS@ \
 -DEFL_ELM_CODE_BUILD
@@ -24,6 +21,7 @@ elm_code_file.c \
 elm_code_parse.c \
 elm_code_widget.c \
 elm_code_diff_widget.c \
-elm_code.c
+elm_code.c \
+elm_code_private.h
 libelm_code_la_LIBADD = @EFL_LIBS@ -lm
 libelm_code_la_LDFLAGS = -no-undefined @EFL_LTLIBRARY_FLAGS@
diff --git a/elm_code/lib/elm_code_common.h b/elm_code/lib/elm_code_common.h
index eafe106..a409bff 100644
--- a/elm_code/lib/elm_code_common.h
+++ b/elm_code/lib/elm_code_common.h
@@ -1,9 +1,6 @@
 #ifndef ELM_CODE_COMMON_H_
 # define ELM_CODE_COMMON_H_
 
-#include <Eo.h>
-#include <Eina.h>
-
 typedef struct _Elm_Code Elm_Code;
 typedef struct _Elm_Code_File Elm_Code_File;
 
diff --git a/elm_code/lib/elm_code_diff_widget.c b/elm_code/lib/elm_code_diff_widget.c
index 7e577ed..f008159 100644
--- a/elm_code/lib/elm_code_diff_widget.c
+++ b/elm_code/lib/elm_code_diff_widget.c
@@ -2,11 +2,7 @@
 # include "config.h"
 #endif
 
-#include <Eo.h>
-#include <Elementary.h>
-
 #include "Elm_Code.h"
-#include "elm_code_diff_widget.h"
 
 #include "elm_code_private.h"
 
diff --git a/elm_code/lib/elm_code_diff_widget.h b/elm_code/lib/elm_code_diff_widget.h
index ac9f6d4..b6605bb 100644
--- a/elm_code/lib/elm_code_diff_widget.h
+++ b/elm_code/lib/elm_code_diff_widget.h
@@ -1,9 +1,6 @@
 #ifndef ELM_CODE_DIFF_WIDGET_H_
 # define ELM_CODE_DIFF_WIDGET_H_
 
-#include <Evas.h>
-#include "elm_code_common.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/elm_code/lib/elm_code_file.h b/elm_code/lib/elm_code_file.h
index 2a1d082..b37de52 100644
--- a/elm_code/lib/elm_code_file.h
+++ b/elm_code/lib/elm_code_file.h
@@ -1,10 +1,6 @@
 #ifndef ELM_CODE_FILE_H_
 # define ELM_CODE_FILE_H_
 
-#include <Eina.h>
-
-#include "elm_code_common.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/elm_code/lib/elm_code_parse.h b/elm_code/lib/elm_code_parse.h
index ab50c34..1c58d27 100644
--- a/elm_code/lib/elm_code_parse.h
+++ b/elm_code/lib/elm_code_parse.h
@@ -1,10 +1,6 @@
 #ifndef ELM_CODE_PARSE_H_
 # define ELM_CODE_PARSE_H_
 
-#include <Eina.h>
-
-#include "elm_code_common.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/elm_code/lib/elm_code_widget.c b/elm_code/lib/elm_code_widget.c
index e7bcd7b..b079020 100644
--- a/elm_code/lib/elm_code_widget.c
+++ b/elm_code/lib/elm_code_widget.c
@@ -2,9 +2,6 @@
 # include "config.h"
 #endif
 
-#include <Eo.h>
-#include <Elementary.h>
-
 #include "Elm_Code.h"
 
 #include "elm_code_private.h"
diff --git a/elm_code/lib/elm_code_widget.h b/elm_code/lib/elm_code_widget.h
index 6e37440..a24e577 100644
--- a/elm_code/lib/elm_code_widget.h
+++ b/elm_code/lib/elm_code_widget.h
@@ -1,11 +1,6 @@
 #ifndef ELM_CODE_WIDGET_H_
 # define ELM_CODE_WIDGET_H_
 
-#include <Evas.h>
-
-#include "elm_code_common.h"
-#include "elm_code_file.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif