From c03e685846f21347e5a0e9943870e99162b0bae8 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 10 Aug 2005 10:06:41 +0000 Subject: Use privsolib instead of privlib. Link with SHELL_LIBS. Use NO_UNDEFINED. 2005-08-10 Tor Lillqvist * Makefile.am: Use privsolib instead of privlib. Link with SHELL_LIBS. Use NO_UNDEFINED. Use EXEEXT. Use hack to workaround MSYS feature on Win32 when installing the schemas. (INCLUDES): Define EVOLUTION_IMAGESDIR like in ../e-util/e-util-private.h, not EVOLUTION_IMAGES. (idl_defines): Pass marker macro to IDL compiler, see below. * Evolution-Component.idl: Don't generate duplicate code in skels and stubs when including this file from other idl files (in particular, ../mail/Evolution-Mail.idl). Use the include_defs and inhibit pragmas unless IDL-compiling in this directory. See lists.ximian.com/pipermail/evolution-patches/2005-June/010899.html * e-shell-utils.c * e-shell-windows.c: Ue EVOLUTION_IMAGESDIR in such a way that it works even when it is a function call. svn path=/trunk/; revision=30075 --- shell/Evolution-Component.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'shell/Evolution-Component.idl') diff --git a/shell/Evolution-Component.idl b/shell/Evolution-Component.idl index defb138ae9..be5360bd38 100644 --- a/shell/Evolution-Component.idl +++ b/shell/Evolution-Component.idl @@ -13,6 +13,15 @@ #include +#ifndef __evolution_shell_COMPILATION +#ifdef __ORBIT_IDL__ +%{ +#pragma include_defs shell/evolution-component.h +%} +#pragma inhibit push +#endif +#endif + module GNOME { module Evolution { enum CreatableItem { @@ -102,4 +111,9 @@ module Evolution { }; }; +#ifndef __evolution_shell_COMPILATION +#ifdef __ORBIT_IDL__ +#pragma inhibit pop +#endif #endif +#endif /* _GNOME_EVOLUTION_COMPONENT_IDL */ -- cgit v1.2.3