summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-11-07 05:50:18 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-11-07 05:50:18 +0000
commit58c54602a6957c8d331ebfd140bae63f16c62c00 (patch)
treea4ce7a3aa56886a109255b09b9aaea4a1678a103 /legacy
parentc9cece3c2a94ae71f6c92d44c1d15cd82f679fb7 (diff)
Ecore: fix library linking on Cygwin + small cleanup
Patch by Yaakov Selkowitz (myself for the small cleanup) SVN revision: 78956
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_x/Makefile.am2
-rw-r--r--legacy/ecore/src/modules/immodules/ibus/Makefile.am11
-rw-r--r--legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c2
-rw-r--r--legacy/ecore/src/modules/immodules/ibus/ibus_module.c12
4 files changed, 17 insertions, 10 deletions
diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am
index b14fc7d885..faf6e22dea 100644
--- a/legacy/ecore/src/lib/ecore_x/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES = libecore_x.la
18libecore_x_la_SOURCES = 18libecore_x_la_SOURCES =
19 19
20libecore_x_la_LIBADD = $(DEP) @EINA_LIBS@ 20libecore_x_la_LIBADD = $(DEP) @EINA_LIBS@
21libecore_x_la_LDFLAGS = -version-info @version_info@ @release_info@ 21libecore_x_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
22libecore_x_la_DEPENDENCIES = $(DEP) 22libecore_x_la_DEPENDENCIES = $(DEP)
23 23
24includes_HEADERS = \ 24includes_HEADERS = \
diff --git a/legacy/ecore/src/modules/immodules/ibus/Makefile.am b/legacy/ecore/src/modules/immodules/ibus/Makefile.am
index a59b5e859c..650970cfd6 100644
--- a/legacy/ecore/src/modules/immodules/ibus/Makefile.am
+++ b/legacy/ecore/src/modules/immodules/ibus/Makefile.am
@@ -27,10 +27,11 @@ ibus_imcontext.c \
27ibus_imcontext.h 27ibus_imcontext.h
28 28
29ibus_la_LIBADD = \ 29ibus_la_LIBADD = \
30 $(top_builddir)/src/lib/ecore_imf/libecore_imf.la \ 30$(top_builddir)/src/lib/ecore_evas/libecore_evas.la \
31 $(top_builddir)/src/lib/ecore_x/libecore_x.la \ 31$(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
32 @IBUS_LIBS@ \ 32$(top_builddir)/src/lib/ecore_x/libecore_x.la \
33 @EVAS_LIBS@ \ 33@IBUS_LIBS@ \
34 @EINA_LIBS@ 34@EVAS_LIBS@ \
35@EINA_LIBS@
35ibus_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 36ibus_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
36ibus_la_LIBTOOLFLAGS = --tag=disable-static 37ibus_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c b/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c
index 23bf033b6b..f24c01b417 100644
--- a/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c
+++ b/legacy/ecore/src/modules/immodules/ibus/ibus_imcontext.c
@@ -1,5 +1,5 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2#include <config.h> 2# include <config.h>
3#endif 3#endif
4 4
5#include <sys/types.h> 5#include <sys/types.h>
diff --git a/legacy/ecore/src/modules/immodules/ibus/ibus_module.c b/legacy/ecore/src/modules/immodules/ibus/ibus_module.c
index 3e3493e6e8..a6e175c3ca 100644
--- a/legacy/ecore/src/modules/immodules/ibus/ibus_module.c
+++ b/legacy/ecore/src/modules/immodules/ibus/ibus_module.c
@@ -1,8 +1,14 @@
1#ifdef HAVE_CONFIG_H
2# include <config.h>
3#endif
4
5#include <stdio.h>
6
7#include <Ecore.h>
8#include <Ecore_IMF.h>
9
1#include <ibus.h> 10#include <ibus.h>
2#include "ibus_imcontext.h" 11#include "ibus_imcontext.h"
3#include <Ecore_IMF.h>
4#include <Ecore.h>
5#include <stdio.h>
6 12
7#define IBUS_LOCALDIR "" 13#define IBUS_LOCALDIR ""
8static const Ecore_IMF_Context_Info ibus_im_info = { 14static const Ecore_IMF_Context_Info ibus_im_info = {