From: Pekka Riikonen Date: Mon, 25 Apr 2005 11:27:42 +0000 (+0000) Subject: Moved silcer/, silc/, silcd/ and irssi/ to apps/. This finalizes X-Git-Tag: silc.server.0.9.20~12 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=c3562d9c28363422875ab5cae4b989e6e5d8b91d Moved silcer/, silc/, silcd/ and irssi/ to apps/. This finalizes the major restructuring of CVS tree. --- diff --git a/CHANGES b/CHANGES index 0ef11116..32546b97 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +Mon Apr 25 14:25:24 EEST 2005 Pekka Riikonen + + * Moved silcer/, silc/, silcd/ and irssi/ to apps/. This + finalizes the major restructuring of the CVS tree. + Mon Apr 25 00:39:30 EEST 2005 Pekka Riikonen * Send empty MOTD reply if MOTD file cannot be read. diff --git a/Makefile.ad b/Makefile.ad index e76466de..439941c0 100644 --- a/Makefile.ad +++ b/Makefile.ad @@ -18,20 +18,13 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign SUBDIRS = \ -#ifdef SILC_DIST_APPS - apps \ -#endif SILC_DIST_APPS #ifdef SILC_DIST_LIB lib \ #endif SILC_DIST_LIB -#ifdef SILC_DIST_CLIENT - irssi \ -#endif SILC_DIST_CLIENT -#ifdef SILC_DIST_SERVER - silcd \ -#endif SILC_DIST_SERVER +#ifdef SILC_DIST_APPS + apps \ +#endif SILC_DIST_APPS #ifdef SILC_DIST_TOOLKIT - silc \ win32 \ #endif SILC_DIST_TOOLKIT #ifdef SILC_DIST_INCLUDES @@ -44,9 +37,6 @@ SUBDIRS = \ EXTRA_DIST = \ silcdefs.h.in \ #ifdef SILC_DIST_SILC -#ifdef SILC_DIST_TOOLKIT - README.CVS README.WIN32 README.MACOSX silcer tutorial \ -#endif SILC_DIST_TOOLKIT libtoolfix \ CHANGES CREDITS #endif SILC_DIST_SILC @@ -83,15 +73,15 @@ install-dirs-client: install-dirs -mkdir -p $(mandir)/man1 doc-install-client: doc-install - $(INSTALL_DATA) $(srcdir)/irssi/silc.conf $(docdir)/example_silc.conf + $(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)/irssi ; then \ + -@if test '!' -d $(srcdir)/apps/irssi ; then \ if test '!' -f $(etcdir)/silc.conf ; then \ - $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \ + $(INSTALL_DATA) $(srcdir)/apps/irssi/silc.conf \ $(etcdir)/silc.conf; \ fi; \ fi diff --git a/apps/Makefile.ad b/apps/Makefile.ad index 0a01a55f..52ad0206 100644 --- a/apps/Makefile.ad +++ b/apps/Makefile.ad @@ -19,5 +19,12 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign SUBDIRS = \ #ifdef SILC_DIST_AUTODIST - autodist + autodist \ #endif SILC_DIST_AUTODIST +#ifdef SILC_DIST_SERVER + silcd \ +#endif SILC_DIST_SERVER +#ifdef SILC_DIST_CLIENT + irssi \ +#endif SILC_DIST_CLIENT + diff --git a/apps/irssi/src/fe-text/Makefile.am b/apps/irssi/src/fe-text/Makefile.am index 02cb3dd8..2b248696 100644 --- a/apps/irssi/src/fe-text/Makefile.am +++ b/apps/irssi/src/fe-text/Makefile.am @@ -19,7 +19,7 @@ silc_DEPENDENCIES = \ LIBS = $(SILC_COMMON_LIBS) silc_LDADD = \ @COMMON_LIBS@ \ - -L../../../lib -lsilcclient \ + -L$(silc_top_srcdir)/lib -lsilcclient \ @PERL_LINK_LIBS@ \ @PERL_FE_LINK_LIBS@ \ @PERL_LINK_FLAGS@ \ diff --git a/apps/silcd/configure.ad b/apps/silcd/configure.ad index d758333b..bb077528 100644 --- a/apps/silcd/configure.ad +++ b/apps/silcd/configure.ad @@ -1,6 +1,6 @@ #ifdef SILC_DIST_SERVER # -# silcd/configure.ad +# apps/silcd/configure.ad # # Author: Pekka Riikonen # @@ -69,7 +69,7 @@ AC_SUBST(PIDFILE) if test x$without_silcd = xfalse ; then #endif SILC_DIST_TOOLKIT AC_CONFIG_FILES( -silcd/Makefile +apps/silcd/Makefile doc/example_silcd.conf ) #ifdef SILC_DIST_TOOLKIT diff --git a/configure.ad b/configure.ad index b9ff4180..6543952c 100644 --- a/configure.ad +++ b/configure.ad @@ -1070,7 +1070,7 @@ AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes) if test x$without_irssi = xfalse; then #endif SILC_DIST_TOOLKIT #ifdef SILC_DIST_CLIENT - AC_CONFIG_SUBDIRS(irssi) + AC_CONFIG_SUBDIRS(apps/irssi) irssi="yes" #endif SILC_DIST_CLIENT #ifdef SILC_DIST_TOOLKIT @@ -1133,8 +1133,8 @@ if test x$without_irssi = xfalse ; then #endif SILC_DIST_TOOLKIT #ifdef SILC_DIST_CLIENT AC_CONFIG_FILES( -irssi/Makefile.defines -irssi/Makefile.defines_int +apps/irssi/Makefile.defines +apps/irssi/Makefile.defines_int ) #endif SILC_DIST_CLIENT #ifdef SILC_DIST_TOOLKIT @@ -1143,7 +1143,6 @@ fi #ifdef SILC_DIST_TOOLKIT AC_CONFIG_FILES( -silc/Makefile win32/Makefile win32/libsilc/Makefile win32/libsilcclient/Makefile diff --git a/distdir/common b/distdir/common index 95441651..af1cfad2 100644 --- a/distdir/common +++ b/distdir/common @@ -1,6 +1,7 @@ # Common SILC source tree distdefs option template define SILC_DIST_SILC +define SILC_DIST_APPS define SILC_DIST_LIB define SILC_DIST_INCLUDES define SILC_DIST_DOC diff --git a/distdir/default b/distdir/default index d014c2d2..c58d4036 100644 --- a/distdir/default +++ b/distdir/default @@ -10,10 +10,12 @@ option no-dist # Default distribution for preparing raw CVS sources. inherit common inherit client -#inherit server +inherit server inherit toolkit -define SILC_DIST_SERVER define SILC_DIST_INPLACE +# SFTP is undefined in server, so force it here +#define SILC_DIST_SFTP + pre-hook distdir/pre-run diff --git a/distdir/pre-run b/distdir/pre-run index cc716ca1..7b9df250 100644 --- a/distdir/pre-run +++ b/distdir/pre-run @@ -6,13 +6,14 @@ package=$3 # preparing irssi echo "Preparing irssi" -file=irssi/irssi-version.h.in +cur=`pwd` +file=apps/irssi/irssi-version.h.in touch $file -cd irssi -ln -fs ../Makefile.defines.in Makefile.defines.in -ln -fs ../Makefile.defines_int.in Makefile.defines_int.in +cd apps/irssi +ln -fs ../../Makefile.defines.in Makefile.defines.in +ln -fs ../../Makefile.defines_int.in Makefile.defines_int.in sh autogen.sh 2>/dev/null 1>/dev/null -cd .. +cd $cur version_date=`date +%Y%m%d` echo "/* automatically created by autogen.sh */" > $file echo "#define IRSSI_VERSION \"$dist_version (Irssi base: @VERSION@ - SILC base: SILC $dist_version)\"" >>$file diff --git a/distdir/server b/distdir/server index 97f82d34..1ca33264 100644 --- a/distdir/server +++ b/distdir/server @@ -4,7 +4,7 @@ bug-report silc-devel@lists.silcnet.org inherit common define SILC_DIST_SERVER -undef SILC_DIST_SFTP +#undef SILC_DIST_SFTP post-process-dist-hook distdir/post-process-dist post-dist-hook distdir/post-dist diff --git a/distdir/toolkit b/distdir/toolkit index ebc4ca7b..0a727425 100644 --- a/distdir/toolkit +++ b/distdir/toolkit @@ -4,15 +4,18 @@ bug-report silc-devel@lists.silcnet.org inherit common inherit client -#inherit server +inherit server -define SILC_DIST_SERVER define SILC_DIST_TOOLKIT +# SFTP is undefined in server, so force it here +#define SILC_DIST_SFTP + include README.CVS include README.WIN32 include README.MACOSX -include silcer +include apps/silcer +include apps/silc include tutorial pre-hook distdir/pre-run