[Openvas-commits] r7261 - in trunk/openvas-libraries: . nasl

[scm-commit@wald.intevation.org]

Author: felix
Date: 2010-04-12 12:20:08 +0200 (Mon, 12 Apr 2010)
New Revision: 7261

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/nasl/CMakeLists.txt
Log:
* nasl/CMakeLists.txt: Do not include standalone nasl tool object in
libraries. Statically link openvas-nasl instead.


Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2010-04-12 10:15:36 UTC (rev 7260)
+++ trunk/openvas-libraries/ChangeLog	2010-04-12 10:20:08 UTC (rev 7261)
@@ -1,5 +1,10 @@
 2010-04-12  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
+	* nasl/CMakeLists.txt: Do not include standalone nasl tool object in
+	libraries. Statically link openvas-nasl instead.
+
+2010-04-12  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
 	* nasl/CMakeLists.txt: Lowercased cmake commands.
 
 2010-04-12  Stephan Kleine

Modified: trunk/openvas-libraries/nasl/CMakeLists.txt
===================================================================
--- trunk/openvas-libraries/nasl/CMakeLists.txt	2010-04-12 10:15:36 UTC (rev 7260)
+++ trunk/openvas-libraries/nasl/CMakeLists.txt	2010-04-12 10:20:08 UTC (rev 7261)
@@ -149,7 +149,7 @@
    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/nasl_grammar.tab.h
    OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/nasl_grammar.output)
 
-set (FILES capture_packet.c exec.c hmacmd5.c lint.c lsearch.c md5.c nasl.c
+set (FILES capture_packet.c exec.c hmacmd5.c lint.c lsearch.c md5.c
      nasl_cmd_exec.c nasl_crypto2.c nasl_crypto.c nasl_debug.c nasl_func.c
      nasl_grammar.tab.c nasl_host.c nasl_http.c nasl_init.c nasl_lex_ctxt.c
      nasl_misc_funcs.c nasl_scanner_glue.c nasl_packet_forgery.c nasl_packet_forgery_v6.c
@@ -221,10 +221,10 @@
               IMPORTED_LOCATION ../hg/libopenvas_hg.so)
 
 # Link the openvas-nasl executable
-add_executable (openvas-nasl ${FILES})
-target_link_libraries (openvas-nasl libopenvas_base libopenvas_misc
-                       libopenvas_hg ${GLIB_LDFLAGS} -lgcrypt -lgpgme
-                       -lgpg-error -lgnutls -lpcap -lresolv)
+add_executable (openvas-nasl nasl.c)
+target_link_libraries (openvas-nasl openvas_nasl_static libopenvas_base
+                       libopenvas_misc libopenvas_hg ${GLIB_LDFLAGS} -lgcrypt
+                       -lgpgme -lgpg-error -lgnutls -lpcap -lresolv)
 set_target_properties (openvas-nasl PROPERTIES COMPILE_FLAGS
                        ${GLIB_CFLAGS})
 set_target_properties (openvas-nasl PROPERTIES LINK_FLAGS