diff options
| -rw-r--r-- | calendar/ChangeLog | 17 | ||||
| -rw-r--r-- | calendar/cal-client/Makefile.am | 8 | ||||
| -rw-r--r-- | calendar/cal-util/Makefile.am | 9 | ||||
| -rw-r--r-- | calendar/conduits/calendar/Makefile.am | 6 | ||||
| -rw-r--r-- | calendar/conduits/todo/Makefile.am | 8 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 18 |
6 files changed, 26 insertions, 40 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index e3eaffa7f2..a8c0b7b8bb 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,20 @@ +2003-09-11 Dan Winship <danw@ximian.com> + + * cal-util/Makefile.am (privlib_LTLIBRARIES): Remove + libcal-util-static.la + + * cal-client/Makefile.am (noinst_LTLIBRARIES): Remove + libcal-client-static.la + + * conduits/calendar/Makefile.am (libecalendar_conduit_la_LIBADD): + use non-static libraries. The static ones were only needed for + libtool 1.3. + + * conduits/todo/Makefile.am (libetodo_conduit_la_LIBADD): Likewise + + * gui/Makefile.am (IDL_GENERATED): Don't compile the calendar idl + here. It's already in libcal-client. + 2003-09-11 Frederic Crozat <fcrozat@mandrakesoft.com> * conduits/todo/Makefile.am: diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index 9ed423db72..ce2f6d4bbb 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -57,14 +57,6 @@ libcal_clientinclude_HEADERS = \ cal-query.h # -# make a static library for use by calendar conduit's shared library -# -noinst_LTLIBRARIES = libcal-client-static.la -libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES) -libcal_client_static_la_LDFLAGS = --all-static - - -# # client-test program # diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index 57dbd91664..004946bdbf 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -15,7 +15,7 @@ INCLUDES = \ # cal util library # -privlib_LTLIBRARIES = libcal-util-static.la libcal-util.la +privlib_LTLIBRARIES = libcal-util.la libcal_util_la_SOURCES = \ cal-util-marshal.c \ @@ -42,13 +42,6 @@ MARSHAL_GENERATED = cal-util-marshal.c cal-util-marshal.h BUILT_SOURCES = $(MARSHAL_GENERATED) CLEANFILES = $(BUILT_SOURCES) -# -# static library for use in conduits' shared libraries -# -#lib_LTLIBRARIES = libcal-util-static.la -libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES) -libcal_util_static_la_LDFLAGS = -all-static - test_recur_SOURCES = \ test-recur.c diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am index 1ba960c896..7254b6d866 100644 --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -18,10 +18,10 @@ libecalendar_conduit_la_SOURCES = \ libecalendar_conduit_la_LDFLAGS = -module -avoid-version libecalendar_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/cal-client/libcal-client-static.la \ - $(top_builddir)/calendar/cal-util/libcal-util-static.la \ + $(top_builddir)/calendar/cal-client/libcal-client.la \ + $(top_builddir)/calendar/cal-util/libcal-util.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.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am index 83164b37b8..3ffe0c9d05 100644 --- a/calendar/conduits/todo/Makefile.am +++ b/calendar/conduits/todo/Makefile.am @@ -18,11 +18,11 @@ libetodo_conduit_la_SOURCES = \ libetodo_conduit_la_LDFLAGS = -module -avoid-version libetodo_conduit_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/cal-client/libcal-client-static.la \ - $(top_builddir)/calendar/cal-util/libcal-util-static.la \ + $(top_builddir)/calendar/cal-client/libcal-client.la \ + $(top_builddir)/calendar/cal-util/libcal-util.la \ $(top_builddir)/libversit/libversit.la \ - $(top_builddir)/libical/src/libical/libical-static.la \ - $(top_builddir)/libwombat/libwombat-static.la \ + $(top_builddir)/libical/src/libical/libical.la \ + $(top_builddir)/libwombat/libwombat.la \ $(top_builddir)/e-util/libeconduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 4ba0bde42d..5cee4ae0e3 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -37,23 +37,7 @@ $(SELECT_NAMES_IDL_GENERATED_H): $(IDLS) $(SELECT_NAMES_IDL_GENERATED_C): $(SELECT_NAMES_IDL_GENERATED_H) -# Calendar IDL files - -CALENDAR_IDL_GENERATED_H = \ - evolution-calendar.h -CALENDAR_IDL_GENERATED_C = \ - evolution-calendar-common.c \ - evolution-calendar-skels.c \ - evolution-calendar-stubs.c -CALENDAR_IDL_GENERATED = $(CALENDAR_IDL_GENERATED_C) $(CALENDAR_IDL_GENERATED_H) - -$(CALENDAR_IDL_GENERATED_H): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \ - $(top_srcdir)/calendar/idl/evolution-calendar.idl -$(CALENDAR_IDL_GENERATED_C): $(CALENDAR_IDL_GENERATED_H) - - -IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(CALENDAR_IDL_GENERATED) +IDL_GENERATED = $(COMPOSER_IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) SUBDIRS = alarm-notify dialogs |