diff options
author | Guy Harris <guy@alum.mit.edu> | 2003-12-17 07:02:12 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2003-12-17 07:02:12 +0000 |
commit | c91e87c84b4c16e2c1934d32ec279ac057c60646 (patch) | |
tree | eff9efbfab9151bdeea1cea67a71bfb7ef76998a /plugins | |
parent | 2df96b563e681402e25dad55b7d68a769ff26a39 (diff) |
Make Makefile.am and Makefile.nmake match those for other plugins.
svn path=/trunk/; revision=9312
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/v5ua/Makefile.am | 9 | ||||
-rw-r--r-- | plugins/v5ua/Makefile.nmake | 16 |
2 files changed, 11 insertions, 14 deletions
diff --git a/plugins/v5ua/Makefile.am b/plugins/v5ua/Makefile.am index ff5c36b8bb..0ea00f5c48 100644 --- a/plugins/v5ua/Makefile.am +++ b/plugins/v5ua/Makefile.am @@ -1,5 +1,7 @@ # Makefile.am -# Automake file for Megaco Ethereal plugin +# Automake file for V5UA plugin +# +# $Id: Makefile.am,v 1.2 2003/12/17 07:02:12 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -33,11 +35,6 @@ v5ua_la_LDFLAGS = -module -avoid-version # add them here. LIBS = -v5ua_la_DEPENDENCIES = packet-v5ua-static.o - -packet-v5ua-static.o: packet-v5ua.c moduleinfo.h - $(LTCOMPILE) -c -o packet-v5ua-static.o -D__ETHEREAL_STATIC__ $(srcdir)/packet-v5ua.c - CLEANFILES = \ v5ua \ *~ diff --git a/plugins/v5ua/Makefile.nmake b/plugins/v5ua/Makefile.nmake index b8af0a3a55..22f8dd7733 100644 --- a/plugins/v5ua/Makefile.nmake +++ b/plugins/v5ua/Makefile.nmake @@ -1,21 +1,21 @@ # -# $Id: Makefile.nmake,v 1.1 2003/12/17 05:16:21 guy Exp $ +# $Id: Makefile.nmake,v 1.2 2003/12/17 07:02:12 guy Exp $ # include ..\..\config.nmake ############### no need to modify below this line ######### -CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \ - /I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \ - /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \ +CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \ /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS) -OBJECTS=packet-v5ua_n.obj +OBJECTS=packet-v5ua.obj -v5ua_n.dll v5ua.exp v5ua.lib : packet-v5ua.obj ..\plugin_api.obj - link -dll /out:v5ua.dll packet-v5ua.obj ..\plugin_api.obj \ - $(GLIB_DIR)\glib-$(GLIB_VERSION).lib +v5ua.dll v5ua.exp v5ua.lib : $(OBJECTS) ..\plugin_api.obj + link -dll /out:v5ua.dll $(OBJECTS) ..\plugin_api.obj \ + $(GLIB_LIBS) clean: rm -f $(OBJECTS) v5ua.dll v5ua.exp v5ua.lib $(PDB_FILE) + +distclean: clean |