X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.ad;h=71dc3b1a23c573ef565867ccd69c1d138cc81d0a;hb=45d30d3d2a8ced8d20a0c79d52e6ce1fed71cc2e;hp=47844fa609a779b2c84fac83897de4f211a040e8;hpb=60ae9cc7a12541f01b596e9aa941144bdcbdce16;p=silc.git

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 47844fa6..71dc3b1a 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -18,36 +18,21 @@
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 # 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
-#ifdef SILC_DIST_MATH
-	silcmath 	\
-#endif SILC_DIST_MATH
+SILCLIB_DIRS = \
+	contrib \
+	silccore \
+	silccrypt \
 #ifdef SILC_DIST_SIM
-	silcsim 	\
+	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_MATH
+	silcmath \
+#endif SILC_DIST_MATH
 #ifdef SILC_DIST_SFTP
-	silcsftp	\
+	silcsftp \
 #endif SILC_DIST_SFTP
-#ifdef SILC_DIST_VCARD
-	silcvcard	\
-#endif SILC_DIST_VCARD
+	silcske \
+	silcutil
 
 SILCLIB = libsilc.a
 
@@ -57,19 +42,14 @@ 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
-
-SUBDIRS = $(SILCLIB_DIRS) $(SILCSERVERLIB_DIRS) $(SILCCLIENTLIB_DIRS)
+SUBDIRS = $(SILCLIB_DIRS) $(SILCCLIENTLIB_DIRS)
 
-CLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
-DISTCLEANFILES = libsilc.a $(SILCCLIENTLIB) $(SILCSERVERLIB)
+CLEANFILES = libsilc.a libsilcclient.a
+DISTCLEANFILES = libsilc.a libsilcclient.a
 
 remove:
-	-rm -f $(CLEANFILES)
+	-rm -f libsilc.a
+	-rm -f libsilcclient.a
 
 all:
 	$(MAKE) remove $(SILCLIB) $(SILCSERVERLIB) $(SILCCLIENTLIB)
@@ -78,26 +58,19 @@ all:
 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_SERVERLIB
+#ifdef SILC_DIST_SERVER
 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
+#endif SILC_DIST_SERVER
 
-#ifdef SILC_DIST_CLIENTLIB
+#ifdef SILC_DIST_CLIENT
 install-exec-hook:
 if SILC_ENABLE_SHARED
 	-mkdir -p $(libdir)
@@ -106,7 +79,7 @@ if SILC_ENABLE_SHARED
 	-rm -rf $(DESTDIR)$(libdir)/libsilc.a
 	-rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
 endif
-#endif SILC_DIST_CLIENTLIB
+#endif SILC_DIST_CLIENT
 #endif SILC_DIST_TOOLKIT
 
 LIB_BASE_VERSION=@LIB_BASE_VERSION@
@@ -132,36 +105,14 @@ libsilcclient.a:
 	-release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -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) -rpath $(DESTDIR)$(libdir) -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
+pkgconfig_DATA = silc.pc silcclient.pc
 
-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
+EXTRA_DIST = silc.pc.in silcclient.pc.in
+#endif SILC_DIST_TOOLKIT
 
+#ifdef SILC_DIST_TOOLKIT
 toolkit-install:
 	-mkdir -p $(docdir)/toolkit/
 	-$(INSTALL_DATA) $(top_srcdir)/doc/toolkit/* $(docdir)/toolkit