Add stats_tree and xml plugins to the build process

svn path=/trunk/; revision=13629

diff --git a/configure.in b/configure.in
index 79192d39463b98bfadad3be56169d5885708036d..b36ad58eb9bb39e1d549e6c22188507770c91004 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1270,7 +1270,9 @@ AC_OUTPUT(
   plugins/rlm/Makefile
   plugins/rtnet/Makefile
   plugins/rudp/Makefile
+  plugins/stats_tree/Makefile
   plugins/v5ua/Makefile
+  plugins/xml/Makefile
   tools/Makefile
   tools/lemon/Makefile
   ,)

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index add61bfc94471cc3656f928d83fb5b478d524c79..77c75713202fec6075f9a41ae0724658f21ffa1a 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SUBDIRS = acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp opsi pcli rdm rlm rtnet rudp v5ua
+SUBDIRS = acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp opsi pcli rdm rlm rtnet rudp stats_tree v5ua xml
 
 plugindir = @plugindir@
 

diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index af189888997aa7e2530777b1b1847c715dd93dfb..56f9e3ecf87d8fcde0ed97660f88ea0c0a6e0151 100644 (file)
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -11,7 +11,7 @@ CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. $(GLIB_CFLAGS) \
 
 OBJECTS=plugin_api.obj 
 
-all: $(OBJECTS) acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp opsi pcli rdm rlm rtnet rudp v5ua
+all: $(OBJECTS) acn agentx artnet asn1 ciscosm docsis enttec giop gryphon irda lwres mate megaco mgcp opsi pcli rdm rlm rtnet rudp stats_tree v5ua xml
 
 Xplugin_api.c: plugin_gen.py plugin_api_list.c
        @echo **** Plugin api may be out of date, please generate new files:
@@ -127,11 +127,21 @@ rudp::
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
 
+stats_tree:: 
+       cd stats_tree
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+       cd ..
+
 v5ua:: 
        cd v5ua
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
        cd ..
 
+xml:: 
+       cd xml
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
+       cd ..
+
 clean:
        rm -f plugin_api.obj $(PDB_FILE)
        cd acn
@@ -174,8 +184,12 @@ clean:
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../rudp
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ../stats_tree
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ../v5ua
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
+       cd ../xml
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
        cd ..
 
 distclean: clean
@@ -219,8 +233,12 @@ distclean: clean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../rudp
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       cd ../stats_tree
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ../v5ua
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       cd ../xml
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
        cd ..
 
 maintainer-clean: distclean
@@ -264,6 +282,10 @@ maintainer-clean: distclean
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ../rudp
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../stats_tree
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ../v5ua
        $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
+       cd ../xml
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
        cd ..

diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am
index 59dbc8ed8eb3c6705262b168f1f174cca4ab40ae..50a1301ed91738a499c273d478de6ab531fbe8f6 100644 (file)
--- a/plugins/stats_tree/Makefile.am
+++ b/plugins/stats_tree/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES = -I$(top_srcdir)
 plugindir = @plugindir@
 
 plugin_LTLIBRARIES = stats_tree.la
-stats_tree_la_SOURCES = pinfo_stats_tree.c http_stats_tree.c stats_tree_plugin.c
+stats_tree_la_SOURCES = http_stats_tree.c stats_tree_plugin.c
 stats_tree_la_LDFLAGS = -module -avoid-version
 stats_tree_la_LIBADD = @PLUGIN_LIBS@
 

diff --git a/plugins/stats_tree/Makefile.nmake b/plugins/stats_tree/Makefile.nmake
new file mode 100644 (file)
index 0000000..899a4fb
--- /dev/null
+++ b/plugins/stats_tree/Makefile.nmake
@@ -0,0 +1,36 @@
+#
+# $Id:  $
+#
+
+include ..\..\config.nmake
+include <win32.mak>
+
+############### no need to modify below this line #########
+
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
+       /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+       
+.c.obj::
+       $(CC) $(CFLAGS) -Fdstats_tree.pdb -c $<
+       
+LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
+
+!IFDEF LINK_PLUGINS_WITH_LIBETHEREAL
+LINK_PLUGIN_WITH=..\..\epan\libethereal.lib
+CFLAGS=/DHAVE_WIN32_LIBETHEREAL_LIB /D_NEED_VAR_IMPORT_ $(CFLAGS)
+!ELSE
+LINK_PLUGIN_WITH=..\plugin_api.obj
+!ENDIF
+
+OBJECTS=http_stats_tree.obj stats_tree_plugin.obj
+
+stats_tree.dll stats_tree.exp stats_tree.lib : $(OBJECTS) $(LINK_PLUGIN_WITH)
+       link -dll /out:stats_tree.dll $(LDFLAGS) $(OBJECTS) $(LINK_PLUGIN_WITH) \
+       $(GLIB_LIBS)
+
+clean:
+       rm -f $(OBJECTS) stats_tree.dll stats_tree.exp mate.lib *.pdb
+
+distclean: clean
+
+maintainer-clean: distclean