[Openvas-commits] r2931 - in trunk/openvas-libraries: . libopenvas libopenvas_hg
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Fri Mar 27 12:09:26 CET 2009
Author: mwiegand
Date: 2009-03-27 12:09:25 +0100 (Fri, 27 Mar 2009)
New Revision: 2931
Modified:
trunk/openvas-libraries/ChangeLog
trunk/openvas-libraries/libopenvas/Makefile
trunk/openvas-libraries/libopenvas_hg/Makefile
Log:
* libopenvas/Makefile, libopenvas_hg/Makefile: Adjusted libtool calls to
remove warnings about deprecated libtool usage during compile.
Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog 2009-03-27 09:01:07 UTC (rev 2930)
+++ trunk/openvas-libraries/ChangeLog 2009-03-27 11:09:25 UTC (rev 2931)
@@ -1,3 +1,8 @@
+2009-03-27 Michael Wiegand <michael.wiegand at intevation.de>
+
+ * libopenvas/Makefile, libopenvas_hg/Makefile: Adjusted libtool calls to
+ remove warnings about deprecated libtool usage during compile.
+
2009-03-06 Michael Wiegand <michael.wiegand at intevation.de>
Post release version bump.
Modified: trunk/openvas-libraries/libopenvas/Makefile
===================================================================
--- trunk/openvas-libraries/libopenvas/Makefile 2009-03-27 09:01:07 UTC (rev 2930)
+++ trunk/openvas-libraries/libopenvas/Makefile 2009-03-27 11:09:25 UTC (rev 2931)
@@ -45,84 +45,85 @@
CFLAGS+=-g -Wall
INCLUDE = $(include) $(GLIB_CFLAGS) $(DEFS)
CIPHER = -I../$(CIPHER_SUBDIR)
-
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS)
+LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
all : libopenvas.la
plugutils.o: plugutils.c arglists.h comm.h harglists.h kb.h network.h \
rand.h plugutils.h services.h share_fd.h store_internal.h system.h \
scanners_utils.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c plugutils.c
+ $(COMPILE) -c plugutils.c
resolve.o : resolve.c resolve.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c resolve.c
+ $(COMPILE) -c resolve.c
share_fd.o : share_fd.c
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c share_fd.c
+ $(COMPILE) -c share_fd.c
system.o : system.c system_internal.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c system.c
+ $(COMPILE) -c system.c
arglists.o: arglists.c arglists.h system_internal.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c arglists.c
+ $(COMPILE) -c arglists.c
network.o: network.c resolve.h ids_send.h plugutils.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c network.c
+ $(COMPILE) -c network.c
scanners_utils.o: scanners_utils.c comm.h network.h services.h plugutils.h system.h scanners_utils.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c scanners_utils.c
+ $(COMPILE) -c scanners_utils.c
ftp_funcs.o: ftp_funcs.c network.h ftp_funcs.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ftp_funcs.c
+ $(COMPILE) -c ftp_funcs.c
www_funcs.o: www_funcs.c kb.h plugutils.h system.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c www_funcs.c
+ $(COMPILE) -c www_funcs.c
pcap.o: pcap.c bpf_share.h pcap_openvas.h system_internal.h network.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c pcap.c
+ $(COMPILE) -c pcap.c
hlst.o: hlst.c hlst.h system.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hlst.c
+ $(COMPILE) -c hlst.c
harglists.o: harglists.c hlst.h system_internal.h harglists.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c harglists.c
+ $(COMPILE) -c harglists.c
ids_send.o: ids_send.c arglists.h bpf_share.h resolve.h ids_send.h network.h \
pcap_openvas.h plugutils.h system.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c
+ $(COMPILE) -c ids_send.c
bpf_share.o: bpf_share.c
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c bpf_share.c
+ $(COMPILE) -c bpf_share.c
rand.o: rand.c
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c
+ $(COMPILE) -c rand.c
popen.o: popen.c system.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c
+ $(COMPILE) -c popen.c
services.o: services.c services.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
+ $(COMPILE) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
services1.o: services1.c services.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
+ $(COMPILE) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
proctitle.o: proctitle.c proctitle.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c
+ $(COMPILE) -c proctitle.c
store.o: store.c store_internal.h share_fd.h system.h plugutils.h plugutils_internal.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
+ $(COMPILE) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
hash_table_file.o: hash_table_file.c hash_table_file.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hash_table_file.c
+ $(COMPILE) -c hash_table_file.c
kb.o: kb.c arglists.h kb.h system_internal.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c kb.c
+ $(COMPILE) -c kb.c
openvas_ssh_login.o: openvas_ssh_login.c openvas_ssh_login.h
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c openvas_ssh_login.c
+ $(COMPILE) -c openvas_ssh_login.c
libopenvas.la: $(OBJS)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o libopenvas.la $(LO_OBJS) $(LIBS) -rpath ${libdir} \
+ $(LINK) -o libopenvas.la $(LO_OBJS) $(LIBS) -rpath ${libdir} \
-version-info ${PACKAGE_VERSION}
install : libopenvas.la
Modified: trunk/openvas-libraries/libopenvas_hg/Makefile
===================================================================
--- trunk/openvas-libraries/libopenvas_hg/Makefile 2009-03-27 09:01:07 UTC (rev 2930)
+++ trunk/openvas-libraries/libopenvas_hg/Makefile 2009-03-27 11:09:25 UTC (rev 2931)
@@ -22,9 +22,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
include ../openvas-libraries.tmpl
-COMPILE = $(CC) $(DEFS) $(include) $(CFLAGS) -Wall -I../libopenvas
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(include) $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(WS2_32)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(include) $(CFLAGS) -Wall -I../libopenvas
+LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
OBJS = hg_utils.o hg_add_hosts.o hg_subnet.o hg_filter.o hosts_gatherer.o \
@@ -37,7 +36,7 @@
all : libopenvas_hg.la
test : libopenvas_hg.la test.c
- $(COMPILE) test.c -o test -L.libs -lopenvas_hg $(LIBS)
+ $(CC) $(DEFS) $(include) $(CFLAGS) -Wall -I../libopenvas test.c -o test -L.libs -lopenvas_hg $(LIBS)
install : libopenvas_hg.la
test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
@@ -47,29 +46,29 @@
$(INSTALL) -m 0644 hg_utils.h $(DESTDIR)${includedir}/openvas
libopenvas_hg.la : $(OBJS)
- $(LIBTOOL) $(CC) $(LDFLAGS) -o libopenvas_hg.la $(LO_OBJS) $(LIBS) -rpath ${libdir} \
+ $(LINK) -o libopenvas_hg.la $(LO_OBJS) $(LIBS) -rpath ${libdir} \
-version-info ${PACKAGE_VERSION}
hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hg_utils.c
+ $(COMPILE) -c hg_utils.c
hg_add_hosts.o : hg_add_hosts.h hosts_gatherer.h hg_add_hosts.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hg_add_hosts.c
+ $(COMPILE) -c hg_add_hosts.c
hg_subnet.o : hg_subnet.h hosts_gatherer.h hg_subnet.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hg_subnet.c
+ $(COMPILE) -c hg_subnet.c
hg_filter.o : hg_filter.h hosts_gatherer.h hg_filter.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hg_filter.c
+ $(COMPILE) -c hg_filter.c
hosts_gatherer.o : hosts_gatherer.h hosts_gatherer.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hosts_gatherer.c
+ $(COMPILE) -c hosts_gatherer.c
hg_dns_axfr.o : hg_dns_axfr.c hosts_gatherer.h hg_dns_axfr.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hg_dns_axfr.c
+ $(COMPILE) -c hg_dns_axfr.c
hg_debug.o : hg_debug.c hosts_gatherer.h hg_debug.c
- $(LIBTOOL) --mode=compile $(COMPILE) -c hg_debug.c
+ $(COMPILE) -c hg_debug.c
distclean : clean
More information about the Openvas-commits
mailing list