Fixed libtool installation: always use --mode=install

[silc.git] / lib / Makefile.ad

diff --git a/lib/Makefile.ad b/lib/Makefile.ad
index 0ff524ed310db20c66a091a32cd2d5b1444adc4a..59e5457ecc555c056021c3dfc07aac60e3a789c1 100644 (file)
--- a/lib/Makefile.ad
+++ b/lib/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2005, 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
@@ -60,18 +60,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
 
@@ -103,12 +103,12 @@ all:
 #ifdef SILC_DIST_TOOLKIT
 install-exec-hook:
        -mkdir -p $(DESTDIR)$(libdir)
-       -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
 #ifdef SILC_DIST_CLIENTLIB
-       -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
 #endif SILC_DIST_CLIENTLIB
 #ifdef SILC_DIST_SERVERLIB
-       -$(LIBTOOL) $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
 #endif SILC_DIST_SERVERLIB
 #else !SILC_DIST_TOOLKIT
 
@@ -116,8 +116,8 @@ install-exec-hook:
 install-exec-hook:
 if SILC_ENABLE_SHARED
        -mkdir -p $(libdir)
-       -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
-       -$(LIBTOOL) $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilcserver.la $(DESTDIR)$(libdir)/
        -rm -rf $(DESTDIR)$(libdir)/libsilc.a
        -rm -rf $(DESTDIR)$(libdir)/libsilcserver.a
 endif
@@ -127,8 +127,8 @@ endif
 install-exec-hook:
 if SILC_ENABLE_SHARED
        -mkdir -p $(libdir)
-       -$(LIBTOOL) $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
-       -$(LIBTOOL) $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilc.la $(DESTDIR)$(libdir)/
+       -$(LIBTOOL) --mode=install $(INSTALL) libsilcclient.la $(DESTDIR)$(libdir)/
        -rm -rf $(DESTDIR)$(libdir)/libsilc.a
        -rm -rf $(DESTDIR)$(libdir)/libsilcclient.a
 endif
@@ -142,7 +142,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
 
@@ -153,8 +153,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