Move the dissectors into libethereal (no static/shared lib changes):

- Create epan/Makefile.common
- Move dissector_src and helper files from Makefile.common to
  epan/Makefile.common
- Create register.c in epan/
- link all the files into libethereal
- put plugin_src into epan/Makefile.am

Try to make rpms build with rpm v4 again (sorry, I've forgotten who to
attribute this to).


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

1 files changed, 3 insertions, 44 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 5859a8c545..a084d72322 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.407 2004/02/23 22:45:24 gerald Exp $
+# $Id: Makefile.nmake,v 1.408 2004/03/02 01:21:56 jmayer Exp $
 
 include config.nmake
 include <win32.mak>
@@ -21,7 +21,7 @@ CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GLIB_CFLAGS) /I. /Iwiretap \
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
 .c.obj::
-   $(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
+	$(CC) $(CVARSDLL) $(CFLAGS) -Fd.\ -c $<
 
 PLATFORM_SRC = capture-wpcap.c
 
@@ -212,47 +212,6 @@ packet-ncp2222.c : ncp2222.py
 !ENDIF
 
 #
-# Build "register.c", which contains a function "register_all_protocols()"
-# that calls the register routines for all protocols.
-#
-# We do this by grepping through sources.  If that turns out to be too slow,
-# maybe we could just require every .o file to have an register routine
-# of a given name (packet-aarp.o -> proto_register_aarp, etc.).
-#
-# Formatting conventions:  The name of the proto_register_* routines must
-# start in column zero, or must be preceded only by "void " starting in
-# column zero, and must not be inside #if.
-#
-# We assume that all dissector routines are in "packet-XXX.c" files.
-#
-# For some unknown reason, having a big "for" loop in the Makefile
-# to scan all the "packet-XXX.c" files doesn't work with some "make"s;
-# they seem to pass only the first few names in the list to the shell,
-# for some reason.
-#
-# Therefore, we have a script to generate the "register.c" file.
-#
-# The first argument is the name of the file to write.
-# The second argument is the directory in which the source files live.
-# All subsequent arguments are the files to scan.
-#
-# On Windows, however, that script runs slowly, as multiple greps
-# and seds are run for each input file, so, if Python is present
-# (as indicated by PYTHON being defined), we run a faster Python
-# script to do that work instead.  That script doesn't take the name
-# of the file to write as an argument; it always writes to
-# "register.c".
-#
-register.c: $(DISSECTOR_SRC)
-!IFDEF PYTHON
-	@echo Making register.c (using python)
-	@$(PYTHON) make-reg-dotc.py . $(DISSECTOR_SRC)
-!ELSE
-	@echo Making register.c (using sh)
-	@$(SH) make-reg-dotc register.c . $(DISSECTOR_SRC)
-!ENDIF
-
-#
 # Build "tethereal-tap-register.c", which contains a function 
 # "register_all_tap_listeners()"
 # that calls the register routines for all tehtereal tap listeners.
@@ -310,7 +269,7 @@ clean: gtk2_distclean
 # Be sure to have python and perl installed to regenerate them.
 distclean: clean gtk2_distclean
 	rm -f $(BUILT_SOURCES) \
-		packet-ncp2222.c register.c tethereal-tap-register.c 
+		packet-ncp2222.c tethereal-tap-register.c 
 	cd wiretap
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../gtk