callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixage - Federico

Browse Source 
svn path=/trunk/; revision=6939
This commit is contained in:
Federico Mena Quintero
2000-12-12 05:00:45 +00:00
parent 65b8297942
commit e3088ae21f
12 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/ChangeLog
View File

@ -1,3 +1,15 @@
2000-12-11 Federico Mena Quintero <federico@helixcode.com>
* cal-util/Makefile.am (test_recur_LDADD): Link to the libical
shared library.
* cal-client/Makefile.am (client_test_LDADD): Likewise.
* conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD):
Likewise.
* gui/Makefile.am (LINK_FLAGS): Likewise.
2000-12-11 Federico Mena Quintero <federico@helixcode.com>
This is to make things work with libical 0.21helix1 and later.

2
calendar/cal-client/Makefile.am
View File

@ -71,7 +71,7 @@ client_test_LDADD = \
-lunicode \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical.a \
$(top_builddir)/libical/src/libical/libical.la \
libcal-client.la
BUILT_SOURCES = $(CORBA_GENERATED)

2
calendar/cal-util/Makefile.am
View File

@ -45,5 +45,5 @@ test_recur_SOURCES = \
test_recur_LDADD = \
libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical.a \
$(top_builddir)/libical/src/libical/libical.la \
$(EXTRA_GNOME_LIBS)

2
calendar/conduits/calendar/Makefile.am
View File

@ -37,7 +37,7 @@ libecalendar_conduit_la_LIBADD = \
$(top_builddir)/calendar/cal-client/libcal-client-static.la \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_VFS_GNOME_LIBS) \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \

2
calendar/conduits/todo/Makefile.am
View File

@ -37,7 +37,7 @@ libetodo_conduit_la_LIBADD = \
$(top_builddir)/calendar/cal-client/libcal-client-static.la \
$(top_builddir)/calendar/cal-util/libcal-util-static.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_VFS_GNOME_LIBS) \
$(PISOCK_LIBDIR) $(PISOCK_LIBS) \

22
calendar/gui/Makefile.am
View File

@ -35,17 +35,17 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
LINK_FLAGS = \
$(BONOBO_VFS_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(INTLLIBS) \
dialogs/libcal-dialogs.a \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical.a \
LINK_FLAGS = \
$(BONOBO_VFS_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(INTLLIBS) \
dialogs/libcal-dialogs.a \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.a
gladedir = $(datadir)/evolution/glade

4
libical/ChangeLog
View File

@ -1,5 +1,9 @@
2000-12-11 Federico Mena Quintero <federico@helixcode.com>
* Makefile.am:
* configure.in: Disable compilation of the examples directory
until libicalss is fixed.
* configure.in: Make AC_INIT() check for a file that is not
autogenerated!

5
libical/Makefile.am
View File

@ -5,5 +5,8 @@ EXTRA_DIST = \
TEST \
TODO
SUBDIRS = design-data doc scripts test-data src examples
SUBDIRS = design-data doc scripts test-data src
# Disabled examples until it builds
#SUBDIRS = design-data doc scripts test-data src examples

1
libical/configure.in
View File

@ -46,7 +46,6 @@ AC_OUTPUT([
Makefile
design-data/Makefile
doc/Makefile
examples/Makefile
scripts/Makefile
src/Makefile
src/libical/Makefile

2
libical/examples/Makefile.am
View File

@ -1,7 +1,7 @@
noinst_PROGRAMS = doesnothing
LDADD = ../src/libical/libical.a ../src/libicalss/libicalss.a ../src/libicalvcal/libicalvcal.a
LDADD = ../src/libical/libical.a ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la
INCLUDES = -I . -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal
doesnothing_SOURCES = \

4
wombat/ChangeLog
View File

@ -1,3 +1,7 @@
2000-12-11 Federico Mena Quintero <federico@helixcode.com>
* Makefile.am (wombat_LDADD): Link to the libical shared library.
2000-11-11 Matt Bissiri <bissiri@eecs.umich.edu>
* wombat.oafinfo:

2
wombat/Makefile.am
View File

@ -26,7 +26,7 @@ wombat_LDADD = \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/calendar/pcs/libpcs.a \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libical/src/libical/libical.a \
$(top_builddir)/libical/src/libical/libical.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la \
$(LDAP_LIBS)