50 lines
2.7 KiB
Diff
50 lines
2.7 KiB
Diff
|
>From fe05ea0802ff3f2fd2f49ed0bb3f1f0f4542f196 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Robert S. Edmonds" <edmonds@debian.org>
|
||
|
|
Date: Sat, 28 Jan 2012 20:05:43 -0500
|
||
|
|
Subject: [PATCH] Makefile.in: use -version-info, not -version-number
|
||
|
|
|
||
|
|
from the libtool manual:
|
||
|
|
|
||
|
|
-version-info current[:revision[:age]]
|
||
|
|
If output-file is a libtool library, use interface version
|
||
|
|
information current, revision, and age to build it (see
|
||
|
|
Versioning). Do not use this flag to specify package release
|
||
|
|
information, rather see the -release flag.
|
||
|
|
|
||
|
|
-version-number major[:minor[:revision]]
|
||
|
|
If output-file is a libtool library, compute interface version
|
||
|
|
information so that the resulting library uses the specified
|
||
|
|
major, minor and revision numbers. This is designed to permit
|
||
|
|
libtool to be used with existing projects where identical
|
||
|
|
version numbers are already used across operating systems. New
|
||
|
|
projects should use the -version-info flag instead.
|
||
|
|
---
|
||
|
|
Makefile.in | 4 ++--
|
||
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.in b/Makefile.in
|
||
|
|
index bdd8dba..4c26f52 100644
|
||
|
|
--- a/Makefile.in
|
||
|
|
+++ b/Makefile.in
|
||
|
|
@@ -224,7 +224,7 @@ ALL_OBJ=$(COMMON_OBJ) $(UNITTEST_OBJ) $(DAEMON_OBJ) \
|
||
|
|
|
||
|
|
COMPILE=$(LIBTOOL) --tag=CC --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS)
|
||
|
|
LINK=$(LIBTOOL) --tag=CC --mode=link $(CC) $(staticexe) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
|
||
|
|
-LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined
|
||
|
|
+LINK_LIB=$(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(staticexe) -version-info @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined
|
||
|
|
|
||
|
|
.PHONY: clean realclean doc lint all install uninstall tests test strip lib longtest longcheck check
|
||
|
|
|
||
|
|
@@ -369,7 +369,7 @@ libunbound/python/libunbound_wrap.c: $(srcdir)/libunbound/python/libunbound.i $(
|
||
|
|
|
||
|
|
# Pyunbound python unbound wrapper
|
||
|
|
_unbound.la: libunbound_wrap.lo libunbound.la
|
||
|
|
- $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -version-number @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound $(LIBS)
|
||
|
|
+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(RUNTIME_PATH) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -module -version-info @LIBUNBOUND_CURRENT@:@LIBUNBOUND_REVISION@:@LIBUNBOUND_AGE@ -no-undefined -o $@ libunbound_wrap.lo -rpath $(PYTHON_SITE_PKG) L. -L.libs -lunbound $(LIBS)
|
||
|
|
|
||
|
|
util/config_file.c: util/configparser.h
|
||
|
|
util/configlexer.c: $(srcdir)/util/configlexer.lex util/configparser.h
|
||
|
|
--
|
||
|
|
1.7.8.3
|
||
|
|
|