diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2003-09-05 07:44:50 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2003-09-05 07:44:50 +0000 |
| commit | 10b364c56dea8b351fd7150b17ec5786f441cff6 (patch) | |
| tree | 83c4bb27a5beba5fee61ceab8bf6cb07cfcfaba4 /plugins/mgcp | |
| parent | dd2080a64633a1fd43644061c0a5dacc336a437e (diff) | |
- 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
Diffstat (limited to 'plugins/mgcp')
| -rw-r--r-- | plugins/mgcp/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/mgcp/packet-mgcp.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/plugins/mgcp/Makefile.am b/plugins/mgcp/Makefile.am index ee47098c76..3683b24ec2 100644 --- a/plugins/mgcp/Makefile.am +++ b/plugins/mgcp/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal/MGCP # -# $Id: Makefile.am,v 1.6 2003/03/07 04:13:26 gerald Exp $ +# $Id: Makefile.am,v 1.7 2003/09/05 07:44:49 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ mgcp_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -mgcp_la_DEPENDENCIES = packet-mgcp-static.o - -packet-mgcp-static.o: packet-mgcp.c moduleinfo.h - $(LTCOMPILE) -c -o packet-mgcp-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-mgcp.c - CLEANFILES = \ mgcp \ *~ diff --git a/plugins/mgcp/packet-mgcp.c b/plugins/mgcp/packet-mgcp.c index b3fcd2875b..86eab58383 100644 --- a/plugins/mgcp/packet-mgcp.c +++ b/plugins/mgcp/packet-mgcp.c @@ -2,7 +2,7 @@ * Routines for mgcp packet disassembly * RFC 2705 * - * $Id: packet-mgcp.c,v 1.41 2003/09/02 21:26:22 guy Exp $ + * $Id: packet-mgcp.c,v 1.42 2003/09/05 07:44:49 jmayer Exp $ * * Copyright (c) 2000 by Ed Warnicke <hagbard@physics.rutgers.edu> * @@ -48,7 +48,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -1531,7 +1531,7 @@ static gint tvb_find_dot_line(tvbuff_t* tvb, gint offset, /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ |