diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2001-09-25 23:43:55 +0000 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2001-09-25 23:43:55 +0000 |
| commit | 174f2c81cb90f124bd23ab3c96683196addabcf0 (patch) | |
| tree | 8f6fed2e4752f227429d9fe092e991c3e6be2a00 | |
| parent | 88785fe0a393d3686129af7700f99554e48c6bbe (diff) | |
| download | evolution-data-server-174f2c81cb90f124bd23ab3c96683196addabcf0.tar.gz | |
[Patch for Automake 1.5 compatibility pointed out by Richard
Boulton <richard@tartarus.org>, as per #9258.]
* providers/nntp/Makefile.am: Remove some commented parts that
make Automake 1.5 choke.
* Makefile.am (camel-lock-helper): Add $(EXEEXT) for Automake 1.5
compatibility.
| -rw-r--r-- | camel/ChangeLog | 11 | ||||
| -rw-r--r-- | camel/Makefile.am | 2 | ||||
| -rw-r--r-- | camel/providers/nntp/Makefile.am | 12 |
3 files changed, 12 insertions, 13 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 375d10b5f..75b16e3e4 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,14 @@ +2001-09-25 Ettore Perazzoli <ettore@ximian.com> + + [Patch for Automake 1.5 compatibility pointed out by Richard + Boulton <richard@tartarus.org>, as per #9258.] + + * providers/nntp/Makefile.am: Remove some commented parts that + make Automake 1.5 choke. + + * Makefile.am (camel-lock-helper): Add $(EXEEXT) for Automake 1.5 + compatibility. + 2001-09-25 <NotZed@Ximian.com> * camel-folder.c (get_unread_message_count): Only unref info if we diff --git a/camel/Makefile.am b/camel/Makefile.am index 50d1bd245..2d56192d2 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -205,7 +205,7 @@ libcamel_static_la_SOURCES = $(libcamel_la_SOURCES) libcamel_static_la_LIBADD = $(libcamel_la_LIBADD) libcamel_static_la_LDFLAGS = --all-static -camel-lock-helper: camel-lock-helper.o camel-lock.o +camel-lock-helper($EXEEXT): camel-lock-helper.o camel-lock.o $(CC) -o $@ $^ -I$(srcdir)/.. -I$(srcdir) install-exec-hook: diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am index a453ec305..1244c04e5 100644 --- a/camel/providers/nntp/Makefile.am +++ b/camel/providers/nntp/Makefile.am @@ -39,15 +39,3 @@ libcamelnntpinclude_HEADERS = \ libcamelnntp_la_LDFLAGS = -version-info 0:0:0 EXTRA_DIST = libcamelnntp.urls - -#noinst_PROGRAMS = test-newsrc - -#LDADD = \ - #$(top_builddir)/camel/libcamel.la \ - #$(top_builddir)/e-util/libeutil.la \ - #$(top_builddir)/libibex/libibex.la \ - #$(GNOME_LIBDIR) \ - #$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS) -# $(BONOBO_LIBS) - -#test_newsrc_LDADD = libcamelnntp.la $(LDADD) |