projects
/
crypto.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d8251c
)
Variable name clash fix.
author
Pekka Riikonen
<priikone@silcnet.org>
Tue, 6 Nov 2007 10:20:00 +0000
(10:20 +0000)
committer
Pekka Riikonen
<priikone@silcnet.org>
Tue, 6 Nov 2007 10:20:00 +0000
(10:20 +0000)
lib/Makefile.ad
patch
|
blob
|
history
diff --git
a/lib/Makefile.ad
b/lib/Makefile.ad
index 4f8b11af62d296b4bf565583684c98d717808969..5bc42fda15e22c75cc5e8a58f7ed80ebc3babe77 100644
(file)
--- a/
lib/Makefile.ad
+++ b/
lib/Makefile.ad
@@
-3,7
+3,7
@@
#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
-# Copyright (C) 2000 - 200
5
Pekka Riikonen
+# Copyright (C) 2000 - 200
7
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
#
# 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_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
endif
if SILC_WIN32
-SILC_LIBS=$(LIBS)
+SILC_LI
NK_LI
BS=$(LIBS)
SILCCLIENT_LIBS=$(LIBS) -lsilc
SILCSERVER_LIBS=$(LIBS) -lsilc
else
SILCCLIENT_LIBS=$(LIBS) -lsilc
SILCSERVER_LIBS=$(LIBS) -lsilc
else
-SILC_LIBS=
+SILC_LI
NK_LI
BS=
SILCCLIENT_LIBS=
SILCSERVER_LIBS=
endif
SILCCLIENT_LIBS=
SILCSERVER_LIBS=
endif
@@
-148,7
+148,7
@@
LIBSILC_AGE=@LIBSILC_AGE@
libsilc.a:
find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
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_LI
NK_LI
BS) \
$(LIBTOOL_SILC_VERSION) \
$(LIBTOOL_OPTS) -o libsilc.la
$(LIBTOOL_SILC_VERSION) \
$(LIBTOOL_OPTS) -o libsilc.la