From 10b364c56dea8b351fd7150b17ec5786f441cff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Fri, 5 Sep 2003 07:44:50 +0000 Subject: - Make --enable-static work again (configure.in, Makefile.am) - get rid of ...-static.o files in the build process (now done via config.h instead of compiler flag) - make packet-rtnet link statically (remove one unused function, rename another one) svn path=/trunk/; revision=8389 --- plugins/pcli/Makefile.am | 7 +------ plugins/pcli/packet-pcli.c | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'plugins/pcli') diff --git a/plugins/pcli/Makefile.am b/plugins/pcli/Makefile.am index a3d258a726..8bdc330fa0 100644 --- a/plugins/pcli/Makefile.am +++ b/plugins/pcli/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal/Gryphon # -# $Id: Makefile.am,v 1.1 2002/10/03 02:56:59 hagbard Exp $ +# $Id: Makefile.am,v 1.2 2003/09/05 07:44:49 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann @@ -36,11 +36,6 @@ pcli_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -pcli_la_DEPENDENCIES = packet-pcli-static.o - -packet-pcli-static.o: packet-pcli.c moduleinfo.h - $(LTCOMPILE) -c -o packet-pcli-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-pcli.c - CLEANFILES = \ pcli \ *~ diff --git a/plugins/pcli/packet-pcli.c b/plugins/pcli/packet-pcli.c index 6a0e84191a..f9c198ae1b 100644 --- a/plugins/pcli/packet-pcli.c +++ b/plugins/pcli/packet-pcli.c @@ -4,7 +4,7 @@ * http://www.packetcable.com/downloads/specs/pkt-sp-esp-I01-991229.pdf * Chapter 4 ( Call Content Connection Interface ) * - * $Id: packet-pcli.c,v 1.7 2003/02/25 18:43:38 guy Exp $ + * $Id: packet-pcli.c,v 1.8 2003/09/05 07:44:50 jmayer Exp $ * * Copyright (c) 2000 by Ed Warnicke * @@ -52,7 +52,7 @@ /* Define version if we are not building ethereal statically */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -177,7 +177,7 @@ proto_reg_handoff_pcli(void) { /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ -- cgit v1.2.3