From 4912987303aefef0d02a45726b75e5fdae043982 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 25 Jan 2009 15:08:57 +0000 Subject: Renamed from evince-backend.pc.in. Renamed library to libevdocument.la. * configure.ac: * evince-document.pc.in: Renamed from evince-backend.pc.in. * libdocument/Makefile.am: Renamed library to libevdocument.la. * libview/Makefile.am: * shell/Makefile.am: * backend/*/Makefile.am: Adapt to changed library name. * libdocument/Makefile.am: * libview/Makefile.am: Change the installed headers path to match the directory names in SVN. * evince-document.h: * evince-view.h: Add single headers. Bug #568227. * libdocument/*.h: * libview/*.h: Add single headers guards. * libview/Makefile.am: * libdocument/Makefile.am: * backend/*/Makefile.am: * help/reference/Makefile.am: Define EVINCE_COMPILATION, so we can still include individual headers. * properties/Makefile.am: * properties/ev-properties-main.c: * properties/ev-properties-view.h: * thumbnailer/Makefile.am: * thumbnailer/evince-thumbnailer.c: Include only evince-document.h. * libdocument/Makefile.am: * libview/Makefile.am: Generate type builtins from all installed headers. * libdocument/ev-link-action.[ch]: * libdocument/ev-link-dest.[ch]: * libdocument/ev-transition-effect.[ch]: * libview/ev-view.[ch]: Remove handcoded type builtins. * libdocument/Makefile.am: * evince-document.h: Add ev-document-factory.h to the public headers. svn path=/trunk/; revision=3381 --- (limited to 'libview') diff --git a/libview/Makefile.am b/libview/Makefile.am index eede6da..49720c9 100644 --- a/libview/Makefile.am +++ b/libview/Makefile.am @@ -1,20 +1,5 @@ -INCLUDES= \ - -DG_LOG_DOMAIN=\"EvView\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ - -I$(top_srcdir)/libdocument \ - $(LIBVIEW_CFLAGS) \ - $(WARN_CFLAGS) \ - $(DISABLE_DEPRECATED) - lib_LTLIBRARIES = libevview.la -libevview_la_LDFLAGS = \ - -version-info $(EV_VIEW_LT_VERSION_INFO) \ - -export-symbols-regex "^ev_*" \ - $(AM_LDFLAGS) - -libevview_la_LIBADD = $(LIBVIEW_LIBS) - NOINST_H_FILES = \ ev-pixbuf-cache.h \ ev-timeline.h \ @@ -30,7 +15,7 @@ INST_H_FILES = \ ev-view.h \ ev-view-type-builtins.h -headerdir = $(includedir)/evince/$(EV_API_VERSION)/ev-view +headerdir = $(includedir)/evince/$(EV_API_VERSION)/libview header_DATA = $(INST_H_FILES) libevview_la_SOURCES = \ @@ -47,6 +32,28 @@ libevview_la_SOURCES = \ $(NOINST_H_FILES) \ $(INST_H_FILES) +libevview_la_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"EvView\" \ + -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ + -DEVINCE_COMPILATION \ + -I$(top_srcdir) \ + -I$(top_srcdir)/libdocument \ + -I$(top_builddir) \ + $(AM_CPPFLAGS) + +libevview_la_CFLAGS = \ + $(LIBVIEW_CFLAGS) \ + $(WARN_CFLAGS) \ + $(DISABLE_DEPRECATED) \ + $(AM_CFLAGS) + +libevview_la_LDFLAGS = \ + -version-info $(EV_VIEW_LT_VERSION_INFO) \ + -export-symbols-regex "^ev_*" \ + $(AM_LDFLAGS) + +libevview_la_LIBADD = $(LIBVIEW_LIBS) + BUILT_SOURCES = \ ev-view-marshal.h \ ev-view-marshal.c \ @@ -65,13 +72,13 @@ ev-view-marshal.c: $(srcdir)/ev-view-marshal.list ev-view-type-builtins.h: stamp-ev-view-type-builtins.h @true -stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template ev-job-scheduler.h +stamp-ev-view-type-builtins.h: ev-view-type-builtins.h.template $(INST_H_FILES) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbh \ && (cmp -s xgen-etbh ev-view-type-builtins.h || cp xgen-etbh ev-view-type-builtins.h ) \ && rm -f xgen-etbh \ && echo timestamp > $(@F) -ev-view-type-builtins.c: ev-view-type-builtins.c.template ev-job-scheduler.h +ev-view-type-builtins.c: ev-view-type-builtins.c.template $(INST_H_FILES) $(GLIB_MKENUMS) --template $< $(filter-out $<,$^) > xgen-etbc \ && (cmp -s xgen-etbc ev-view-type-builtins.c || cp xgen-etbc ev-view-type-builtins.c ) \ && rm -f xgen-etbc @@ -80,4 +87,3 @@ EXTRA_DIST = \ ev-view-type-builtins.c.template \ ev-view-type-builtins.h.template \ ev-view-marshal.list - diff --git a/libview/ev-job-scheduler.h b/libview/ev-job-scheduler.h index 66f9f80..74a390a 100644 --- a/libview/ev-job-scheduler.h +++ b/libview/ev-job-scheduler.h @@ -18,6 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef EV_JOB_SCHEDULER_H #define EV_JOB_SCHEDULER_H diff --git a/libview/ev-jobs.h b/libview/ev-jobs.h index 5915a28..fc577c1 100644 --- a/libview/ev-jobs.h +++ b/libview/ev-jobs.h @@ -18,15 +18,17 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __EV_JOBS_H__ #define __EV_JOBS_H__ #include #include -#include "ev-document.h" -#include "ev-selection.h" -#include "ev-render-context.h" +#include G_BEGIN_DECLS diff --git a/libview/ev-page-cache.h b/libview/ev-page-cache.h index 43f4553..814ede7 100644 --- a/libview/ev-page-cache.h +++ b/libview/ev-page-cache.h @@ -17,12 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __EV_PAGE_CACHE_H__ #define __EV_PAGE_CACHE_H__ #include -#include "ev-document.h" +#include G_BEGIN_DECLS #define EV_TYPE_PAGE_CACHE (ev_page_cache_get_type ()) diff --git a/libview/ev-pixbuf-cache.h b/libview/ev-pixbuf-cache.h index 5e48f28..a22634e 100644 --- a/libview/ev-pixbuf-cache.h +++ b/libview/ev-pixbuf-cache.h @@ -21,13 +21,16 @@ * ev-view.c from exploding. */ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __EV_PIXBUF_CACHE_H__ #define __EV_PIXBUF_CACHE_H__ #include -#include "ev-document.h" -#include "ev-selection.h" +#include G_BEGIN_DECLS diff --git a/libview/ev-timeline.h b/libview/ev-timeline.h index 534e48a..31c4f26 100644 --- a/libview/ev-timeline.h +++ b/libview/ev-timeline.h @@ -19,6 +19,10 @@ * Boston, MA 02111-1307, USA. */ +#if !defined (EVINCE_COMPILATION) +#error "This is a private header." +#endif + #ifndef __EV_TIMELINE_H__ #define __EV_TIMELINE_H__ diff --git a/libview/ev-transition-animation.h b/libview/ev-transition-animation.h index 522caf2..7cebfd3 100644 --- a/libview/ev-transition-animation.h +++ b/libview/ev-transition-animation.h @@ -19,9 +19,14 @@ * Boston, MA 02111-1307, USA. */ +#if !defined (EVINCE_COMPILATION) +#error "This is a private header." +#endif + #ifndef __EV_TRANSITION_ANIMATION_H__ #define __EV_TRANSITION_ANIMATION_H__ +#include #include "ev-timeline.h" #include "ev-transition-effect.h" diff --git a/libview/ev-view-accessible.h b/libview/ev-view-accessible.h index c29c471..eee59ee 100644 --- a/libview/ev-view-accessible.h +++ b/libview/ev-view-accessible.h @@ -18,6 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (EVINCE_COMPILATION) +#error "This is a private header." +#endif + #ifndef __EV_VIEW_ACCESSIBLE_H__ #define __EV_VIEW_ACCESSIBLE_H__ diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h index c894440..542607d 100644 --- a/libview/ev-view-private.h +++ b/libview/ev-view-private.h @@ -18,6 +18,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (EVINCE_COMPILATION) +#error "This is a private header." +#endif + #ifndef __EV_VIEW_PRIVATE_H__ #define __EV_VIEW_PRIVATE_H__ diff --git a/libview/ev-view-type-builtins.c.template b/libview/ev-view-type-builtins.c.template index 2365a44..cbc22d6 100644 --- a/libview/ev-view-type-builtins.c.template +++ b/libview/ev-view-type-builtins.c.template @@ -1,4 +1,6 @@ /*** BEGIN file-header ***/ +#include + #include "ev-view-type-builtins.h" /*** END file-header ***/ diff --git a/libview/ev-view-type-builtins.h.template b/libview/ev-view-type-builtins.h.template index a6ac309..c4ba497 100644 --- a/libview/ev-view-type-builtins.h.template +++ b/libview/ev-view-type-builtins.h.template @@ -1,5 +1,9 @@ /*** BEGIN file-header ***/ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef EV_VIEW_TYPE_BUILTINS_H #define EV_VIEW_TYPE_BUILTINS_H diff --git a/libview/ev-view.c b/libview/ev-view.c index 3191545..815571c 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -40,6 +40,7 @@ #include "ev-view.h" #include "ev-view-accessible.h" #include "ev-view-private.h" +#include "ev-view-type-builtins.h" #define EV_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EV_TYPE_VIEW, EvViewClass)) #define EV_IS_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EV_TYPE_VIEW)) @@ -5831,22 +5832,6 @@ ev_view_previous_page (EvView *view) /*** Enum description for usage in signal ***/ -GType -ev_sizing_mode_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { EV_SIZING_FIT_WIDTH, "EV_SIZING_FIT_WIDTH", "fit-width" }, - { EV_SIZING_BEST_FIT, "EV_SIZING_BEST_FIT", "best-fit" }, - { EV_SIZING_FREE, "EV_SIZING_FREE", "free" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static ("EvSizingMode", values); - } - return etype; -} - void ev_view_update_view_size (EvView *view, GtkScrolledWindow * scrolled_window) { diff --git a/libview/ev-view.h b/libview/ev-view.h index af12baf..0c9db0a 100644 --- a/libview/ev-view.h +++ b/libview/ev-view.h @@ -17,13 +17,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +#if !defined (__EV_EVINCE_VIEW_H_INSIDE__) && !defined (EVINCE_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __EV_VIEW_H__ #define __EV_VIEW_H__ #include -#include "ev-document.h" -#include "ev-link.h" +#include G_BEGIN_DECLS @@ -31,9 +34,6 @@ G_BEGIN_DECLS #define EV_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EV_TYPE_VIEW, EvView)) #define EV_IS_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EV_TYPE_VIEW)) -#define EV_TYPE_SIZING_MODE (ev_sizing_mode_get_type()) -#define EV_SIZING_MODE_CLASS (g_type_class_peek (EV_TYPE_SIZING_MODE)) - typedef struct _EvView EvView; typedef struct _EvViewClass EvViewClass; @@ -50,7 +50,6 @@ typedef enum { } EvViewSelectionMode; GType ev_view_get_type (void) G_GNUC_CONST; -GType ev_sizing_mode_get_type (void) G_GNUC_CONST; GtkWidget* ev_view_new (void); void ev_view_set_document (EvView *view, -- cgit v0.9.1