From: Pekka Riikonen Date: Mon, 28 May 2001 18:44:17 +0000 (+0000) Subject: updates. X-Git-Tag: 1.2.beta1~2246 X-Git-Url: http://git.silcnet.org/gitweb/?p=crypto.git;a=commitdiff_plain;h=2b141e92fbffee3b69fa1618da5609c139b79292 updates. --- diff --git a/CHANGES b/CHANGES index e4d72fcd..db41d029 100644 --- a/CHANGES +++ b/CHANGES @@ -2,9 +2,7 @@ Mon May 28 19:05:22 EEST 2001 Pekka Riikonen * 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 diff --git a/Makefile.am.pre b/Makefile.am.pre index a13e2abf..7a459ea1 100644 --- 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 fc280466..09a64759 100644 --- 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 304c44d8..de4dafe1 100644 --- 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 a1ab44a3..cb258c46 100755 --- 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 6eb7757b..320be8ad 100644 --- 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 da340a41..ef0f5616 100644 --- 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 5c78b4d7..3c8078c8 100644 --- 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 13f40105..7b245dd0 100644 --- 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 9c8f2270..e1898669 100755 --- a/prepare +++ b/prepare @@ -30,7 +30,7 @@ # # If is omitted 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