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/artnet | |
| parent | dd2080a64633a1fd43644061c0a5dacc336a437e (diff) | |
| download | wireshark-10b364c56dea8b351fd7150b17ec5786f441cff6.tar.gz | |
- 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/artnet')
| -rw-r--r-- | plugins/artnet/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/artnet/packet-artnet.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/plugins/artnet/Makefile.am b/plugins/artnet/Makefile.am index f75e9dd70f..be5371857f 100644 --- a/plugins/artnet/Makefile.am +++ b/plugins/artnet/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal/ArtNET # -# $Id: Makefile.am,v 1.1 2003/04/21 21:28:39 guy Exp $ +# $Id: Makefile.am,v 1.2 2003/09/05 07:44:44 jmayer Exp $ # # Ethereal - Network traffic analyzer # By Steve Limkemann <stevelim@dgtech.com> @@ -36,11 +36,6 @@ artnet_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -artnet_la_DEPENDENCIES = packet-artnet-static.o - -packet-artnet-static.o: packet-artnet.c moduleinfo.h - $(LTCOMPILE) -c -o packet-artnet-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-artnet.c - CLEANFILES = \ artnet \ *~ diff --git a/plugins/artnet/packet-artnet.c b/plugins/artnet/packet-artnet.c index a5ec14c20e..5b176a5e55 100644 --- a/plugins/artnet/packet-artnet.c +++ b/plugins/artnet/packet-artnet.c @@ -1,7 +1,7 @@ /* packet-artnet.c * Routines for Art-Net packet disassembly * - * $Id: packet-artnet.c,v 1.3 2003/08/24 01:44:00 sahlberg Exp $ + * $Id: packet-artnet.c,v 1.4 2003/09/05 07:44:45 jmayer Exp $ * * Copyright (c) 2003 by Erwin Rol <erwin@erwinrol.com> * @@ -49,7 +49,7 @@ /* Define version if we are not building ethereal statically */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = VERSION; #endif @@ -2591,7 +2591,7 @@ proto_reg_handoff_artnet(void) { /* Start the functions we need for the plugin stuff */ -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ |