summaryrefslogtreecommitdiff
path: root/src/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/Makefile.am44
-rw-r--r--src/bookmarks/ephy-bookmark-action-group.h4
-rw-r--r--src/bookmarks/ephy-bookmark-action.h4
-rw-r--r--src/bookmarks/ephy-bookmark-properties.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-export.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-import.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.h4
-rw-r--r--src/bookmarks/ephy-bookmarks-ui.h4
-rw-r--r--src/bookmarks/ephy-bookmarks.h4
-rw-r--r--src/bookmarks/ephy-nodes-cover.h4
-rw-r--r--src/bookmarks/ephy-open-tabs-action.h4
-rw-r--r--src/bookmarks/ephy-topic-action-group.h4
-rw-r--r--src/bookmarks/ephy-topic-action.h4
-rw-r--r--src/bookmarks/ephy-topics-entry.h4
-rw-r--r--src/bookmarks/ephy-topics-palette.h4
16 files changed, 19 insertions, 85 deletions
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 46e3da899..f0f41ba57 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -3,43 +3,40 @@ noinst_LTLIBRARIES = libephybookmarks.la
AM_CFLAGS = $(WARN_CFLAGS)
AM_LDFLAGS = $(WARN_LDFLAGS)
-INST_H_FILES = \
+TYPES_H_FILES = \
ephy-bookmarks.h
-NOINST_H_FILES = \
- ephy-bookmark-action.h \
- ephy-bookmarks-editor.h \
- ephy-bookmarks-export.h \
- ephy-bookmarks-import.h \
- ephy-bookmarks-ui.h \
- ephy-bookmarks-menu.h \
- ephy-bookmark-properties.h \
- ephy-topic-action.h \
- ephy-open-tabs-action.h \
- ephy-topic-action-group.h \
- ephy-bookmark-action-group.h \
- ephy-topics-entry.h \
- ephy-topics-palette.h \
- ephy-nodes-cover.h
-
libephybookmarks_la_SOURCES = \
ephy-bookmarks.c \
+ ephy-bookmarks.h \
ephy-bookmark-action.c \
+ ephy-bookmark-action.h \
ephy-bookmarks-editor.c \
+ ephy-bookmarks-editor.h \
ephy-bookmarks-export.c \
+ ephy-bookmarks-export.h \
ephy-bookmarks-import.c \
+ ephy-bookmarks-import.h \
ephy-bookmarks-ui.c \
+ ephy-bookmarks-ui.h \
ephy-bookmarks-menu.c \
+ ephy-bookmarks-menu.h \
ephy-bookmark-properties.c \
+ ephy-bookmark-properties.h \
ephy-topic-action.c \
+ ephy-topic-action.h \
ephy-open-tabs-action.c \
+ ephy-open-tabs-action.h \
ephy-topic-action-group.c \
+ ephy-topic-action-group.h \
ephy-bookmark-action-group.c \
+ ephy-bookmark-action-group.h \
ephy-topics-entry.c \
+ ephy-topics-entry.h \
ephy-topics-palette.c \
- ephy-nodes-cover.c \
- $(NOINST_H_FILES) \
- $(INST_H_FILES)
+ ephy-topics-palette.h \
+ ephy-nodes-cover.c \
+ ephy-nodes-cover.h
nodist_libephybookmarks_la_SOURCES = \
$(BUILT_SOURCES)
@@ -56,7 +53,7 @@ stamp_files = \
ephy-bookmarks-type-builtins.c: stamp-ephy-bookmarks-type-builtins.c Makefile
@true
-stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+stamp-ephy-bookmarks-type-builtins.c: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <config.h>\n\n" \
--fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \
@@ -77,11 +74,8 @@ stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
ephy-bookmarks-type-builtins.h: stamp-ephy-bookmarks-type-builtins.h Makefile
@true
-stamp-ephy-bookmarks-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+stamp-ephy-bookmarks-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(GLIB_MKENUMS) \
- --fhead "#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)\n" \
- --fhead "#error Only <epiphany/epiphany.h> can be included directly.\n" \
- --fhead "#endif\n\n" \
--fhead "#ifndef EPHY_BOOKMARKS_TYPE_BUILTINS_H\n" \
--fhead "#define EPHY_BOOKMARKS_TYPE_BUILTINS_H 1\n\n" \
--fhead "#include <glib-object.h>\n\n" \
diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h
index 2d7444fb4..6ec3f1ec5 100644
--- a/src/bookmarks/ephy-bookmark-action-group.h
+++ b/src/bookmarks/ephy-bookmark-action-group.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARK_ACTION_GROUP_H
#define EPHY_BOOKMARK_ACTION_GROUP_H
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index db89ee20b..5c780e678 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARK_ACTION_H
#define EPHY_BOOKMARK_ACTION_H
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 851ec7c5e..68c55d0b8 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARK_PROPERTIES_H
#define EPHY_BOOKMARK_PROPERTIES_H
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index a86dac3be..4504d88aa 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_EDITOR_H
#define EPHY_BOOKMARKS_EDITOR_H
diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h
index fe3a3dad4..469ffbd71 100644
--- a/src/bookmarks/ephy-bookmarks-export.h
+++ b/src/bookmarks/ephy-bookmarks-export.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_EXPORT_H
#define EPHY_BOOKMARKS_EXPORT_H
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index 14160797e..a5221af8b 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_IMPORT_H
#define EPHY_BOOKMARKS_IMPORT_H
diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h
index c322dc2c9..9bf6fd21f 100644
--- a/src/bookmarks/ephy-bookmarks-menu.h
+++ b/src/bookmarks/ephy-bookmarks-menu.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_MENU_H
#define EPHY_BOOKMARKS_MENU_H
diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h
index 691c89067..df9f1e7be 100644
--- a/src/bookmarks/ephy-bookmarks-ui.h
+++ b/src/bookmarks/ephy-bookmarks-ui.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_UI_H
#define EPHY_BOOKMARKS_UI_H
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 709bce2c4..396b5672f 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_H
#define EPHY_BOOKMARKS_H
diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h
index 28f5e2113..4acbffbd2 100644
--- a/src/bookmarks/ephy-nodes-cover.h
+++ b/src/bookmarks/ephy-nodes-cover.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_NODES_COVER_H
#define EPHY_NODES_COVER_H
diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h
index 9039b36f3..a0b42bee9 100644
--- a/src/bookmarks/ephy-open-tabs-action.h
+++ b/src/bookmarks/ephy-open-tabs-action.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_OPEN_TABS_ACTION_H
#define EPHY_OPEN_TABS_ACTION_H
diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h
index feac94005..c652b40b0 100644
--- a/src/bookmarks/ephy-topic-action-group.h
+++ b/src/bookmarks/ephy-topic-action-group.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPIC_ACTION_GROUP_H
#define EPHY_TOPIC_ACTION_GROUP_H
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index 8dbac7ad3..5dc661551 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPIC_ACTION_H
#define EPHY_TOPIC_ACTION_H
diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h
index aca5a3808..185cfe33b 100644
--- a/src/bookmarks/ephy-topics-entry.h
+++ b/src/bookmarks/ephy-topics-entry.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPICS_ENTRY_H
#define EPHY_TOPICS_ENTRY_H
diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h
index 6046bcf8c..3880ed1c5 100644
--- a/src/bookmarks/ephy-topics-palette.h
+++ b/src/bookmarks/ephy-topics-palette.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPICS_PALETTE_H
#define EPHY_TOPICS_PALETTE_H
View Lorry Controller Status