X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.ad;h=286f821391d5259760ad47f4669536758d1290e2;hb=9f20f0382b6229eca740925a73f96294f6dcedc6;hp=7cb3241c7c62e28b021bd836ee64f88105a72fa6;hpb=f1a52c060fd203ee275b9cc6aff711bf1961ad13;p=crypto.git diff --git a/lib/Makefile.ad b/lib/Makefile.ad index 7cb3241c..286f8213 100644 --- a/lib/Makefile.ad +++ b/lib/Makefile.ad @@ -3,7 +3,7 @@ # # Author: Pekka Riikonen # -# Copyright (C) 2000 - 2005 Pekka Riikonen +# Copyright (C) 2000 - 2008 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,176 +17,69 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign -# SILC Library dirs -SILCLIB_DIRS = \ - contrib \ - silccore \ - silcutil \ - silcapputil \ -#ifdef SILC_DIST_CRYPTO +# Library dirs +CRYPTO_DIRS = \ silccrypt \ -#endif SILC_DIST_CRYPTO -#ifdef SILC_DIST_SKR silcskr \ -#endif SILC_DIST_SKR -#ifdef SILC_DIST_MATH silcmath \ -#endif SILC_DIST_MATH -#ifdef SILC_DIST_SIM - silcsim \ -#endif SILC_DIST_SIM -#ifdef SILC_DIST_ASN1 silcasn1 \ -#endif SILC_DIST_ASN1 - silcske \ -#ifdef SILC_DIST_HTTP - silchttp \ -#endif SILC_DIST_HTTP -#ifdef SILC_DIST_SFTP - silcsftp \ -#endif SILC_DIST_SFTP -#ifdef SILC_DIST_VCARD - silcvcard \ -#endif SILC_DIST_VCARD -#ifdef SILC_DIST_ACC silcacc \ -#endif SILC_DIST_ACC +#ifdef SILC_DIST_SSH + silcssh \ +#endif SILC_DIST_SSH +#ifdef SILC_DIST_PGP + silcpgp \ +#endif SILC_DIST_PGP +#ifdef SILC_DIST_PKIX + silcpkix +#endif SILC_DIST_PKIX if SILC_ENABLE_SHARED -LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -LIBTOOL_SILC_VERSION = -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE) -LIBTOOL_SILCCLIENT_VERSION = -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE) -LIBTOOL_SILCSERVER_VERSION = -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE) +if SILC_WIN32 +LIBTOOL_OPTS= -release $(CRYPTO_BASE_VERSION) -rpath $(DESTDIR)$(libdir) \ + -export-dynamic -no-undefined +else +LIBTOOL_OPTS= -release $(CRYPTO_BASE_VERSION) -rpath $(DESTDIR)$(libdir) +endif +LIBTOOL_CRYPTO_VERSION = \ + -version-info $(CRYPTO_CURRENT):$(CRYPTO_REVISION):$(CRYPTO_AGE) else LIBTOOL_OPTS= -LIBTOOL_SILC_VERSION = -LIBTOOL_SILCCLIENT_VERSION = -LIBTOOL_SILCSERVER_VERSION = +LIBTOOL_CRYPTO_VERSION = +endif +if SILC_WIN32 +CRYPTO_LINK_LIBS=$(LIBS) +else +CRYPTO_LINK_LIBS= endif -SILCLIB = libsilc.a - -#ifdef SILC_DIST_CLIENTLIB -# SILC Client Library dirs -SILCCLIENTLIB_DIRS = silcclient -SILCCLIENTLIB = libsilcclient.a -#endif SILC_DIST_CLIENTLIB - -#ifdef SILC_DIST_SERVERLIB -# SILC Server Library dirs -SILCSERVERLIB_DIRS = silcserver -SILCSERVERLIB = libsilcserver.a -#endif SILC_DIST_SERVERLIB +CRYPTO_LIB = libsct.a -SUBDIRS = $(SILCLIB_DIRS) $(SILCSERVERLIB_DIRS) $(SILCCLIENTLIB_DIRS) +SUBDIRS = $(CRYPTO_DIRS) -CLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB) -DISTCLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB) +CLEANFILES = $(CRYPTO_LIB) +DISTCLEANFILES = $(CRYPTO_LIB) remove: -rm -f $(CLEANFILES) all: - $(MAKE) remove $(SILCLIB) $(SILCSERVERLIB) $(SILCCLIENTLIB) + $(MAKE) remove $(CRYPTO_LIB) -#ifdef SILC_DIST_TOOLKIT install-exec-hook: -mkdir -p $(DESTDIR)$(libdir) - -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ -#ifdef SILC_DIST_CLIENTLIB - -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ -#endif SILC_DIST_CLIENTLIB -#ifdef SILC_DIST_SERVERLIB - -$(LIBTOOL) $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/ -#endif SILC_DIST_SERVERLIB -#else !SILC_DIST_TOOLKIT + -$(LIBTOOL) $(INSTALL) libsct.la $(DESTDIR)$(libdir)/ -#ifdef SILC_DIST_SERVERLIB -install-exec-hook: -if SILC_ENABLE_SHARED - -mkdir -p $(libdir) - -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ - -$(LIBTOOL) $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/ - -rm -rf $(DESTDIR)$(libdir)/libsilc.a - -rm -rf $(DESTDIR)$(libdir)/libsilcserver.a -endif -#endif SILC_DIST_SERVERLIB - -#ifdef SILC_DIST_CLIENTLIB -install-exec-hook: -if SILC_ENABLE_SHARED - -mkdir -p $(libdir) - -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/ - -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/ - -rm -rf $(DESTDIR)$(libdir)/libsilc.a - -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a -endif -#endif SILC_DIST_CLIENTLIB -#endif SILC_DIST_TOOLKIT - -LIB_BASE_VERSION=@LIB_BASE_VERSION@ -LIBSILC_CURRENT=@LIBSILC_CURRENT@ -LIBSILC_REVISION=@LIBSILC_REVISION@ -LIBSILC_AGE=@LIBSILC_AGE@ - -libsilc.a: - find $(SILCLIB_DIRS) -type f -name *.lo | xargs \ - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ - $(LIBTOOL_SILC_VERSION) \ - $(LIBTOOL_OPTS) -o libsilc.la - -#ifdef SILC_DIST_CLIENTLIB -LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@ -LIBSILCCLIENT_REVISION=@LIBSILCCLIENT_REVISION@ -LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@ - -libsilcclient.a: - find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \ +libsct.a: + find $(CRYPTO_DIRS) -type f -name *.lo | xargs \ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ - $(LIBTOOL_SILCCLIENT_VERSION) \ - $(LIBTOOL_OPTS) -o libsilcclient.la -#endif SILC_DIST_CLIENTLIB + $(CRYPTO_LINK_LIBS) \ + $(LIBTOOL_CRYPTO_VERSION) \ + $(LIBTOOL_OPTS) -o libsct.la -#ifdef SILC_DIST_SERVERLIB -LIBSILCSERVER_CURRENT=@LIBSILCSERVER_CURRENT@ -LIBSILCSERVER_REVISION=@LIBSILCSERVER_REVISION@ -LIBSILCSERVER_AGE=@LIBSILCSERVER_AGE@ - -libsilcserver.a: - find $(SILCSERVERLIB_DIRS) -type f -name *.lo | xargs \ - $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ - $(LIBTOOL_SILCSERVER_VERSION) \ - $(LIBTOOL_OPTS) -o libsilcserver.la -#endif SILC_DIST_SERVERLIB - -#ifdef SILC_DIST_TOOLKIT pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = silc.pc \ -#ifdef SILC_DIST_CLIENTLIB - silcclient.pc \ -#endif SILC_DIST_CLIENTLIB -#ifdef SILC_DIST_SERVERLIB - silcserver.pc -#endif SILC_DIST_SERVERLIB - -EXTRA_DIST = silc.pc.in \ -#ifdef SILC_DIST_CLIENTLIB - silcclient.pc.in \ -#endif SILC_DIST_CLIENTLIB -#ifdef SILC_DIST_SERVERLIB - silcserver.pc.in -#endif SILC_DIST_SERVERLIB - -toolkit-install: - -mkdir -p $(docdir)/toolkit/ - -$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit - -$(INSTALL_DATA) $(top_srcdir)/lib/doc/*.gif $(docdir)/toolkit - -cp -R $(top_srcdir)/tutorial $(docdir) -#endif SILC_DIST_TOOLKIT +pkgconfig_DATA = sct.pc -install-data-hook: \ -#ifdef SILC_DIST_TOOLKIT - toolkit-install -#endif SILC_DIST_TOOLKIT +EXTRA_DIST = sct.pc.in include $(top_srcdir)/Makefile.defines.in