projects
/
silc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a446fcd
)
avoid libtool warnings
author
Jochen Eisinger
<coffee@silcnet.org>
Tue, 10 Apr 2007 18:40:27 +0000
(18:40 +0000)
committer
Jochen Eisinger
<coffee@silcnet.org>
Tue, 10 Apr 2007 18:40:27 +0000
(18:40 +0000)
lib/Makefile.ad
patch
|
blob
|
history
diff --git
a/lib/Makefile.ad
b/lib/Makefile.ad
index 94234745f84c58b562ff13daa7d8ee8a3b8a32ea..3d1cfacecf9afb82e7b207895c316f7661ec0e37 100644
(file)
--- a/
lib/Makefile.ad
+++ b/
lib/Makefile.ad
@@
-50,9
+50,15
@@
SILCLIB_DIRS = \
#endif SILC_DIST_VCARD
if SILC_ENABLE_SHARED
#endif SILC_DIST_VCARD
if SILC_ENABLE_SHARED
-LIBTOOL_OPTS= -rpath $(DESTDIR)$(libdir)
+LIBTOOL_OPTS= -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir)
+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=
else
LIBTOOL_OPTS=
+LIBTOOL_SILC_VERSION =
+LIBTOOL_SILCCLIENT_VERSION =
+LIBTOOL_SILCSERVER_VERSION =
endif
SILCLIB = libsilc.a
endif
SILCLIB = libsilc.a
@@
-123,8
+129,8
@@
LIBSILC_AGE=@LIBSILC_AGE@
libsilc.a:
find $(SILCLIB_DIRS) -type f -name *.lo | xargs \
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
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_SILC_VERSION
) \
+ $(LIBTOOL_OPTS) -o libsilc.la
#ifdef SILC_DIST_CLIENTLIB
LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
#ifdef SILC_DIST_CLIENTLIB
LIBSILCCLIENT_CURRENT=@LIBSILCCLIENT_CURRENT@
@@
-134,8
+140,8
@@
LIBSILCCLIENT_AGE=@LIBSILCCLIENT_AGE@
libsilcclient.a:
find $(SILCCLIENTLIB_DIRS) -type f -name *.lo | xargs \
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
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
+
$(LIBTOOL_SILCCLIENT_VERSION
) \
+ $(LIBTOOL_OPTS) -o libsilcclient.la
#endif SILC_DIST_CLIENTLIB
#ifdef SILC_DIST_SERVERLIB
#endif SILC_DIST_CLIENTLIB
#ifdef SILC_DIST_SERVERLIB
@@
-146,8
+152,8
@@
LIBSILCSERVER_AGE=@LIBSILCSERVER_AGE@
libsilcserver.a:
find $(SILCSERVERLIB_DIRS) -type f -name *.lo | xargs \
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \
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_SILCSERVER_VERSION
) \
+ $(LIBTOOL_OPTS) -o libsilcserver.la
#endif SILC_DIST_SERVERLIB
#ifdef SILC_DIST_TOOLKIT
#endif SILC_DIST_SERVERLIB
#ifdef SILC_DIST_TOOLKIT