X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=Makefile.ad;fp=Makefile.am.pre;h=1ffcbca2bd4e42140935430d44abfca22d678523;hp=2c1eae371f80b3ea10812edaba96cadf677785f6;hb=c257b555225193e54d85daf541d29578b3c93882;hpb=f658940d02cf2fd893296b6a7825b42502573668 diff --git a/Makefile.am.pre b/Makefile.ad similarity index 68% rename from Makefile.am.pre rename to Makefile.ad index 2c1eae37..1ffcbca2 100644 --- a/Makefile.am.pre +++ b/Makefile.ad @@ -1,9 +1,9 @@ # -# Makefile.am +# Makefile.ad # # Author: Pekka Riikonen # -# Copyright (C) 2000 - 2003 Pekka Riikonen +# Copyright (C) 2000 - 2005 Pekka Riikonen # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,49 +17,50 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign -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 # # Installing of SILC into the system # -etcdir = $(DESTDIR)$(silc_etcdir) -modulesdir = $(DESTDIR)$(silc_modulesdir) -helpdir = $(DESTDIR)$(silc_helpdir) -docdir = $(DESTDIR)$(silc_docdir) -logsdir = $(DESTDIR)$(silc_logsdir) -mandir = $(DESTDIR)@mandir@ - install-dirs: -mkdir -p $(etcdir) -mkdir -p $(modulesdir) -mkdir -p $(docdir) -install-dirs-client: install-dirs - -mkdir -p $(helpdir) - -mkdir -p $(mandir)/man1 - -install-dirs-server: install-dirs - -mkdir -p $(logsdir) - -mkdir -p $(mandir)/man5 - -mkdir -p $(mandir)/man8 - doc-install: -$(INSTALL_DATA) $(srcdir)/doc/CodingStyle $(docdir)/ -$(INSTALL_DATA) $(srcdir)/doc/FAQ $(docdir)/ @@ -71,12 +72,37 @@ doc-install: -$(INSTALL_DATA) $(srcdir)/INSTALL $(docdir)/ -$(INSTALL_DATA) $(srcdir)/TODO $(docdir)/ +#ifdef SILC_DIST_SIM +sim-install: + -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/ +#endif SILC_DIST_SIM + +#ifdef SILC_DIST_CLIENT +install-dirs-client: install-dirs + -mkdir -p $(helpdir) + -mkdir -p $(mandir)/man1 + doc-install-client: doc-install $(INSTALL_DATA) $(srcdir)/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 '!' -f $(etcdir)/silc.conf ; then \ + $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \ + $(etcdir)/silc.conf; \ + fi; \ + fi +#endif SILC_DIST_CLIENT + +#ifdef SILC_DIST_SERVER +install-dirs-server: install-dirs + -mkdir -p $(logsdir) + -mkdir -p $(mandir)/man5 + -mkdir -p $(mandir)/man8 + doc-install-server: doc-install -$(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf $(docdir)/ -@if test -f $(srcdir)/doc/silcd.8 ; then \ @@ -86,14 +112,6 @@ doc-install-server: doc-install $(INSTALL_DATA) $(srcdir)/doc/silcd.conf.5 $(mandir)/man5; \ fi -etc-install-client: - -@if test '!' -d $(srcdir)/irssi ; then \ - if test '!' -f $(etcdir)/silc.conf ; then \ - $(INSTALL_DATA) $(srcdir)/irssi/silc.conf \ - $(etcdir)/silc.conf; \ - fi; \ - fi - etc-install-server: -@if test '!' -f $(etcdir)/silcd.conf ; then \ $(INSTALL_DATA) $(srcdir)/doc/example_silcd.conf \ @@ -103,15 +121,6 @@ etc-install-server: chmod go= $(etcdir)/silcd.conf; \ fi -sim-install: - -$(INSTALL_DATA) $(srcdir)/lib/silcsim/*.so $(modulesdir)/ - -toolkit-install: - -mkdir -p $(docdir)/toolkit/ - -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit - -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit - -cp -R $(srcdir)/tutorial $(prefix) - examples-install: -mkdir -p $(docdir)/examples/ -$(INSTALL_DATA) $(srcdir)/doc/examples/README $(docdir)/examples/ @@ -121,13 +130,36 @@ generate-server-key: -@if test '!' -f $(etcdir)/silcd.pub ; then \ $(sbindir)/silcd -C $(etcdir); \ fi +#endif SILC_DIST_SERVER + +#ifdef SILC_DIST_TOOLKIT +toolkit-install: + -mkdir -p $(docdir)/toolkit/ + -$(INSTALL_DATA) $(srcdir)/doc/toolkit/* $(docdir)/toolkit + -$(INSTALL_DATA) $(srcdir)/lib/doc/*.gif $(docdir)/toolkit + -cp -R $(srcdir)/tutorial $(prefix) +#endif SILC_DIST_TOOLKIT + +install-data-hook: \ +#ifdef SILC_DIST_CLIENT + install-dirs-client \ + doc-install-client \ + etc-install-client \ +#endif SILC_DIST_CLIENT +#ifdef SILC_DIST_SERVER + install-dirs-server \ + doc-install-server \ + etc-install-server \ + examples-install \ + generate-server-key \ +#endif SILC_DIST_SERVER +#ifdef SILC_DIST_TOOLKIT + toolkit-install \ +#endif SILC_DIST_TOOLKIT +#ifdef SILC_DIST_SIM + sim-install +#endif SILC_DIST_SIM + +include $(top_srcdir)/Makefile.defines.in -if SILC_DIST_CLIENT -install-data-hook: install-dirs-client sim-install doc-install-client etc-install-client -else -if SILC_DIST_TOOLKIT -install-data-hook: install-dirs-client install-dirs-server sim-install doc-install-client doc-install-server toolkit-install examples-install etc-install-client etc-install-server -else -install-data-hook: install-dirs-server sim-install doc-install-server examples-install etc-install-server generate-server-key -endif -endif +#endif SILC_DIST_SILC