From dc2e0aaf23ad9a7eb46643533f1b275bfd10d51c Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Mon, 18 Apr 2005 17:27:52 +0000 Subject: [PATCH] updates. --- apps/autodist/CHANGES | 2 ++ apps/autodist/autodist.in | 10 +++++----- apps/autodist/doc/autodist.texi | 3 +++ distdir/autodist | 1 - distdir/common | 1 + distdir/server | 1 + lib/Makefile.ad | 6 ++++-- lib/configure.ad | 4 +++- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES index 3ef93cb1..1af3ef13 100644 --- a/apps/autodist/CHANGES +++ b/apps/autodist/CHANGES @@ -1,5 +1,7 @@ Mon Apr 18 20:06:24 EEST 2005 Pekka Riikonen + * Autodist 1.1. + * All 'local' variables must be at the start of function for compatibility. diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in index 1f58a2e7..00a7c955 100755 --- a/apps/autodist/autodist.in +++ b/apps/autodist/autodist.in @@ -1610,6 +1610,11 @@ ad_make_makefile_ams # ad_make_configure_ac ./configure.ad +# +# Process all files with .ad suffix for distribution processing +# +ad_process_ads + # # Generate configure script # @@ -1620,11 +1625,6 @@ ad_make_configure # ad_make_makefile_ins -# -# Process all files with .ad suffix for distribution processing -# -ad_process_ads - # # Create autodist.dist # diff --git a/apps/autodist/doc/autodist.texi b/apps/autodist/doc/autodist.texi index d0792a67..2533d061 100644 --- a/apps/autodist/doc/autodist.texi +++ b/apps/autodist/doc/autodist.texi @@ -1023,6 +1023,9 @@ preparation. They will be processed when creating the distribution package. If you need processed files during configuration or compilation then they need to have '.ad' suffix. +Note that, the distdef format used in these files must be the non-source +format. + @menu * Distdefines:: Using distdefs in files @end menu diff --git a/distdir/autodist b/distdir/autodist index 8b5f5fee..93a8df45 100644 --- a/distdir/autodist +++ b/distdir/autodist @@ -18,4 +18,3 @@ exclude apps/autodist/TODO apps/autodist/CHANGES exclude README.* ltmain.sh noprocess apps/autodist/doc apps/autodist/tests - diff --git a/distdir/common b/distdir/common index 39a2a5bf..3fa00057 100644 --- a/distdir/common +++ b/distdir/common @@ -7,4 +7,5 @@ define SILC_DIST_DOC define SILC_DIST_SIM define SILC_DIST_MPI define SILC_DIST_MATH +define SILC_DIST_SFTP define SILC_DIST_COMPILER diff --git a/distdir/server b/distdir/server index 3d224695..d8545c2e 100644 --- a/distdir/server +++ b/distdir/server @@ -5,4 +5,5 @@ license distdir/BSD license-header distdir/GPL-header distdir/BSD-header inherit common define SILC_DIST_SERVER +undef SILC_DIST_SFTP post-dist-hook distdir/post-dist diff --git a/lib/Makefile.ad b/lib/Makefile.ad index 5e12f56b..daa39137 100644 --- a/lib/Makefile.ad +++ b/lib/Makefile.ad @@ -28,9 +28,11 @@ SILCLIB_DIRS = \ #ifdef SILC_DIST_MATH silcmath \ #endif SILC_DIST_MATH +#ifdef SILC_DIST_SFTP + silcsftp \ +#endif SILC_DIST_SFTP silcske \ - silcutil \ - silcsftp + silcutil SILCLIB = libsilc.a diff --git a/lib/configure.ad b/lib/configure.ad index f46ac822..83770b8d 100644 --- a/lib/configure.ad +++ b/lib/configure.ad @@ -33,9 +33,11 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath" SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath/mpi" #endif SILC_DIST_MPI #endif SILC_DIST_MATH -SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske" SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcutil" +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske" +#ifdef SILC_DIST_SFTP SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp" +#endif SILC_DIST_SFTP #ifdef SILC_DIST_SIM SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim" #endif SILC_DIST_SIM -- 2.24.0