diff options
| -rw-r--r-- | calendar/ChangeLog | 12 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/.cvsignore | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 14 |
4 files changed, 19 insertions, 13 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 11fc44ac59..7e33939b82 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,15 @@ +2003-02-28 Dan Winship <danw@ximian.com> + + * gui/dialogs/Makefile.am: build libcal-dialogs as an uninstalled + shared library + ($(IDL_GENERATED_H), etc): Only generate + Evolution-Addressbook-SelectNames.h, not the corresponding .c + files, or we'll get duplicate symbol errors trying to link this + into libevolution_calendar.la + + * gui/Makefile.am (libevolution_calendar_la_LIBADD): Update for + that (and eliminate libtool portability warnings) + 2003-02-28 Hans Petter Jansson <hpj@ximian.com> * Makefile.am (SUBDIRS): Add importers/. diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index a750c1321e..d513ed4901 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -186,7 +186,7 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/cal-client/libcal-client.la \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ - dialogs/libcal-dialogs.a \ + $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_LIBS) diff --git a/calendar/gui/dialogs/.cvsignore b/calendar/gui/dialogs/.cvsignore index 64968755b7..79c19fe2f4 100644 --- a/calendar/gui/dialogs/.cvsignore +++ b/calendar/gui/dialogs/.cvsignore @@ -3,6 +3,4 @@ Makefile Makefile.in Evolution-Addressbook-SelectNames.h -Evolution-Addressbook-SelectNames-stubs.c -Evolution-Addressbook-SelectNames-skels.c -Evolution-Addressbook-SelectNames-common.c + diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index a4ffff5f17..dc44ea7be6 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -2,16 +2,12 @@ IDLS = $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressboo IDL_GENERATED_H = \ Evolution-Addressbook-SelectNames.h -IDL_GENERATED_C = \ - Evolution-Addressbook-SelectNames-common.c \ - Evolution-Addressbook-SelectNames-skels.c \ - Evolution-Addressbook-SelectNames-stubs.c -IDL_GENERATED = $(IDL_GENERATED_C) $(IDL_GENERATED_H) +IDL_GENERATED = $(IDL_GENERATED_H) $(IDL_GENERATED_H): $(IDLS) - $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \ + $(ORBIT_IDL) -I $(srcdir) $(IDL_INCLUDES) \ + --nostubs --noskels --nocommon \ $(top_srcdir)/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl -$(IDL_GENERATED_C): $(IDL_GENERATED_H) BUILT_SOURCES = $(IDL_GENERATED) @@ -34,9 +30,9 @@ INCLUDES = \ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ $(EVOLUTION_CALENDAR_CFLAGS) -noinst_LIBRARIES = libcal-dialogs.a +noinst_LTLIBRARIES = libcal-dialogs.la -libcal_dialogs_a_SOURCES = \ +libcal_dialogs_la_SOURCES = \ $(IDL_GENERATED) \ alarm-options.c \ alarm-options.h \ |