From 28af33fffb344c93dc9b2bd4c4d0ab30855f7c23 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Tue, 6 Nov 2007 10:20:00 +0000 Subject: [PATCH] Variable name clash fix. --- lib/Makefile.ad | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/Makefile.ad b/lib/Makefile.ad index 4f8b11af..5bc42fda 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,17 +66,17 @@ 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) +SILC_LINK_LIBS=$(LIBS) SILCCLIENT_LIBS=$(LIBS) -lsilc SILCSERVER_LIBS=$(LIBS) -lsilc else -SILC_LIBS= +SILC_LINK_LIBS= SILCCLIENT_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 -- 2.24.0