Sun May 13 16:54:35 CEST 2007 Jochen Eisinger <coffee@silcnet.org>

	* Fix several warnings in Irssi's Makefiles.

diff --git a/CHANGES b/CHANGES
index 157e5fcba2a14d7d2a1db9ca584e275982e6b954..9e7d93c5dc52695bf1ce6068a379d865ea695955 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,16 +1,3 @@
-Sun May 13 18:27:13 EEST 2007  Pekka Riikonen <priikone@silcnet.org>
-
-       * Fixed client library initialization when the running callback
-         is not given to silc_client_init.  Affected file is
-         lib/silcclient/client.c.
-
-       * Fixed Symbian compilation problems around the tree.  Added
-         new Carbide.c++ project files to symbian/ directory.
-
-       * Fixed SilcLog API to work on Symbian.  On Symbian it doesn't
-         use any globals.  Affected files are lib/silcutil/silclog.c
-         and silclog_i.h.
-
 Sun May 13 16:54:35 CEST 2007  Jochen Eisinger <coffee@silcnet.org>
 
        * Fix several warnings in Irssi's Makefiles.

diff --git a/Makefile.ad b/Makefile.ad
index f9cacd9191baaa2079f8b006b599fbe1bffd7027..82eb95e6f0bc8d6bbabbd3063502e351f95a2357 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -44,34 +44,6 @@ EXTRA_DIST =                 \
        CHANGES CREDITS
 #endif SILC_DIST_SILC
 
-#ifdef SILC_DIST_CLIENT
-if with_irssi
-install-dirs-client:
-       -mkdir -p $(etcdir)
-       -mkdir -p $(helpdir)
-       -mkdir -p $(mandir)/man1
-
-doc-install-client:
-       $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf
-       -@if test -f $(srcdir)/doc/silc.1 ; then \
-        $(INSTALL_DATA) $(srcdir)/doc/silc.1 $(mandir)/man1; \
-       fi
-
-etc-install-client:
-       -@if test '!' -d $(srcdir)/apps/irssi ; then \
-         if test '!' -f $(etcdir)/silc.conf ; then \
-           $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf \
-               $(etcdir)/silc.conf; \
-         fi; \
-       fi
-
-install-data-hook:             \
-       install-dirs-client     \
-       doc-install-client      \
-       etc-install-client
-endif
-#endif SILC_DIST_CLIENT
-
 #ifdef SILC_DIST_SILC
 include $(top_srcdir)/Makefile.defines.in
 #endif SILC_DIST_SILC

diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index 69891b7bc62a304787f79d8004dc11ee95f16fec..0233e8e10daf73febfca48fec90a9943593c4cee 100644 (file)
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -45,3 +45,33 @@ EXTRA_DIST = \
 rpm: Makefile
        $(MAKE) dist
        rpm -ta --clean $(PACKAGE)-$(VERSION).tar.gz
+
+install-dirs-client:
+       -mkdir -p $(helpdir)
+       -mkdir -p $(mandir)/man1
+
+doc-install-client:
+       $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf $(docdir)/example_silc.conf
+       -@if test -f $(silc_top_srcdir)/doc/silc.1 ; then \
+        $(INSTALL_DATA) $(silc_top_srcdir)/doc/silc.1 $(mandir)/man1; \
+       fi
+
+etc-install-client:
+       -@if test -d $(silc_top_srcdir)/apps/irssi ; then \
+         -mkdir -p $(etcdir) \
+         if test '!' -f $(etcdir)/silc.conf ; then \
+           $(INSTALL_DATA) $(silc_top_srcdir)/apps/irssi/silc.conf \
+               $(etcdir)/silc.conf; \
+         fi; \
+       fi
+
+if SILCPLUGIN
+ETCINSTALL=etc-install-client
+else
+ETCINSTALL=
+endif
+
+install-data-hook:             \
+       install-dirs-client     \
+       doc-install-client      \
+       etc-install-client

diff --git a/apps/irssi/docs/help/Makefile.am.gen b/apps/irssi/docs/help/Makefile.am.gen
index abf824b4a25c9672e599913e4d969352ea20cf83..ca97d1725802679c31f46b1a7cb6cb67ecafc630 100644 (file)
--- a/apps/irssi/docs/help/Makefile.am.gen
+++ b/apps/irssi/docs/help/Makefile.am.gen
@@ -1,6 +1,11 @@
 # Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
 
+if SILCPLUGIN
+helpdir = $(datadir)/irssi/help/silc
+else
 helpdir = $(datadir)/irssi/help
+endif
+
 
 help_DATA = \
 @HELPFILES@

