aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/asn1
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-09-29 19:30:10 +0000
committerGuy Harris <guy@alum.mit.edu>2004-09-29 19:30:10 +0000
commit444119dbcb8228e5a47b6e00f7932aa04759b13d (patch)
tree6503a9fd9f6fe04381549206152314fc9dd5454b /plugins/asn1
parent28a6169ff7a93618819a83dd03695b8f8d41f8a8 (diff)
From Lars Roland: add an option to link plugins with libethereal rather
than using the plugin address table. svn path=/trunk/; revision=12139
Diffstat (limited to 'plugins/asn1')
-rw-r--r--plugins/asn1/Makefile.nmake13
1 files changed, 11 insertions, 2 deletions
diff --git a/plugins/asn1/Makefile.nmake b/plugins/asn1/Makefile.nmake
index 02bc5b4b26..62cd2584f8 100644
--- a/plugins/asn1/Makefile.nmake
+++ b/plugins/asn1/Makefile.nmake
@@ -9,10 +9,19 @@ include ..\..\config.nmake
CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+
+!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB $(CFLAGS)
+!ELSE
+LINK_PLUGIN_WITH=..\plugin_api.obj
+!ENDIF
+
OBJECTS=packet-asn1.obj
-asn1.dll asn1.exp asn1.lib : $(OBJECTS) ..\plugin_api.obj
- link -dll /out:asn1.dll $(OBJECTS) ..\plugin_api.obj \
+asn1.dll asn1.exp asn1.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
+ link -dll /out:asn1.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
$(GLIB_LIBS)
clean: