-COMMONDIRS = lib irssi silc silcd doc includes
-
-# Sub directories defined by "distributions" file, and can be overridden
-# with ./configure, which substitutes these variables.
-SUBDIRS = @SILC_DIST_SUBDIRS@
-DIST_SUBDIRS = @SILC_DIST_SUBDIRS@
-
-include $(top_srcdir)/Makefile.defines.in
-
-dist-bzip: distdir
- -chmod -R a+r $(distdir)
- -tar chof $(distdir).tar $(distdir)
- -bzip2 $(distdir).tar
- -rm -rf $(distdir)
-
-SILC_EXTRA_DIST = SILC_DISTRIBUTION_EXTRA
-EXTRA_DIST = libtoolfix CHANGES CREDITS $(SILC_EXTRA_DIST)
-
+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_TOOLKIT
+ silc \
+ win32 \
+#endif SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_INCLUDES
+ includes \
+#endif SILC_DIST_INCLUDES
+#ifdef SILC_DIST_DOC
+ doc
+#endif SILC_DIST_DOC
+
+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
+
+#ifdef SILC_DIST_SILC