aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/Makefile.am6
-rw-r--r--calendar/cal-util/calobj.c2
-rw-r--r--calendar/cal-util/calobj.h2
-rw-r--r--calendar/calendar.c2
-rw-r--r--calendar/calobj.c2
-rw-r--r--calendar/calobj.h2
-rw-r--r--calendar/gui/Makefile.am6
-rw-r--r--calendar/gui/calendar.c2
-rw-r--r--calendar/pcs/calobj.c2
-rw-r--r--calendar/pcs/calobj.h2
10 files changed, 12 insertions, 16 deletions
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index df80c782e0..8f10c2a1c8 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = versit gnomecard
help_base = $(datadir)/gnome/help/cal
CFLAGS += -Wall
@@ -6,8 +5,7 @@ CFLAGS += -Wall
INCLUDES = \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I../../gcalendar
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = gnomecal
@@ -59,7 +57,7 @@ gnomecal_SOURCES = \
LINK_FLAGS = \
$(GNOME_LIBDIR) \
$(GNOMEGNORBA_LIBS) \
- $(INTLLIBS) versit/libversit.a
+ $(INTLLIBS) ../libversit/libversit.a
#gncal_LDADD = $(LINK_FLAGS)
diff --git a/calendar/cal-util/calobj.c b/calendar/cal-util/calobj.c
index b50c8d63ea..a615c0e313 100644
--- a/calendar/cal-util/calobj.c
+++ b/calendar/cal-util/calobj.c
@@ -11,7 +11,7 @@
#include <ctype.h>
#include "calobj.h"
#include "timeutil.h"
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
iCalObject *
ical_object_new (void)
diff --git a/calendar/cal-util/calobj.h b/calendar/cal-util/calobj.h
index 05f6d00291..9532b1325f 100644
--- a/calendar/cal-util/calobj.h
+++ b/calendar/cal-util/calobj.h
@@ -9,7 +9,7 @@
#define CALOBJ_H
#include <libgnome/libgnome.h>
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
BEGIN_GNOME_DECLS
diff --git a/calendar/calendar.c b/calendar/calendar.c
index 374fb6874a..3f4b10aeaf 100644
--- a/calendar/calendar.c
+++ b/calendar/calendar.c
@@ -17,7 +17,7 @@
#include "alarm.h"
#include "calendar.h"
#include "timeutil.h"
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
/* Our day range */
time_t calendar_day_begin, calendar_day_end;
diff --git a/calendar/calobj.c b/calendar/calobj.c
index b50c8d63ea..a615c0e313 100644
--- a/calendar/calobj.c
+++ b/calendar/calobj.c
@@ -11,7 +11,7 @@
#include <ctype.h>
#include "calobj.h"
#include "timeutil.h"
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
iCalObject *
ical_object_new (void)
diff --git a/calendar/calobj.h b/calendar/calobj.h
index 05f6d00291..9532b1325f 100644
--- a/calendar/calobj.h
+++ b/calendar/calobj.h
@@ -9,7 +9,7 @@
#define CALOBJ_H
#include <libgnome/libgnome.h>
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
BEGIN_GNOME_DECLS
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index df80c782e0..8f10c2a1c8 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS = versit gnomecard
help_base = $(datadir)/gnome/help/cal
CFLAGS += -Wall
@@ -6,8 +5,7 @@ CFLAGS += -Wall
INCLUDES = \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I../../gcalendar
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = gnomecal
@@ -59,7 +57,7 @@ gnomecal_SOURCES = \
LINK_FLAGS = \
$(GNOME_LIBDIR) \
$(GNOMEGNORBA_LIBS) \
- $(INTLLIBS) versit/libversit.a
+ $(INTLLIBS) ../libversit/libversit.a
#gncal_LDADD = $(LINK_FLAGS)
diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c
index 374fb6874a..3f4b10aeaf 100644
--- a/calendar/gui/calendar.c
+++ b/calendar/gui/calendar.c
@@ -17,7 +17,7 @@
#include "alarm.h"
#include "calendar.h"
#include "timeutil.h"
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
/* Our day range */
time_t calendar_day_begin, calendar_day_end;
diff --git a/calendar/pcs/calobj.c b/calendar/pcs/calobj.c
index b50c8d63ea..a615c0e313 100644
--- a/calendar/pcs/calobj.c
+++ b/calendar/pcs/calobj.c
@@ -11,7 +11,7 @@
#include <ctype.h>
#include "calobj.h"
#include "timeutil.h"
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
iCalObject *
ical_object_new (void)
diff --git a/calendar/pcs/calobj.h b/calendar/pcs/calobj.h
index 05f6d00291..9532b1325f 100644
--- a/calendar/pcs/calobj.h
+++ b/calendar/pcs/calobj.h
@@ -9,7 +9,7 @@
#define CALOBJ_H
#include <libgnome/libgnome.h>
-#include "versit/vcc.h"
+#include "../libversit/vcc.h"
BEGIN_GNOME_DECLS