[Openvas-commits] r1719 - in trunk/openvas-libnasl: . nasl

[scm-commit@wald.intevation.org]

Author: mwiegand
Date: 2008-11-14 09:31:38 +0100 (Fri, 14 Nov 2008)
New Revision: 1719

Modified:
   trunk/openvas-libnasl/ChangeLog
   trunk/openvas-libnasl/nasl.tmpl.in
   trunk/openvas-libnasl/nasl/Makefile
Log:
Updated libtool usage again to make it more consistent and to avoid
duplicate mode parameters.

* nasl/Makefile: Changed COMPILE and LINK to directly set the
appropriate libtool mode; made mode parameters for install and finish
consistent with COMPILE and LINK.

* nasl.tmpl.in: Removed LIBTOOL_LINK shortcut, changed LIBTOOL back.
Mode handling is now done directly in the Makefile.


Modified: trunk/openvas-libnasl/ChangeLog
===================================================================
--- trunk/openvas-libnasl/ChangeLog	2008-11-13 13:11:52 UTC (rev 1718)
+++ trunk/openvas-libnasl/ChangeLog	2008-11-14 08:31:38 UTC (rev 1719)
@@ -1,3 +1,15 @@
+2008-11-14  Michael Wiegand <michael.wiegand at intevation.de>
+
+	Updated libtool usage again to make it more consistent and to avoid
+	duplicate mode parameters.
+
+	* nasl/Makefile: Changed COMPILE and LINK to directly set the
+	appropriate libtool mode; made mode parameters for install and finish
+	consistent with COMPILE and LINK.
+
+	* nasl.tmpl.in: Removed LIBTOOL_LINK shortcut, changed LIBTOOL back.
+	Mode handling is now done directly in the Makefile.
+
 2008-11-13  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* nasl/nasl_signature.c (openvas_certificate_free) : corrected and NULL

Modified: trunk/openvas-libnasl/nasl/Makefile
===================================================================
--- trunk/openvas-libnasl/nasl/Makefile	2008-11-13 13:11:52 UTC (rev 1718)
+++ trunk/openvas-libnasl/nasl/Makefile	2008-11-14 08:31:38 UTC (rev 1719)
@@ -87,8 +87,8 @@
 	nasl_signature.lo \
 	nasl_debug.lo
 
-COMPILE = $(LIBTOOL) $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
-LINK = $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
+LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(NESSUS_INCLUDE)
 all : libopenvasnasl.la openvas-nasl
 
 .c.o:
@@ -104,8 +104,8 @@
 install : libopenvasnasl.la openvas-nasl
 	test -d ${DESTDIR}${libdir} || $(INSTALL_DIR) -m 755 ${DESTDIR}${libdir}
 	test -d ${DESTDIR}${bindir} || $(INSTALL_DIR) -m 755 ${DESTDIR}${bindir}
-	$(LIBTOOL) --mode install $(INSTALL) libopenvasnasl.la ${DESTDIR}${libdir}/libopenvasnasl.la
-	$(LIBTOOL) --finish ${DESTDIR}${libdir}
+	$(LIBTOOL) --mode=install $(INSTALL) libopenvasnasl.la ${DESTDIR}${libdir}/libopenvasnasl.la
+	$(LIBTOOL) --mode=finish ${DESTDIR}${libdir}
 	test -d ${DESTDIR}${bindir} || $(INSTALL_DIR) -m 755 ${DESTDIR}${bindir}
 	$(INSTALL) openvas-nasl ${DESTDIR}${bindir}/
 

Modified: trunk/openvas-libnasl/nasl.tmpl.in
===================================================================
--- trunk/openvas-libnasl/nasl.tmpl.in	2008-11-13 13:11:52 UTC (rev 1718)
+++ trunk/openvas-libnasl/nasl.tmpl.in	2008-11-14 08:31:38 UTC (rev 1719)
@@ -76,8 +76,7 @@
 # Your C compiler
 CC=@CC@
 LIBS=@LIBS@ $(RPCSVC) $(COMPAT)
-LIBTOOL=@LIBTOOL@ --silent --mode=compile
-LIBTOOL_LINK=@LIBTOOL@ --silent --mode=link
+LIBTOOL=@LIBTOOL@ --silent
 RANLIB=@RANLIB@
 PACKAGE_VERSION=@OPENVASNASL_SUPER@:@OPENVASNASL_PATCH@:@OPENVASNASL_MINOR@
 VERSION=@VERSION@