diff --git a/apps/irssi/src/core/Makefile.am b/apps/irssi/src/core/Makefile.am
index 55ab73c4d8717a581816d40a6371167f5897de45..8c11695fe97581af12547f4c71135aa7dcef6c21 100644 (file)
--- a/apps/irssi/src/core/Makefile.am
+++ b/apps/irssi/src/core/Makefile.am
@@ -2,7 +2,7 @@ noinst_LIBRARIES = libcore.a
 
 include $(top_srcdir)/Makefile.defines.in
 
-INCLUDES = \
+INCLUDES += \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/core \
        $(GLIB_CFLAGS) \

diff --git a/apps/irssi/src/fe-common/core/Makefile.am b/apps/irssi/src/fe-common/core/Makefile.am
index 416ea2fc8756c74a1f8ccaabaf50fd6503f4598a..4860da14a32c2ea01fe1e57aa5e81efc1c59064e 100644 (file)
--- a/apps/irssi/src/fe-common/core/Makefile.am
+++ b/apps/irssi/src/fe-common/core/Makefile.am
@@ -2,7 +2,7 @@ noinst_LIBRARIES = libfe_common_core.a
 
 include $(top_srcdir)/Makefile.defines.in
 
-INCLUDES = \
+INCLUDES += \
        -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \
        $(GLIB_CFLAGS) \
        -DHELPDIR=\""$(silc_helpdir)"\" \

diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am
index f79f98b4cdd372b7b93c139812ed67b0be87dfcb..6b25109c7a435bf189c1be751322f24b3e633a69 100644 (file)
--- a/apps/irssi/src/fe-common/silc/Makefile.am
+++ b/apps/irssi/src/fe-common/silc/Makefile.am
@@ -1,3 +1,6 @@
+modulesdir=dummy
+include $(top_srcdir)/Makefile.defines.in
+
 IRSSI_INCLUDE=../../..
 
 if SILCPLUGIN
@@ -6,7 +9,7 @@ NILB=
 LTLB= libfe_common_silc.la
 LDFLGS= \
        -avoid-version \
-       -rpath $(moduledir)
+       -rpath $(modulesdir)
 else
 EXTRA_CFLAGS=
 NILB= libfe_common_silc.la
@@ -14,7 +17,6 @@ LTLB=
 LDFLGS=
 endif
 
-include $(top_srcdir)/Makefile.defines.in
 
 ADD_INCLUDES = \
         $(GLIB_CFLAGS) \
@@ -43,7 +45,7 @@ ADD_INCLUDES = \
        $(EXTRA_CFLAGS)
 
 noinst_LTLIBRARIES = $(NILB)
-module_LTLIBRARIES = $(LTLB)
+modules_LTLIBRARIES = $(LTLB)
 
 libfe_common_silc_la_LDFLAGS = \
        $(LDFGS)

diff --git a/apps/irssi/src/fe-text/Makefile.am b/apps/irssi/src/fe-text/Makefile.am
index 208929643351a40de09219e84feeda406f5caa25..ebd2053306162d89eb3fdaa7925a76134573d79f 100644 (file)
--- a/apps/irssi/src/fe-text/Makefile.am
+++ b/apps/irssi/src/fe-text/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = silc
 
 include $(top_srcdir)/Makefile.defines.in
 
-INCLUDES = \
+INCLUDES += \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/core/ \
        -I$(top_srcdir)/src/fe-common/core/ \

diff --git a/apps/irssi/src/perl/Makefile.am b/apps/irssi/src/perl/Makefile.am
index c00e8d27aa603574b8352498fa5bef1fe5a21b26..3b978476929d241fe4b62b83ce54430d76cc7dc3 100644 (file)
--- a/apps/irssi/src/perl/Makefile.am
+++ b/apps/irssi/src/perl/Makefile.am
@@ -17,7 +17,7 @@ libfe_perl_la_LDFLAGS = -module -avoid-version -rpath $(moduledir)
 
 perl-core.c: perl-signals-list.h irssi-core.pl.h
 
-INCLUDES = \
+INCLUDES += \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/core \
        -I$(top_srcdir)/src/fe-common/core \

diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am
index 22320187b0e130ec5287d57f1582761f018f1cda..a3ea1c69e0af4cc3f0e56e3c18566b007e230947 100644 (file)
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,3 +1,4 @@
+modulesdir=dummy
 include $(top_srcdir)/Makefile.defines.in
 
 IRSSI_INCLUDE=../../..
@@ -11,7 +12,7 @@ LTLB= libsilc_core.la
 NILB=
 LBLDFLGS= \
        -avoid-version \
-       -rpath $(moduledir)
+       -rpath $(modulesdir)
 else
 EXTRA_CFLAGS=
 LBDD=
@@ -31,7 +32,7 @@ ADD_INCLUDES = \
        $(EXTRA_CFLAGS)
 
 noinst_LTLIBRARIES= $(NILB)
-module_LTLIBRARIES = $(LTLB)
+modules_LTLIBRARIES = $(LTLB)
 
 libsilc_core_la_SOURCES = \
        clientutil.c \