From 6ca0d5a32403fafa27055a2a61efc08e7384c26c Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Tue, 29 May 2001 09:41:43 +0000 Subject: [PATCH] updates. --- Makefile.defines.pre | 48 ++++++++++++++++++++++++++++ Makefile.defines_int | 8 ----- Makefile.defines_int.pre | 41 ++++++++++++++++++++++++ apps/irssi/src/fe-text/Makefile.am | 6 ++-- apps/irssi/src/silc/core/Makefile.am | 20 +++--------- configure.in.pre | 3 ++ lib/silccore/Makefile.am | 1 - prepare | 3 +- prepare-clean | 7 ++++ 9 files changed, 110 insertions(+), 27 deletions(-) create mode 100644 Makefile.defines.pre create mode 100644 Makefile.defines_int.pre diff --git a/Makefile.defines.pre b/Makefile.defines.pre new file mode 100644 index 00000000..87fc6821 --- /dev/null +++ b/Makefile.defines.pre @@ -0,0 +1,48 @@ +# +# Makefile.defines.in +# +# Author: Pekka Riikonen +# +# Copyright (C) 2000 - 2001 Pekka Riikonen +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +# +# This file is intended to include all common compilation defines for the +# SILC source tree. All Makefile.ams in the SILC source tree are expected +# to include this file (Makefile.defines). +# +# Add following to your Makefile.am: +# +# include $(top_srcdir)/Makefile.defines +# + +include $(top_srcdir)/Makefile.defines_int + +# +# INCLUDE defines +# +INCLUDES = $(ADD_INCLUDES) \ + -I$(srcdir) -I$(top_srcdir) \ + -I$(silc_top_srcdir) \ + -I$(silc_top_srcdir)/lib/silccore \ + -I$(silc_top_srcdir)/lib/silccrypt \ + -I$(silc_top_srcdir)/lib/silcmath \ + -I$(silc_top_srcdir)/lib/silcmath/gmp \ + -I$(silc_top_srcdir)/lib/silcske \ + -I$(silc_top_srcdir)/lib/silcsim \ + -I$(silc_top_srcdir)/lib/silcutil \ + -I$(silc_top_srcdir)/lib/silcclient \ + -I$(silc_top_srcdir)/lib/contrib \ + -I$(silc_top_srcdir)/includes \ + -I$(silc_top_srcdir)/doc \ + -I$(silc_top_srcdir)/lib/trq diff --git a/Makefile.defines_int b/Makefile.defines_int index 6a829661..e6347043 100644 --- a/Makefile.defines_int +++ b/Makefile.defines_int @@ -1,11 +1,3 @@ -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. -# Generated automatically from Makefile.defines_int.in by configure. # # Makefile.defines_int # diff --git a/Makefile.defines_int.pre b/Makefile.defines_int.pre new file mode 100644 index 00000000..c7fb38f8 --- /dev/null +++ b/Makefile.defines_int.pre @@ -0,0 +1,41 @@ +# +# Makefile.defines_int.pre +# +# Author: Pekka Riikonen +# +# Copyright (C) 2000 - 2001 Pekka Riikonen +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +# +# Internal file for definitions. This is read by Makefile.defines. DO NOT +# include this file directly to your Makefile.ams. +# + +# +# Generic definitions +# +silc_top_srcdir=@SILC_TOP_SRCDIR@ + +# +# Common libraries that are linked against the created executable +# +SILC_COMMON_LIBS= @LIBS@ -L$(silc_top_srcdir)/lib -lsilc + +# +# Installation defines +# +silc_etcdir=@ETCDIR@ +silc_modulesdir=$(prefix)/@MODULESDIR@ +silc_helpdir=$(prefix)/@HELPDIR@ +silc_docdir=$(prefix)/@DOCDIR@ +silc_logsdir=$(prefix)/@LOGSDIR@ diff --git a/apps/irssi/src/fe-text/Makefile.am b/apps/irssi/src/fe-text/Makefile.am index ef0f5616..2d6fe7c6 100644 --- a/apps/irssi/src/fe-text/Makefile.am +++ b/apps/irssi/src/fe-text/Makefile.am @@ -1,6 +1,8 @@ bin_PROGRAMS = silc -INCLUDES = \ +include $(top_srcdir)/Makefile.defines + +ADD_INCLUDES = \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core/ \ @@ -18,7 +20,7 @@ silc_LDADD = \ @PERL_FE_LINK_LIBS@ \ $(PROG_LIBS) \ $(CURSES_LIBS) \ - -L../../../lib -lsilcclient -lsilc + -L../../../lib -lsilcclient $(SILC_COMMON_LIBS) silc_SOURCES = \ gui-entry.c \ diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am index 3c8078c8..259fb6ef 100644 --- a/apps/irssi/src/silc/core/Makefile.am +++ b/apps/irssi/src/silc/core/Makefile.am @@ -1,26 +1,15 @@ +include $(top_srcdir)/Makefile.defines + IRSSI_INCLUDE=../../.. -silc_top_srcdir=../../../.. -INCLUDES = \ +ADD_INCLUDES = \ $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -I$(IRSSI_INCLUDE) \ -I$(IRSSI_INCLUDE)/src \ -I$(IRSSI_INCLUDE)/src/core \ -I$(IRSSI_INCLUDE)/src/fe-common/core \ - -I$(IRSSI_INCLUDE)/src/fe-common/silc \ - -I$(silc_top_srcdir)/lib/silccore \ - -I$(silc_top_srcdir)/lib/silccrypt \ - -I$(silc_top_srcdir)/lib/silcmath \ - -I$(silc_top_srcdir)/lib/silcmath/gmp \ - -I$(silc_top_srcdir)/lib/silcske \ - -I$(silc_top_srcdir)/lib/silcsim \ - -I$(silc_top_srcdir)/lib/silcutil \ - -I$(silc_top_srcdir)/lib/silcclient \ - -I$(silc_top_srcdir)/lib/contrib \ - -I$(silc_top_srcdir)/includes \ - -I$(silc_top_srcdir)/doc \ - -I$(silc_top_srcdir)/lib/trq + -I$(IRSSI_INCLUDE)/src/fe-common/silc noinst_LIBRARIES=libsilc_core.a @@ -45,3 +34,4 @@ noinst_HEADERS = \ silc-nicklist.h \ silc-queries.h \ silc-servers.h + diff --git a/configure.in.pre b/configure.in.pre index 7b245dd0..3fac2eaf 100644 --- a/configure.in.pre +++ b/configure.in.pre @@ -403,6 +403,9 @@ AC_SUBST(LIBS) AC_OUTPUT( \ Makefile Makefile.defines +Makefile.defines_int +irssi/Makefile.defines +irssi/Makefile.defines_int doc/Makefile includes/Makefile lib/Makefile diff --git a/lib/silccore/Makefile.am b/lib/silccore/Makefile.am index 3528b748..41ffc31b 100644 --- a/lib/silccore/Makefile.am +++ b/lib/silccore/Makefile.am @@ -36,4 +36,3 @@ libsilccore_a_SOURCES = \ EXTRA_DIST = *.h include $(top_srcdir)/Makefile.defines - diff --git a/prepare b/prepare index a6465891..ae760976 100755 --- a/prepare +++ b/prepare @@ -96,7 +96,8 @@ cp Makefile.defines.pre Makefile.defines.in cp Makefile.defines.in Makefile.defines cp Makefile.defines.in irssi cp Makefile.defines.in irssi/Makefile.defines -cp Makefile.defines_int Makefile.defines_int.in +cp Makefile.defines_int.pre Makefile.defines_int.in +cp Makefile.defines_int.in Makefile.defines_int cp Makefile.defines_int.in irssi cp Makefile.defines_int.in irssi/Makefile.defines_int diff --git a/prepare-clean b/prepare-clean index 23fc356e..ac4b2103 100755 --- a/prepare-clean +++ b/prepare-clean @@ -28,6 +28,13 @@ echo "All errors and warnings may be safely ignored." make clean -k make distclean -k rm -f Makefile.am +rm -f Makefile.defines +rm -f Makefile.defines.in +rm -f Makefile.defines_int.in +rm -f irssi/Makefile.defines +rm -f irssi/Makefile.defines.in +rm -f irssi/Makefile.defines_int +rm -f irssi/Makefile.defines_int.in rm -f lib/Makefile.am rm -f configure.in rm -f includes/stamp-* -- 2.24.0