From J.C. Wren (and Bill Meier): Updates to reflect current makefiles & etc

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24271 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/doc/README.plugins b/doc/README.plugins
index c7ee925b7eafc8df14b5782175171dce57373a9a..d40c7c6a08d75eeb60c2f0b0f43a1b6e2a6880af 100644 (file)
--- a/doc/README.plugins
+++ b/doc/README.plugins
@@ -90,70 +90,25 @@ SUBDIRS = \
        irda \
        xxx
 
-
 3.2 Changes to plugins/Makefile.nmake
 
-To the Makefile.nmake you need to add your plugin to the all: rule
-
-all: \
-       gryphon \
-       irda \
-       xxx
-
-then add a rule for your plugin:
-
-xxx:
-       cd xxx
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-       cd ..
-
-and add to the clean rules support for cleaning up after your
-plugin:
-
-clean:  clean-local
-       cd gryphon
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-       cd ..
-       cd irda
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-       cd ..
-       cd xxx
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-       cd ..
-
+To the Makefile.nmake you need to add the following (in
+alphabetical order) for your plugin to the process-plugins: rule
 
-distclean: distclean-local
-       cd gryphon
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
-       cd ..
-       cd irda
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
-       cd ..
        cd xxx
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake $(PLUGIN_TARGET)
        cd ..
 
+Then add a copy command to the install-plugins rule:
 
-maintainer-clean: maintainer-clean-local
-       cd gryphon
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-       cd ..
-       cd irda
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-       cd ..
-       cd xxx
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-       cd ..
-
-Finally add a copy command to install-plugins rule:
-
-        xcopy irda\*.dll $(VERSION) /d
-        xcopy xxx\*.dll $(VERSION) /d
+       ...
+       xcopy xxx\*.dll $(VERSION) /d
+       if exist Custom.nmake $(MAKE) /$(MAKEFLAGS) -f Custom.nmake install-plugins
 
 3.3 Changes to the top level Makefile.nmake
 
-To the top level Makefile.nmake you need to add your plugin to the
-install-common-files: rule
+To the top level Makefile.nmake you need to add your plugin (in alphabetical order)
+to the install-common-files: rule
 
        xcopy ".\plugins\gryphon\gryphon.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
        xcopy ".\plugins\irda\irda.dll" $(INSTALL_DIR)\plugins\$(VERSION) /d
@@ -161,25 +116,14 @@ install-common-files: rule
 
 3.4 Changes to the top level Makefile.am
 
-There are several places in the top level Makefile.am that need to be
-altered for adding a plugin.
-
-Add your plugin to the plugin_libs and plugin_ldadd:
-
-plugin_libs = \
-        plugins/gryphon/gryphon.la \
-        plugins/irda/irda.la    \
-        plugins/xxx/xxx.la
+Add your plugin (in alphabetical order) to the plugin_ldadd:
 
-if ENABLE_STATIC
-plugin_ldadd = (plugin_libs)
+if HAVE_PLUGINS
 
-else          # ENABLE_STATIC
 plugin_ldadd = \
-        "-dlopen" self  \
-        "-dlopen" plugins/gryphon/gryphon.la \
-        "-dlopen" plugins/irda/irda.la \
-        "-dlopen" plugins/xxx/xxx.la
+       ...
+       -dlopen plugins/xxx/xxx.la      \
+       -dlopen plugins/wimax/wimax.la
 
 3.5  Changes to top level configure.in