diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | libsylph/Makefile.am | 2 | ||||
| -rw-r--r-- | plugin/attachment_tool/Makefile.am | 6 | ||||
| -rw-r--r-- | plugin/test/Makefile.am | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
6 files changed, 20 insertions, 11 deletions
@@ -1,5 +1,14 @@ 2012-02-21 + * libsylph/Makefile.am + src/Makefile.am + plugin/test/Makefile.am + plugin/attachment_tool/Makefile.am + configure.in: fixed compilation error with Fink + OS X (Bug #42). + (moved -I$(top_srcdir)/* to the beginning of INCLUDES) + +2012-02-21 + * src/prefs_filter.c: fixed a bug that filter settings are removed if Escape key is pressed quickly on auto filter rule creation. Also made it update filter.xml file only when the list is modified. diff --git a/configure.in b/configure.in index 02ecee5a..b6dde8c2 100644 --- a/configure.in +++ b/configure.in @@ -9,8 +9,8 @@ MINOR_VERSION=2 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=beta5 -BUILD_REVISION=1130 +EXTRA_VERSION=beta6 +BUILD_REVISION=1131 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl define if this is a development release diff --git a/libsylph/Makefile.am b/libsylph/Makefile.am index 1aeb5e6b..fa6a436f 100644 --- a/libsylph/Makefile.am +++ b/libsylph/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DLOCALEDIR=\""$(localedir)"\" -INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir) -I$(includedir) +INCLUDES = -I$(top_srcdir) $(GLIB_CFLAGS) -I$(includedir) lib_LTLIBRARIES = libsylph-0.la #noinst_LTLIBRARIES = libsylph.la diff --git a/plugin/attachment_tool/Makefile.am b/plugin/attachment_tool/Makefile.am index ca0564b4..ae1006a6 100644 --- a/plugin/attachment_tool/Makefile.am +++ b/plugin/attachment_tool/Makefile.am @@ -6,11 +6,11 @@ attachment_tool_la_SOURCES = attachment_tool.c attachment_tool_la_LDFLAGS = -module -no-undefined -avoid-version INCLUDES = \ - $(GTK_CFLAGS) \ - -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/libsylph \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ + -I$(includedir) attachment_tool_la_LIBADD = \ $(GTK_LIBS) \ diff --git a/plugin/test/Makefile.am b/plugin/test/Makefile.am index d9d3f513..89cbba5d 100644 --- a/plugin/test/Makefile.am +++ b/plugin/test/Makefile.am @@ -6,11 +6,11 @@ test_la_SOURCES = test.c test.h test_la_LDFLAGS = -module -no-undefined -avoid-version INCLUDES = \ - $(GTK_CFLAGS) \ - -I$(includedir) \ -I$(top_srcdir) \ -I$(top_srcdir)/libsylph \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ + $(GTK_CFLAGS) \ + -I$(includedir) test_la_LIBADD = \ $(GTK_LIBS) \ diff --git a/src/Makefile.am b/src/Makefile.am index eda81c83..b998e88d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -137,11 +137,11 @@ EXTRA_DIST = \ INCLUDES = \ -DG_LOG_DOMAIN=\"Sylpheed\" \ + -I$(top_srcdir)/libsylph \ $(GTK_CFLAGS) \ $(GDK_PIXBUF_CFLAGS) \ $(GPGME_CFLAGS) \ - -I$(includedir) \ - -I$(top_srcdir)/libsylph + -I$(includedir) if NATIVE_WIN32 SYLPHEED_RES = sylpheed.res |