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/giop | |
| 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/giop')
| -rw-r--r-- | plugins/giop/Makefile.am | 12 | ||||
| -rw-r--r-- | plugins/giop/packet-coseventcomm.c | 4 | ||||
| -rw-r--r-- | plugins/giop/packet-cosnaming.c | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/plugins/giop/Makefile.am b/plugins/giop/Makefile.am index d6475a9cda..b10949959e 100644 --- a/plugins/giop/Makefile.am +++ b/plugins/giop/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal/GIOP subdissectors # -# $Id: Makefile.am,v 1.3 2002/07/06 20:40:46 guy Exp $ +# $Id: Makefile.am,v 1.4 2003/09/05 07:44:45 jmayer Exp $ # # Copyright 2001, Ericsson Inc. # Frank Singleton <frank.singleton@ericsson.com> @@ -42,16 +42,6 @@ coseventcomm_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -cosnaming_la_DEPENDENCIES = packet-cosnaming-static.o -coseventcomm_la_DEPENDENCIES = packet-coseventcomm-static.o - -packet-cosnaming-static.o: packet-cosnaming.c moduleinfo.h - $(LTCOMPILE) -c -o packet-cosnaming-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-cosnaming.c - -packet-coseventcomm-static.o: packet-coseventcomm.c moduleinfo.h - $(LTCOMPILE) -c -o packet-coseventcomm-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-coseventcomm.c - - CLEANFILES = \ cosnaming \ coseventcomm \ diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index 161f8672dd..fc41bfab5e 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -49,7 +49,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif @@ -860,7 +860,7 @@ void proto_register_handoff_giop_coseventcomm(void) { -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index 1774ac6036..b8e90e935f 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -49,7 +49,7 @@ #include "plugins/plugin_api_defs.h" -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT const gchar version[] = "0.0.1"; #endif @@ -1738,7 +1738,7 @@ void proto_register_handoff_giop_cosnaming(void) { -#ifndef __ETHEREAL_STATIC__ +#ifndef ENABLE_STATIC G_MODULE_EXPORT void plugin_reg_handoff(void){ |