X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2FMakefile.ad;h=9312320c993b48e7c9f6d1c037212257b45f269f;hp=0ff524ed310db20c66a091a32cd2d5b1444adc4a;hb=HEAD;hpb=49a5b30f51fe629e82b89a5f25bfc0b9e59df855

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 0ff524ed..9312320c 100644
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2007 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
@@ -19,29 +19,9 @@ 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	\
-#endif SILC_DIST_HTTP
 #ifdef SILC_DIST_SFTP
 	silcsftp	\
 #endif SILC_DIST_SFTP
@@ -60,18 +40,18 @@ LIBTOOL_SILCCLIENT_VERSION = -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLI
 LIBTOOL_SILCSERVER_VERSION = -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE)
 else
 LIBTOOL_OPTS=
-LIBTOOL_SILC_VERSION = 
-LIBTOOL_SILCCLIENT_VERSION = 
-LIBTOOL_SILCSERVER_VERSION = 
+LIBTOOL_SILC_VERSION =
+LIBTOOL_SILCCLIENT_VERSION =
+LIBTOOL_SILCSERVER_VERSION =
 endif
 
 if SILC_WIN32
-SILC_LIBS=$(LIBS)
-SILCCLIENT_LIBS=$(LIBS) -lsilc
+SILC_LINK_LIBS=$(LIBS)
+SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
 SILCSERVER_LIBS=$(LIBS) -lsilc
 else
-SILC_LIBS=
-SILCCLIENT_LIBS=
+SILC_LINK_LIBS=
+SILCCLIENT_LINK_LIBS=
 SILCSERVER_LIBS=
 endif
 
@@ -142,7 +122,7 @@ LIBSILC_AGE=@LIBSILC_AGE@
 
 libsilc.a:
 	find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
-	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LIBS) \
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS) \
 	$(LIBTOOL_SILC_VERSION) \
 	$(LIBTOOL_OPTS) -o libsilc.la
 
@@ -153,8 +133,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