X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.ad;h=94234745f84c58b562ff13daa7d8ee8a3b8a32ea;hb=deffbf0bda6ae966294433168e999723d35a23ff;hp=48fefd898daa3c18f64870c26d194aa55856e7f6;hpb=0f0340b9fbce9704cc7171f8f0104ce9103d2de6;p=silc.git

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 48fefd89..94234745 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -17,26 +17,43 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-#endif SILC_DIST_SFTP
-
 # SILC Library dirs
-SILCLIB_DIRS = \
-	contrib \
-	silcutil \
-	silccrypt \
+SILCLIB_DIRS = 		\
+	contrib 	\
+	silccore	\
+	silcutil 	\
+	silcapputil 	\
+#ifdef SILC_DIST_CRYPTO
+	silccrypt 	\
+#endif SILC_DIST_CRYPTO
+#ifdef SILC_DIST_SKR
+	silcskr 	\
+#endif SILC_DIST_SKR
 #ifdef SILC_DIST_MATH
-	silcmath \
+	silcmath 	\
 #endif SILC_DIST_MATH
 #ifdef SILC_DIST_SIM
-	silcsim \
+	silcsim 	\
+#endif SILC_DIST_SIM
 #ifdef SILC_DIST_ASN1
-	silcasn1 \
+	silcasn1	\
 #endif SILC_DIST_ASN1
-#endif SILC_DIST_SIM
-	silccore \
-	silcske \
+	silcske 	\
+#ifdef SILC_DIST_HTTP
+	silchttp	\
+#endif SILC_DIST_HTTP
 #ifdef SILC_DIST_SFTP
-	silcsftp
+	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
 
@@ -46,34 +63,47 @@ SILCCLIENTLIB_DIRS = silcclient
 SILCCLIENTLIB = libsilcclient.a
 #endif SILC_DIST_CLIENTLIB
 
-SUBDIRS = $(SILCLIB_DIRS) #$(SILCCLIENTLIB_DIRS)
+#ifdef SILC_DIST_SERVERLIB
+# SILC Server Library dirs
+SILCSERVERLIB_DIRS = silcserver
+SILCSERVERLIB = libsilcserver.a
+#endif SILC_DIST_SERVERLIB
+
+SUBDIRS = $(SILCLIB_DIRS) $(SILCSERVERLIB_DIRS) $(SILCCLIENTLIB_DIRS)
 
-CLEANFILES = libsilc.a libsilcclient.a
-DISTCLEANFILES = libsilc.a libsilcclient.a
+CLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
+DISTCLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
 
 remove:
-	-rm -f libsilc.a
-	-rm -f libsilcclient.a
+	-rm -f $(CLEANFILES)
 
-all:	remove $(SILCLIB) #$(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)
 	-$(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_SERVER
+#endif SILC_DIST_SERVERLIB
 
-#ifdef SILC_DIST_CLIENT
+#ifdef SILC_DIST_CLIENTLIB
 install-exec-hook:
 if SILC_ENABLE_SHARED
 	-mkdir -p $(libdir)
@@ -82,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@
@@ -94,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@
@@ -105,17 +135,39 @@ 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
+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) \
+	-version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE) \
+	-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
+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
-#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