updates.

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
new file mode 100644 (file)
index 0000000..87fc682
--- /dev/null
+++ b/Makefile.defines.pre
@@ -0,0 +1,48 @@
+#
+#  Makefile.defines.in
+#
+#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#
+#  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 6a829661cabe5adc74ab3e67e41766bd387cf617..e6347043303b026e8410f6c0c03d596aa879f0b1 100644 (file)
--- 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 (file)
index 0000000..c7fb38f
--- /dev/null
+++ b/Makefile.defines_int.pre
@@ -0,0 +1,41 @@
+#
+#  Makefile.defines_int.pre
+#
+#  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
+#
+#  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 ef0f561662ab1904920eed23288a4e12081f56ab..2d6fe7c6bf7afae54fdc35f036d45ef1779711e9 100644 (file)
--- 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 3c8078c88499f0b26f68695451f3a991a2ecfdce..259fb6ef375af1a905f74b94ec9268d0acb3660f 100644 (file)
--- 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 7b245dd0b028ebad0cfd04de7c64078d458aab34..3fac2eaf5aac74f6ad6c0c8823aad29246d94edc 100644 (file)
--- 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 3528b7482261a24f129b0396f6b856a3944d8290..41ffc31becba180c374b8c63fbb85433b955c96e 100644 (file)
--- 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 a64658912d73b144577ce6d0bf26331636217a35..ae760976a933ac2dc7b89736442d4d0fcdfce321 100755 (executable)
--- 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 23fc356e1318ebf979b01be386b314990ed995d7..ac4b2103eaa1554721869f7362d01221c6d94e1b 100755 (executable)
--- 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-*