From 1db7801dd7c7890ebc8bbec651a9d18cbbe9012b Mon Sep 17 00:00:00 2001 From: Jochen Eisinger Date: Sun, 13 May 2007 14:59:24 +0000 Subject: [PATCH] Sun May 13 16:54:35 CEST 2007 Jochen Eisinger * Fix several warnings in Irssi's Makefiles. --- CHANGES | 13 ---------- Makefile.ad | 28 --------------------- apps/irssi/Makefile.am | 30 +++++++++++++++++++++++ apps/irssi/docs/help/Makefile.am.gen | 5 ++++ apps/irssi/src/core/Makefile.am | 2 +- apps/irssi/src/fe-common/core/Makefile.am | 2 +- apps/irssi/src/fe-common/silc/Makefile.am | 8 +++--- apps/irssi/src/fe-text/Makefile.am | 2 +- apps/irssi/src/perl/Makefile.am | 2 +- apps/irssi/src/silc/core/Makefile.am | 5 ++-- 10 files changed, 47 insertions(+), 50 deletions(-) diff --git a/CHANGES b/CHANGES index 157e5fcb..9e7d93c5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,16 +1,3 @@ -Sun May 13 18:27:13 EEST 2007 Pekka Riikonen - - * 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 * Fix several warnings in Irssi's Makefiles. diff --git a/Makefile.ad b/Makefile.ad index f9cacd91..82eb95e6 100644 --- 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 69891b7b..0233e8e1 100644 --- 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 abf824b4..ca97d172 100644 --- 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 55ab73c4..8c11695f 100644 --- 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 416ea2fc..4860da14 100644 --- 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 f79f98b4..6b25109c 100644 --- 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 20892964..ebd20533 100644 --- 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 c00e8d27..3b978476 100644 --- 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 22320187..a3ea1c69 100644 --- 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 \ -- 2.24.0