X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2FMakefile.ad;h=9f3cb4671acfe2071bbb4107c951ee8275c2210c;hb=6c9d096ac4ddeaa5f3cac809a654af15bb9a8925;hp=4f8b11af62d296b4bf565583684c98d717808969;hpb=e9f89411d9512b68d5f48dd3c517f61f6c27b7cb;p=silc.git diff --git a/lib/Makefile.ad b/lib/Makefile.ad index 4f8b11af..9f3cb467 100644 --- a/lib/Makefile.ad +++ b/lib/Makefile.ad @@ -3,7 +3,7 @@ # # Author: Pekka Riikonen # -# 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 @@ -66,18 +66,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 @@ -148,7 +148,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 @@ -159,8 +159,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