[Openvas-commits] r2989 - in trunk/openvas-client: . nessus src/openvas-lib src/util

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-04-02 10:30:30 +0200 (Thu, 02 Apr 2009)
New Revision: 2989

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/configure.in
   trunk/openvas-client/nessus/Makefile
   trunk/openvas-client/src/openvas-lib/Makefile
   trunk/openvas-client/src/util/Makefile
Log:
Increased GTK+ version requirement (from 2.4 to 2.6).
Resolved build problems when configured with --disable-gtk.

* configure.in: Increased version requirement for gtk+.

* nessus/Makefile: Moved hash_table_file object into util_objs list,
NESSUSCLIENT target depending on utils target.

* src/util/Makefile, src/openvas-lib/Makefile: Include GLib cflags.


Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-04-02 07:56:02 UTC (rev 2988)
+++ trunk/openvas-client/ChangeLog	2009-04-02 08:30:30 UTC (rev 2989)
@@ -1,3 +1,15 @@
+2009-04-02  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+	Increased GTK+ version requirement (from 2.4 to 2.6).
+	Resolved build problems when configured with --disable-gtk.
+
+	* configure.in: Increased version requirement for gtk+.
+	
+	* nessus/Makefile: Moved hash_table_file object into util_objs list,
+	NESSUSCLIENT target depending on utils target.
+	
+	* src/util/Makefile, src/openvas-lib/Makefile: Include GLib cflags.
+	
 2009-03-31  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* nessus/prefs_dialog/prefs_comment.c (prefs_dialog_comment): Proper

Modified: trunk/openvas-client/configure.in
===================================================================
--- trunk/openvas-client/configure.in	2009-04-02 07:56:02 UTC (rev 2988)
+++ trunk/openvas-client/configure.in	2009-04-02 08:30:30 UTC (rev 2989)
@@ -521,7 +521,7 @@
 
 test "x$enable_gtk" = "xno" ||
 {
-pkg_modules="gtk+-2.0 >= 2.4.0"
+pkg_modules="gtk+-2.0 >= 2.6.0"
 PKG_CHECK_MODULES(GTKCONFIG, [$pkg_modules])
 AC_SUBST(GTKCONFIG_CFLAGS)
 AC_SUBST(GTKCONFIG_LIBS)

Modified: trunk/openvas-client/nessus/Makefile
===================================================================
--- trunk/openvas-client/nessus/Makefile	2009-04-02 07:56:02 UTC (rev 2988)
+++ trunk/openvas-client/nessus/Makefile	2009-04-02 08:30:30 UTC (rev 2989)
@@ -71,11 +71,11 @@
            ../src/gui/slad_install.o ../src/gui/ssh_keys_dialog.o \
            ../src/gui/treeview_support.o \
            ../src/gui/ssh_key_info_form.o ../src/gui/nvt_pref_sshlogin.o \
-           ../src/openvas-lib/hash_table_file.o \
            ../src/gui/severity_override_form.o
 
 UTIL_OBJS = ../src/util/parseutils.o \
-            ../src/util/severity_filter.o
+            ../src/util/severity_filter.o \
+            ../src/openvas-lib/hash_table_file.o \
 
 all : cflags ${make_bindir}/$(NESSUSCLIENT)
 
@@ -84,14 +84,14 @@
 	test -d ${make_bindir} || mkdir ${make_bindir}
 	cp $(NESSUSCLIENT) ${make_bindir}
 
-cflags : 
+cflags :
 	@echo "$(NESSUS_CFLAGS) $(NESSUS_DEFS) -DPACKAGE=\"OpenVAS-Client\" $(INCLUDE)"  | sed 's/\"/\\\"/g' > cflags.tmp
 	@echo "echo \"`cat cflags.tmp`\"" > cflags
 	@rm cflags.tmp
 	@chmod +x cflags
 
 $(NESSUSCLIENT) : cflags $(OBJS) $(if $(USE_GTK),$(GTK_OBJS) gui) \
-   libnessus-client
+   libnessus-client util
 	$(CC) $(LDFLAGS) $(OBJS) $(if $(USE_GTK),$(GTK_OBJS) $(GUI_OBJS)) $(UTIL_OBJS) -o $(NESSUSCLIENT) $(LIBS)
 
 libnessus-client :

Modified: trunk/openvas-client/src/openvas-lib/Makefile
===================================================================
--- trunk/openvas-client/src/openvas-lib/Makefile	2009-04-02 07:56:02 UTC (rev 2988)
+++ trunk/openvas-client/src/openvas-lib/Makefile	2009-04-02 08:30:30 UTC (rev 2989)
@@ -36,7 +36,7 @@
 include ../../nessus.tmpl
 
 GTKLIBS= $(GTKCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../../nessus -I.. -I../../include
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIB_CFLAGS) -I../../nessus -I.. -I../../include
 
 OPENVAS_INCLUDE=`sh ./cflags`
 CFLAGS+=-Wall

Modified: trunk/openvas-client/src/util/Makefile
===================================================================
--- trunk/openvas-client/src/util/Makefile	2009-04-02 07:56:02 UTC (rev 2988)
+++ trunk/openvas-client/src/util/Makefile	2009-04-02 08:30:30 UTC (rev 2989)
@@ -36,7 +36,7 @@
 include ../../nessus.tmpl
 
 GTKLIBS= $(GTKCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) -I../../nessus -I.. -I../../include -I../openvas-lib -I../gui/ -I.
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIB_CFLAGS) -I../../nessus -I.. -I../../include -I../openvas-lib -I../gui/ -I.
 
 OPENVAS_INCLUDE=`sh ./cflags`
 CFLAGS+=-Wall