Fixed typo introduced after 0.9.3claws92 that prevented compilation; Updated Makefile...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 4ecaff3c4eee2a97f6dda4ec237357fa68f6085d..2bca83cda40291e2f5481e604184d99dbe652801 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,23 @@
+2003-08-03 [melvin]    0.9.3claws93
+
+       * src/Makefile.am
+               Fixed typo introduced after 0.9.3claws92 
+               that prevented compilation
+               Updated to use AM_CPPFLAGS and AM_YFLAGS instead of
+               CPPFLAGS and YFLAGS to allow user setting these.
+       * src/common/Makefile.am
+       * src/gtk/Makefile.am
+       * src/plugins/clamav/Makefile.am
+       * src/plugins/demo/Makefile.am
+       * src/plugins/dillo_viewer/Makefile.am
+       * src/plugins/image_viewer/Makefile.am
+       * src/plugins/mathml_viewer/Makefile.am
+       * src/plugins/spamassassin/Makefile.am
+       * src/plugins/trayicon/Makefile.am
+       * src/plugins/trayicon/libeggtrayicon/Makefile.am
+               Updated to use AM_CPPFLAGS and AM_YFLAGS instead of
+               CPPFLAGS and YFLAGS to allow user setting these.
+
 2003-08-02 [christoph] 0.9.3claws92
 
        * configure.ac

diff --git a/configure.ac b/configure.ac
index 0bbb469318998bb574b4b68dd8ed224f696d4637..e5cd9a25fcc93d78007e3430826e37449ce15386 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/Makefile.am b/src/Makefile.am
index 58868df7d5c301027fb706263d2cc0daab087919..43ce0b2671b96d3c37ce75008db5c1c953aa11d1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -229,16 +229,16 @@ sylpheed_LDADD = \
        $(OPENSSL_LIBS) \
        $(LIBICONV)
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Sylpheed\" \
        -DLOCALEDIR=\""$(localedir)"\" \
        -DMANUALDIR=\""$(manualdir)"\" \
        -DFAQDIR=\""$(faqdir)"\" \
        -DTARGET_ALIAS=\""$(target_triplet)"\" \
-       -DSYSCONFDIR=\""$(sysconfdir)"\"
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
        $(ASPELL_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
        $(OPENSSL_CFLAGS)
 
-YFLAGS = -d
+AM_YFLAGS = -d

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 451ae121719f70ea7e5ebe8945b99f5719ffd5c0..dc2806b8a0df0cc30bd0d36918c5e465470f652e 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -28,7 +28,7 @@ libsylpheedcommon_la_SOURCES = \
        xml.c xml.h \
        xmlprops.c xmlprops.h
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(OPENSSL_CFLAGS) \
        -DLOCALEDIR=\""$(localedir)"\"

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 57b961c00bfe9a8c192b71fedb364d00d800d9b8..72728051d89154ed84fe432c21e870b88c82bae6 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -17,7 +17,7 @@ libsylpheedgtk_la_SOURCES = \
        sslcertwindow.c sslcertwindow.h \
        gtkvscrollbutton.c gtkvscrollbutton.h
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        -I../common \
        -I.. \
        $(GTK_CFLAGS) \

diff --git a/src/plugins/clamav/Makefile.am b/src/plugins/clamav/Makefile.am
index 5614e7df201c9b2b1d15b25d0ab87b944adee71e..dcab1cf4a6a9b1c6b2e5cd3fe91de98a06fa51ca 100644 (file)
--- a/src/plugins/clamav/Makefile.am
+++ b/src/plugins/clamav/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES = \
        -I../../gtk \
        -I$(CLAMAV_LIBS)
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)

diff --git a/src/plugins/demo/Makefile.am b/src/plugins/demo/Makefile.am
index dc428d9056898bebf9d32355191cd357e4dca4ee..b3e62276c915f0d78a2ed69df06e39fa35ba0db6 100644 (file)
--- a/src/plugins/demo/Makefile.am
+++ b/src/plugins/demo/Makefile.am
@@ -11,5 +11,5 @@ demo_la_LDFLAGS = \
 INCLUDES = \
        -I../../common
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS)

diff --git a/src/plugins/dillo_viewer/Makefile.am b/src/plugins/dillo_viewer/Makefile.am
index 4c13fc70609e30dbbfd89dd9498b00180db833a2..e76112cd36b73b95104b73feb16ba282b87761fb 100644 (file)
--- a/src/plugins/dillo_viewer/Makefile.am
+++ b/src/plugins/dillo_viewer/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
        -I../../common \
        -I../../gtk
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS)

diff --git a/src/plugins/image_viewer/Makefile.am b/src/plugins/image_viewer/Makefile.am
index 116e1a8da075c7669e958d5c9b00fcc180df6707..4efabbb032ef28837b435818ccf96c9a2d489afd 100644 (file)
--- a/src/plugins/image_viewer/Makefile.am
+++ b/src/plugins/image_viewer/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = \
        -I../../common \
        -I../../gtk
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \

diff --git a/src/plugins/mathml_viewer/Makefile.am b/src/plugins/mathml_viewer/Makefile.am
index 256661afabcbf052067a7b37b55c8b800c2e6ca6..829db3e075edbaa107bad30b4b8a06516ba4adb0 100644 (file)
--- a/src/plugins/mathml_viewer/Makefile.am
+++ b/src/plugins/mathml_viewer/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = \
        -I../../common \
        -I../../gtk
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \

diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 04f81679366c616328d70150f8af8616031b9402..92a9e25f0562cffa36d375f83949219f16ed793c 100644 (file)
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES = \
        -I../../common \
        -I../../gtk
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \

diff --git a/src/plugins/trayicon/Makefile.am b/src/plugins/trayicon/Makefile.am
index 2c2212d2eeb8d1213390d687d5040c7ceb3ce254..84128dd58c2faf91df0cf4dc8ba67f690c9d3e04 100644 (file)
--- a/src/plugins/trayicon/Makefile.am
+++ b/src/plugins/trayicon/Makefile.am
@@ -20,7 +20,7 @@ INCLUDES = \
        -I../../gtk \
        -Ilibeggtrayicon
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(ASPELL_CFLAGS)

diff --git a/src/plugins/trayicon/libeggtrayicon/Makefile.am b/src/plugins/trayicon/libeggtrayicon/Makefile.am
index a3d7a1a0f93c2baefcc0af0c626fee52a90daad9..47294b405a268ca2a310964e56782b5e1800fc25 100644 (file)
--- a/src/plugins/trayicon/libeggtrayicon/Makefile.am
+++ b/src/plugins/trayicon/libeggtrayicon/Makefile.am
@@ -6,7 +6,7 @@ libeggtrayicon_la_SOURCES = \
        gtkplugxembed.c gtkplugxembed.h \
        xembed.h
 
-CPPFLAGS = \
+AM_CPPFLAGS = \
        $(GTK_CFLAGS)
 
 libeggtrayicon_la_LIBADD = \