0.8.6claws57

* src/Makefile.am
* src/gtksctree.[ch]            ** REMOVE **
* src/gtk/Makefile.am
* src/gtk/gtksctree.[ch]        ** NEW **
        move gtksctree files to gtk directory

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7398210a6b03b212243f797a795fa2cae75355ce..700538718443ac49ca9dd2e999aef7c5bf91ecff 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-12-03 [christoph] 0.8.6claws57
+
+       * src/Makefile.am
+       * src/gtksctree.[ch]            ** REMOVE **
+       * src/gtk/Makefile.am
+       * src/gtk/gtksctree.[ch]        ** NEW **
+               move gtksctree files to gtk directory
+
 2002-12-03 [christoph] 0.8.6claws56
 
        * src/Makefile.am

diff --git a/configure.in b/configure.in
index d5122d4e86079764db4aa1fe8f5fe459978f0f96..4904526172dcc8b9fcf14b7f49ea8b374565bc76 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws56
+EXTRA_VERSION=claws57
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/Makefile.am b/src/Makefile.am
index 78ecb7f40ed662d50c0eebd6c37255e8290931af..15c77d51e6fa5fcf7146b062cc8e6426abbe2c58 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@ sylpheed_SOURCES = \
        procheader.c procheader.h \
        compose.c compose.h \
        gtkshruler.c gtkshruler.h \
-       gtksctree.c gtksctree.h \
        gtkstext.c gtkstext.h \
        menu.c menu.h \
        stock_pixmap.c stock_pixmap.h \
@@ -216,6 +215,7 @@ EXTRA_DIST = \
 
 INCLUDES = \
        -Icommon \
+       -Igtk \
        -DG_LOG_DOMAIN=\"Sylpheed\" \
        -I$(top_srcdir)/intl \
         $(ASPELL_CFLAGS)    \

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 0e8830f6118260b4893dc9cbb9ec11d60cb29b1b..a683d6e7927291880af55b038e5c98afdacb24fc 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -1,5 +1,11 @@
 noinst_LTLIBRARIES = libsylpheedgtk.la
 
-libsylpheedgtk_la_SOURCES = 
+libsylpheedgtk_la_SOURCES = \
+       gtksctree.c gtksctree.h
 
-libsylpheedgtk_la_LIBADD = ../common/libsylpheedcommon.la
+INCLUDES = \
+       $(GTK_CFLAGS)
+
+libsylpheedgtk_la_LIBADD = \
+       ../common/libsylpheedcommon.la \
+       $(GTK_LIBS)

diff --git a/src/gtksctree.c b/src/gtk/gtksctree.c
similarity index 100%
rename from src/gtksctree.c
rename to src/gtk/gtksctree.c

diff --git a/src/gtksctree.h b/src/gtk/gtksctree.h
similarity index 100%
rename from src/gtksctree.h
rename to src/gtk/gtksctree.h