X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.ad;h=df5d76eb991692d00c531fe35bae40d7f6d1fafd;hb=faa97fdb56d0b85042a5d0149b73ce7022f04398;hp=5bc42fda15e22c75cc5e8a58f7ed80ebc3babe77;hpb=28af33fffb344c93dc9b2bd4c4d0ab30855f7c23;p=silc.git

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 5bc42fda..df5d76eb 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -19,25 +19,8 @@ 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
-#ifdef SILC_DIST_SIM
-	silcsim 	\
-#endif SILC_DIST_SIM
-#ifdef SILC_DIST_ASN1
-	silcasn1	\
-#endif SILC_DIST_ASN1
 	silcske 	\
 #ifdef SILC_DIST_HTTP
 	silchttp	\
@@ -48,12 +31,6 @@ SILCLIB_DIRS = 		\
 #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
 
 if SILC_ENABLE_SHARED
 if SILC_WIN32
@@ -73,11 +50,11 @@ endif
 
 if SILC_WIN32
 SILC_LINK_LIBS=$(LIBS)
-SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
 SILCSERVER_LIBS=$(LIBS) -lsilc
 else
 SILC_LINK_LIBS=
-SILCCLIENT_LIBS=
+SILCCLIENT_LINK_LIBS=
 SILCSERVER_LIBS=
 endif
 
@@ -159,8 +136,8 @@ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
 
 libsilcclient.a:
 	find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCCLIENT_LIBS) \
-	$(LIBTOOL_SILCCLIENT_VERSION) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
+	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION) \
 	$(LIBTOOL_OPTS) -o libsilcclient.la
 #endif SILC_DIST_CLIENTLIB