summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-03-12 14:17:26 +0000
committerTom Hacohen <tom@stosb.com>2014-03-12 14:26:50 +0000
commitd260dc3ec2e3e9f4475c08b89922f3599b4dcf93 (patch)
tree020703a192295fb2faded28060409f4add60d4b3
parent63e989b7f8897010131e8897a1de518889691832 (diff)
Ship missing headers, and remove wrong includes
elm_gen_common.h was not installed, but is needed by installed headers. Remove dependencies on internal headers from shipped headers.
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/elm_gen_common.h1
-rw-r--r--src/lib/elm_panel.c2
-rw-r--r--src/lib/elm_toolbar.c1
-rw-r--r--src/lib/elm_widget_panel.h1
-rw-r--r--src/lib/elm_widget_toolbar.h1
6 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1d046c4e5..eefc3789f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -39,6 +39,7 @@ Elementary_Cursor.h
39includesdir = $(includedir)/elementary-@VMAJ@ 39includesdir = $(includedir)/elementary-@VMAJ@
40 40
41includesunstable_HEADERS = \ 41includesunstable_HEADERS = \
42elm_gen_common.h \
42elm_interface_fileselector.h \ 43elm_interface_fileselector.h \
43elm_interface_scrollable.h \ 44elm_interface_scrollable.h \
44elm_widget.h \ 45elm_widget.h \
@@ -388,7 +389,6 @@ elm_win_legacy.h
388includesubdir = $(includedir)/elementary-@VMAJ@/ 389includesubdir = $(includedir)/elementary-@VMAJ@/
389 390
390libelementary_la_SOURCES = \ 391libelementary_la_SOURCES = \
391elm_gen_common.h \
392elm_priv.h \ 392elm_priv.h \
393els_box.h \ 393els_box.h \
394elc_ctxpopup.c \ 394elc_ctxpopup.c \
diff --git a/src/lib/elm_gen_common.h b/src/lib/elm_gen_common.h
index 19e4a118f..3df68a511 100644
--- a/src/lib/elm_gen_common.h
+++ b/src/lib/elm_gen_common.h
@@ -3,7 +3,6 @@
3 3
4#include <Elementary.h> 4#include <Elementary.h>
5#include <Elementary_Cursor.h> 5#include <Elementary_Cursor.h>
6#include "elm_priv.h"
7 6
8#define ELM_GEN_ITEM_FROM_INLIST(it) \ 7#define ELM_GEN_ITEM_FROM_INLIST(it) \
9 ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL) 8 ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL)
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 060c82f52..b181bd8c4 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -7,6 +7,8 @@
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_panel.h" 8#include "elm_widget_panel.h"
9 9
10#include "els_box.h"
11
10EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP; 12EAPI Eo_Op ELM_OBJ_PANEL_BASE_ID = EO_NOOP;
11 13
12#define MY_CLASS ELM_OBJ_PANEL_CLASS 14#define MY_CLASS ELM_OBJ_PANEL_CLASS
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1e0ae05cc..e5623aa18 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -6,6 +6,7 @@
6 6
7#include "elm_priv.h" 7#include "elm_priv.h"
8#include "elm_widget_toolbar.h" 8#include "elm_widget_toolbar.h"
9#include "els_box.h"
9 10
10EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID = EO_NOOP; 11EAPI Eo_Op ELM_OBJ_TOOLBAR_BASE_ID = EO_NOOP;
11 12
diff --git a/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h
index e869f0186..c72f6066e 100644
--- a/src/lib/elm_widget_panel.h
+++ b/src/lib/elm_widget_panel.h
@@ -2,7 +2,6 @@
2#define ELM_WIDGET_PANEL_H 2#define ELM_WIDGET_PANEL_H
3 3
4#include "elm_widget_layout.h" 4#include "elm_widget_layout.h"
5#include "els_box.h"
6 5
7/** 6/**
8 * @addtogroup Widget 7 * @addtogroup Widget
diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index 500b53ab6..9c731eab8 100644
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -2,7 +2,6 @@
2#define ELM_WIDGET_TOOLBAR_H 2#define ELM_WIDGET_TOOLBAR_H
3 3
4#include "elm_interface_scrollable.h" 4#include "elm_interface_scrollable.h"
5#include "els_box.h"
6 5
7/** 6/**
8 * @addtogroup Widget 7 * @addtogroup Widget