diff options
Diffstat (limited to 'calendar/pcs')
| -rw-r--r-- | calendar/pcs/Makefile.am | 34 | ||||
| -rw-r--r-- | calendar/pcs/cal-backend-file.h | 2 | ||||
| -rw-r--r-- | calendar/pcs/cal-backend-util.h | 2 | ||||
| -rw-r--r-- | calendar/pcs/cal-backend.h | 8 | ||||
| -rw-r--r-- | calendar/pcs/cal-factory.h | 2 | ||||
| -rw-r--r-- | calendar/pcs/cal.h | 4 | ||||
| -rw-r--r-- | calendar/pcs/query.h | 4 |
7 files changed, 33 insertions, 23 deletions
diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am index 57c24d3130..0c9800bd4d 100644 --- a/calendar/pcs/Makefile.am +++ b/calendar/pcs/Makefile.am @@ -2,6 +2,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"wombat-pcs\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ + -I$(top_builddir)/calendar \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ -I$(top_srcdir)/libwombat \ @@ -9,12 +10,16 @@ INCLUDES = \ -DGNOMELOCALEDIR=\""$(localedir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) -CORBA_GENERATED = \ - evolution-calendar.h \ +CORBA_GENERATED_H = \ + evolution-calendar.h + +CORBA_GENERATED_C = \ evolution-calendar-common.c \ evolution-calendar-skels.c \ evolution-calendar-stubs.c +CORBA_GENERATED = $(CORBA_GENERATED_H) $(CORBA_GENERATED_C) + idls = \ $(srcdir)/../idl/evolution-calendar.idl @@ -23,26 +28,31 @@ idl_flags = -I $(srcdir) `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl $(CORBA_GENERATED): $(idls) $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl -noinst_LIBRARIES = libpcs.a +pcsincludedir = $(includedir)/evolution/pcs -libpcs_a_SOURCES = \ - $(CORBA_GENERATED) \ - cal.c \ +privlib_LIBRARIES = libpcs.a + +pcsinclude_HEADERS = \ + $(CORBA_GENERATED_H) \ cal.h \ - cal-backend.c \ cal-backend.h \ - cal-backend-file.c \ cal-backend-file.h \ - cal-backend-util.c \ cal-backend-util.h \ cal-common.h \ - cal-factory.c \ cal-factory.h \ - job.c \ job.h \ - query.c \ query.h +libpcs_a_SOURCES = \ + $(pcsinclude_HEADERS) \ + $(CORBA_GENERATED_C) \ + cal.c \ + cal-backend.c \ + cal-backend-file.c \ + cal-backend-util.c \ + cal-factory.c \ + job.c \ + query.c BUILT_SOURCES = $(CORBA_GENERATED) CLEANFILES = $(BUILT_SOURCES) diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h index c90feddea3..30fc210dd8 100644 --- a/calendar/pcs/cal-backend-file.h +++ b/calendar/pcs/cal-backend-file.h @@ -23,7 +23,7 @@ #define CAL_BACKEND_FILE_H #include <libgnome/gnome-defs.h> -#include "cal-backend.h" +#include "pcs/cal-backend.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal-backend-util.h b/calendar/pcs/cal-backend-util.h index f10267453a..aed52f4bb7 100644 --- a/calendar/pcs/cal-backend-util.h +++ b/calendar/pcs/cal-backend-util.h @@ -24,7 +24,7 @@ #define CAL_BACKEND_UTIL_H #include <bonobo-conf/bonobo-config-database.h> -#include <cal-backend.h> +#include <pcs/cal-backend.h> BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h index 26b3456e9e..b3647d9720 100644 --- a/calendar/pcs/cal-backend.h +++ b/calendar/pcs/cal-backend.h @@ -27,10 +27,10 @@ #include <libgnome/gnome-defs.h> #include <cal-util/cal-util.h> #include <cal-util/cal-component.h> -#include "evolution-calendar.h" -#include "cal-common.h" -#include "cal.h" -#include "query.h" +#include "pcs/evolution-calendar.h" +#include "pcs/cal-common.h" +#include "pcs/cal.h" +#include "pcs/query.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h index 46a66ed9a0..7e83cfd2b7 100644 --- a/calendar/pcs/cal-factory.h +++ b/calendar/pcs/cal-factory.h @@ -24,7 +24,7 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-xobject.h> -#include "evolution-calendar.h" +#include "pcs/evolution-calendar.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h index 81c3e55154..9b6636b9d0 100644 --- a/calendar/pcs/cal.h +++ b/calendar/pcs/cal.h @@ -25,8 +25,8 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-xobject.h> -#include "evolution-calendar.h" -#include "cal-common.h" +#include "pcs/evolution-calendar.h" +#include "pcs/cal-common.h" BEGIN_GNOME_DECLS diff --git a/calendar/pcs/query.h b/calendar/pcs/query.h index 80b17983a6..4e732aefd4 100644 --- a/calendar/pcs/query.h +++ b/calendar/pcs/query.h @@ -23,8 +23,8 @@ #include <libgnome/gnome-defs.h> #include <bonobo/bonobo-xobject.h> -#include "cal-common.h" -#include "evolution-calendar.h" +#include "pcs/cal-common.h" +#include "pcs/evolution-calendar.h" BEGIN_GNOME_DECLS |