updates.

diff --git a/apps/irssi/docs/help/Makefile.am.gen b/apps/irssi/docs/help/Makefile.am.gen
index 288f8a91908b364c8d5dc7ff5f8c61a0ca1276bf..c836962bb38cc2dbdd2498c7e8dd34f2228d2f63 100644 (file)
--- a/apps/irssi/docs/help/Makefile.am.gen
+++ b/apps/irssi/docs/help/Makefile.am.gen
@@ -12,4 +12,3 @@ EXTRA_DIST = \
        $(help_DATA)
 
 SUBDIRS = in
-DIST_SUBDIRS =

diff --git a/apps/irssi/docs/help/in/Makefile.am.gen b/apps/irssi/docs/help/in/Makefile.am.gen
index 9b0f2aaa10479b3f20f4fad0797a302dda1d8300..7bf5760b01c3d499460f362b8677a8c5ebdd1e83 100644 (file)
--- a/apps/irssi/docs/help/in/Makefile.am.gen
+++ b/apps/irssi/docs/help/in/Makefile.am.gen
@@ -1,5 +1,4 @@
 # Makefile.am is autogenerated by autogen.sh from Makefile.am.gen
 
 EXTRA_DIST = \
-       Makefile.am.gen \
-@HELPFILES@
+       Makefile.am.gen

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index 543a179dd6176e3ba24d3ae27c25ff19d6107ea6..f98aafc80dab80cf9804a7d5fa9bf8b3322c07a7 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -26,6 +26,7 @@ COMMONDIRS = \
        silcmath \
        silcske \
        silcutil \
+       silcclient \
        dotconf \
        trq
 #        zlib
@@ -52,7 +53,15 @@ SILCCLIENTLIB_DIRS = \
 CLEANFILES = libsilc.a libsilcclient.a
 DISTCLEANFILES = libsilc.a libsilcclient.a
 
+if SILC_DIST_CLIENT
 all:  remove libsilc.a libsilcclient.a
+else
+if SILC_DIST_TOOLKIT
+all:  remove libsilc.a libsilcclient.a
+else
+all:  remove libsilc.a
+endif
+endif
 
 remove:
        -rm -rf libsilc.a