Tue Apr 10 12:40:19 CEST 2007 Jochen Eisinger <coffee@silcnet.org>

[silc.git] / lib / Makefile.ad

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 944bdc548397fc544adc970fdaeb760e43946012..94234745f84c58b562ff13daa7d8ee8a3b8a32ea 100644 (file)
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -17,16 +17,15 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-#ifdef SILC_DIST_SFTP
-#      silcsftp
-#endif SILC_DIST_SFTP
-
 # SILC Library dirs
 SILCLIB_DIRS =                 \
        contrib         \
        silccore        \
        silcutil        \
+       silcapputil     \
+#ifdef SILC_DIST_CRYPTO
        silccrypt       \
+#endif SILC_DIST_CRYPTO
 #ifdef SILC_DIST_SKR
        silcskr         \
 #endif SILC_DIST_SKR
@@ -39,7 +38,22 @@ SILCLIB_DIRS =               \
 #ifdef SILC_DIST_ASN1
        silcasn1        \
 #endif SILC_DIST_ASN1
-       silcske
+       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
+
+if SILC_ENABLE_SHARED
+LIBTOOL_OPTS= -rpath $(DESTDIR)$(libdir)
+else
+LIBTOOL_OPTS=
+endif
 
 SILCLIB = libsilc.a
 
@@ -55,27 +69,30 @@ SILCSERVERLIB_DIRS = silcserver
 SILCSERVERLIB = libsilcserver.a
 #endif SILC_DIST_SERVERLIB
 
-SUBDIRS = $(SILCLIB_DIRS) $(SILCSERVERLIB_DIRS) ###$(SILCCLIENTLIB_DIRS)
+SUBDIRS = $(SILCLIB_DIRS) $(SILCSERVERLIB_DIRS) $(SILCCLIENTLIB_DIRS)
 
-CLEANFILES = libsilc.a libsilcclient.a libsilcserver.a
-DISTCLEANFILES = libsilc.a libsilcclient.a libsilcserver.a
+CLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
+DISTCLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
 
 remove:
-       -rm -f libsilc.a
-       -rm -f libsilcclient.a
-       -rm -f libsilcserver.a
+       -rm -f $(CLEANFILES)
 
-all:   remove $(SILCLIB) $(SILCSERVERLIB) ###$(SILCCLIENTLIB)
+all:
+       $(MAKE) remove $(SILCLIB) $(SILCSERVERLIB) $(SILCCLIENTLIB)
 
 #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
 
-#ifdef SILC_DIST_SERVER
+#ifdef SILC_DIST_SERVERLIB
 install-exec-hook:
 if SILC_ENABLE_SHARED
        -mkdir -p $(libdir)
@@ -84,9 +101,9 @@ if SILC_ENABLE_SHARED
        -rm -rf $(DESTDIR)$(libdir)/libsilc.a
        -rm -rf $(DESTDIR)$(libdir)/libsilcserver.a
 endif
-#endif SILC_DIST_SERVER
+#endif SILC_DIST_SERVERLIB
 
-#ifdef SILC_DIST_CLIENT
+#ifdef SILC_DIST_CLIENTLIB
 install-exec-hook:
 if SILC_ENABLE_SHARED
        -mkdir -p $(libdir)
@@ -95,7 +112,7 @@ if SILC_ENABLE_SHARED
        -rm -rf $(DESTDIR)$(libdir)/libsilc.a
        -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
 endif
-#endif SILC_DIST_CLIENT
+#endif SILC_DIST_CLIENTLIB
 #endif SILC_DIST_TOOLKIT
 
 LIB_BASE_VERSION=@LIB_BASE_VERSION@
@@ -107,7 +124,7 @@ libsilc.a:
        find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
        -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE) \
-       -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilc.la
+       -release $(LIB_BASE_VERSION) $(LIBTOOL_OPTS) -o libsilc.la
 
 #ifdef SILC_DIST_CLIENTLIB
 LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
@@ -118,7 +135,7 @@ libsilcclient.a:
        find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
        -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE) \
-       -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
+       -release $(LIB_BASE_VERSION) $(LIBTOOL_OPTS) -o libsilcclient.la
 #endif SILC_DIST_CLIENTLIB
 
 #ifdef SILC_DIST_SERVERLIB
@@ -130,17 +147,27 @@ libsilcserver.a:
        find $(SILCSERVERLIB_DIRS) -type f -name *.lo | xargs \
        $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
        -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE) \
-       -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcserver.la
+       -release $(LIB_BASE_VERSION) $(LIBTOOL_OPTS) -o libsilcserver.la
 #endif SILC_DIST_SERVERLIB
 
 #ifdef SILC_DIST_TOOLKIT
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = silc.pc silcclient.pc silcserver.pc
+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 silcclient.pc.in silcserver.pc.in
-#endif SILC_DIST_TOOLKIT
+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
 
-#ifdef SILC_DIST_TOOLKIT
 toolkit-install:
        -mkdir -p $(docdir)/toolkit/
        -$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit