summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Zhao <juan.j.zhao@intel.com>2013-10-10 13:06:58 +0800
committerJuan Zhao <juan.j.zhao@intel.com>2013-12-12 17:17:02 +0800
commit9d82982557a7cd88fb96ef48532cae46da525b82 (patch)
tree6e610069a861f12f3ecfd4c3970b25e1570cb364
parentcd49719a0df0a40a796899e6534cfebfb72cabf6 (diff)
downloadx2w-9d82982557a7cd88fb96ef48532cae46da525b82.tar.gz
x2w-9d82982557a7cd88fb96ef48532cae46da525b82.tar.bz2
x2w-9d82982557a7cd88fb96ef48532cae46da525b82.zip
Ecore_x: install header and symbol define
add ECORE_X_EVENT_WINDOW_DESTROY add this symbol to avoid the build failure in app-svc: [ 55s] CMakeFiles/appsvc.dir/src/appsvc.c.o: In function `appsvc_request_transient_app': [ 55s] /home/abuild/rpmbuild/BUILD/app-svc-0.1.51/src/appsvc.c:1052: undefined reference to `ECORE_X_EVENT_WINDOW_DESTROY'
-rwxr-xr-xecore-x.pc1
-rw-r--r--packaging/x2w.spec1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/ecore_x.c (renamed from src/x2w.c)2
4 files changed, 6 insertions, 0 deletions
diff --git a/ecore-x.pc b/ecore-x.pc
index d8cb6e5..8e45949 100755
--- a/ecore-x.pc
+++ b/ecore-x.pc
@@ -6,5 +6,6 @@ includedir=/usr/include
Name: ecore-x
Description: E core library, remove X module
Version: 1.8.0
+Libs: -lecore_x
Cflags: -I${includedir}
diff --git a/packaging/x2w.spec b/packaging/x2w.spec
index d2ee9f3..a9bd266 100644
--- a/packaging/x2w.spec
+++ b/packaging/x2w.spec
@@ -50,5 +50,6 @@ mv %{buildroot}/%{_libdir}/libecore_x.so.0 %{buildroot}/%{_libdir}/libecore_x.so
%{_includedir}/utilx_2w.h
%{_includedir}/x2w_general.h
%{_includedir}/xi_2w.h
+%{_includedir}/Ecore_X*.h
%{_libdir}/pkgconfig/x2w.pc
%{_libdir}/pkgconfig/ecore-x.pc
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f2ad62..4d340ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,8 @@ ecore_x_2w.h \
elementary_2w.h \
utilx_2w.h \
x2w_general.h \
+Ecore_X.h \
+Ecore_X_Atoms.h \
xi_2w.h
libecore_x_la_SOURCES = \
diff --git a/src/x2w.c b/src/ecore_x.c
index 5a52883..695c782 100644
--- a/src/x2w.c
+++ b/src/ecore_x.c
@@ -1,5 +1,7 @@
#include <stdlib.h>
+#include "ecore_x_2w.h"
#include "elementary_2w.h"
+int ECORE_X_EVENT_WINDOW_DESTROY = 0;
void ecore_x_func_is_used()
{
int win,w,h;