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

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 94234745..9f3cb467 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
@@ -48,11 +48,37 @@ 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
-LIBTOOL_OPTS= -rpath $(DESTDIR)$(libdir)
+if SILC_WIN32
+LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -export-dynamic -no-undefined
+else
+LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+endif
+LIBTOOL_SILC_VERSION = -version-info $(LIBSILC_CURRENT):$(LIBSILC_REVISION):$(LIBSILC_AGE)
+LIBTOOL_SILCCLIENT_VERSION = -version-info $(LIBSILCCLIENT_CURRENT):$(LIBSILCCLIENT_REVISION):$(LIBSILCCLIENT_AGE)
+LIBTOOL_SILCSERVER_VERSION = -version-info $(LIBSILCSERVER_CURRENT):$(LIBSILCSERVER_REVISION):$(LIBSILCSERVER_AGE)
 else
 LIBTOOL_OPTS=
+LIBTOOL_SILC_VERSION =
+LIBTOOL_SILCCLIENT_VERSION =
+LIBTOOL_SILCSERVER_VERSION =
+endif
+
+if SILC_WIN32
+SILC_LINK_LIBS=$(LIBS)
+SILCCLIENT_LINK_LIBS=$(LIBS) -lsilc
+SILCSERVER_LIBS=$(LIBS) -lsilc
+else
+SILC_LINK_LIBS=
+SILCCLIENT_LINK_LIBS=
+SILCSERVER_LIBS=
 endif
 
 SILCLIB = libsilc.a
@@ -122,9 +148,9 @@ LIBSILC_AGE=@LIBSILC_AGE@
 
 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) $(LIBTOOL_OPTS) -o libsilc.la
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILC_LINK_LIBS) \
+	$(LIBTOOL_SILC_VERSION) \
+	$(LIBTOOL_OPTS) -o libsilc.la
 
 #ifdef SILC_DIST_CLIENTLIB
 LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
@@ -134,8 +160,8 @@ LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
 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) $(LIBTOOL_OPTS) -o libsilcclient.la
+	$(SILCCLIENT_LINK_LIBS) $(LIBTOOL_SILCCLIENT_VERSION) \
+	$(LIBTOOL_OPTS) -o libsilcclient.la
 #endif SILC_DIST_CLIENTLIB
 
 #ifdef SILC_DIST_SERVERLIB
@@ -145,9 +171,9 @@ 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
+	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(SILCSERVER_LIBS) \
+	$(LIBTOOL_SILCSERVER_VERSION) \
+	$(LIBTOOL_OPTS) -o libsilcserver.la
 #endif SILC_DIST_SERVERLIB
 
 #ifdef SILC_DIST_TOOLKIT