updates.

diff --git a/CHANGES b/CHANGES
index e4d72fcdd7b9ade16578c0592c85c450e0a1abbf..db41d029d649f0c525f2c8ec5d661e8a7e30d93a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,9 +2,7 @@ Mon May 28 19:05:22 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
        * Added Makefile.defines[.in] that should for now on be included
          in all Makefile.am file in the source tree.  That file includes
-         all common compilation definitions for SILC source tree.  Also
-         all external packages that has been included in the SILC source
-         may include it (like irssi for example) to use the SILC defaults.
+         all common compilation definitions for SILC source tree.
 
 Mon May 28 10:30:51 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 

diff --git a/Makefile.am.pre b/Makefile.am.pre
index a13e2abfd5abda6148bda9102337ac7233b9caba..7a459ea1f05b4e65b529a34a6e06b6374e129dd3 100644 (file)
--- a/Makefile.am.pre
+++ b/Makefile.am.pre
@@ -18,7 +18,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-SUBDIRS = lib irssi silc silcd doc includes
+SUBDIRS = lib silc silcd doc includes
 DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS
 
 include $(top_srcdir)/Makefile.defines

diff --git a/Makefile.defines.in b/Makefile.defines.in
index fc280466215b78537d1abcabd4412aa662f6f18c..09a647597fcf8c8a2c08b1d9b51289892271c7f0 100644 (file)
--- a/Makefile.defines.in
+++ b/Makefile.defines.in
@@ -19,9 +19,7 @@
 #
 # 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).  Also all external packages
-# that are included in the SILC source tree and that needs the SILC
-# specific complation defines must include this file.
+# to include this file (Makefile.defines).
 #
 # Add following to your Makefile.am:
 #

diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am
index 304c44d868e1715483b63b7faca403ec7ded0092..de4dafe1cd07943b2d46c236d6b33e90cd60fe90 100644 (file)
--- a/apps/irssi/Makefile.am
+++ b/apps/irssi/Makefile.am
@@ -15,14 +15,12 @@ noinst_HEADERS = irssi-version.h
 
 EXTRA_DIST = \
        autogen.sh \
-       curses.m4 \
        README \
        file2header.sh \
        irssi.spec \
        irssi.spec.in \
        $(conf_DATA) \
-       irssi-config.in \
-       irssi-icon.png
+       irssi-config.in
 
 ## make rpms
 rpm: Makefile

diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index a1ab44a3e176c619d34c58a04cc55ba73a025f94..cb258c466c8bd5545c2bc5aee5b9fe5bc816b473 100755 (executable)
--- a/apps/irssi/autogen.sh
+++ b/apps/irssi/autogen.sh
@@ -99,5 +99,5 @@ if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
 fi
 echo "Running autoconf ..."
 autoconf
-echo "Running automake --gnu $am_opt ..."
-automake --add-missing --gnu $am_opt
+echo "Running automake $am_opt ..."
+automake --add-missing --foreign $am_opt

diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am
index 6eb7757be2bb72c619b96614a2183177a084d027..320be8adbc4eda6937f09b4e3fe36213654591f4 100644 (file)
--- a/apps/irssi/src/fe-common/silc/Makefile.am
+++ b/apps/irssi/src/fe-common/silc/Makefile.am
@@ -31,5 +31,6 @@ libfe_common_silc_a_SOURCES = \
        silc-modules.c 
 
 noinst_HEADERS = \
+       module-formats.h \
        fe-common-silc.h \
        module.h

diff --git a/apps/irssi/src/fe-text/Makefile.am b/apps/irssi/src/fe-text/Makefile.am
index da340a412a5df62e042ce48f0873c38c9f393be0..ef0f561662ab1904920eed23288a4e12081f56ab 100644 (file)
--- a/apps/irssi/src/fe-text/Makefile.am
+++ b/apps/irssi/src/fe-text/Makefile.am
@@ -1,7 +1,5 @@
 bin_PROGRAMS = silc
 
-include $(top_srcdir)/../Makefile.defines
-
 INCLUDES = \
        $(GLIB_CFLAGS) \
        -I$(top_srcdir)/src \
@@ -20,7 +18,7 @@ silc_LDADD = \
        @PERL_FE_LINK_LIBS@ \
        $(PROG_LIBS) \
         $(CURSES_LIBS) \
-       -L../../../lib -lsilcclient $(SILC_COMMON_LIBS)
+       -L../../../lib -lsilcclient -lsilc
 
 silc_SOURCES = \
         gui-entry.c \

diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am
index 5c78b4d761523d6aa43746425a62f4696398eada..3c8078c88499f0b26f68695451f3a991a2ecfdce 100644 (file)
--- a/apps/irssi/src/silc/core/Makefile.am
+++ b/apps/irssi/src/silc/core/Makefile.am
@@ -1,17 +1,26 @@
-INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src
-
 IRSSI_INCLUDE=../../..
+silc_top_srcdir=../../../..
 
-include $(top_srcdir)/../Makefile.defines
-
-ADD_INCLUDES = \
-        $(GLIB_CFLAGS) \
+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$(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
 
 noinst_LIBRARIES=libsilc_core.a
 

diff --git a/configure.in.pre b/configure.in.pre
index 13f401053a3bd984604449756f1f53d8bb300036..7b245dd0b028ebad0cfd04de7c64078d458aab34 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -384,21 +384,22 @@ AC_ARG_WITH(silcd-config-file,
                           server [/etc/silc/silcd.conf]],
 [ AC_DEFINE_UNQUOTED(SILC_SERVER_CONFIG_FILE, "$withval") ])
 
-# XXX
-#LIBS="$LIBS -lefence"
-
+#
 # Other configure scripts
+#
 AC_CONFIG_SUBDIRS(irssi)
 AC_CONFIG_SUBDIRS(lib/dotconf)
 AC_CONFIG_SUBDIRS(lib/silcmath/gmp)
 AC_CONFIG_SUBDIRS(lib/trq)
 #AC_CONFIG_SUBDIRS(lib/zlib)
 
-# Some final substitutions
 SILC_TOP_SRCDIR=`pwd`
 AC_SUBST(SILC_TOP_SRCDIR)
 AC_SUBST(LIBS)
 
+#
+# Makefile outputs
+#
 AC_OUTPUT( \
 Makefile
 Makefile.defines
@@ -416,4 +417,3 @@ lib/silcske/Makefile
 lib/silcutil/Makefile
 silc/Makefile
 silcd/Makefile)
-

diff --git a/prepare b/prepare
index 9c8f2270790937794e317135a3df69a320f0b13c..e189866937e5000c563939bbd3124ab1e75eb084 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -30,7 +30,7 @@
 #
 # If <package version> is omitted <base version> is used as package
 # version.  The package version appears in the package name and in those
-# distributions that used the SILC_DISTRIBUTION_VERSION define in the
+# distributions that used the SILC_DIST_VERSION_STRING define in the
 # code.  The base version is the SILC_VERSION_STRING define.
 #
 
@@ -106,7 +106,7 @@ cd ../..
 file=includes/version_internal.h
 echo "/* Automatically generated by ./prepare */" >$file
 echo "#define SILC_VERSION_STRING \"$version\"" >>$file
-echo "#define SILC_DISTRIBUTION_VERSION \"$dist_version\"" >>$file
+echo "#define SILC_DIST_VERSION_STRING \"$dist_version\"" >>$file
 echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file
 
 # preparing irssi