Ethereal-dev: [Ethereal-dev] fix for distclean in nmake makefiles

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Lars Roland <[email protected]>
Date: Tue, 27 Jul 2004 11:51:51 +0200
Hello all,

Attached is a small patch to make distclean work correctly.
Please check in.

Regards,
Lars
Index: trunk/epan/Makefile.nmake
===================================================================
--- trunk/epan/Makefile.nmake	(revision 11527)
+++ trunk/epan/Makefile.nmake	(working copy)
@@ -83,7 +83,7 @@
 #DISSECTOR_SUPPORT_OBJECTS = $(DISSECTOR_SUPPORT_OBJECTS:../=)
 
 libethereal.dll: ..\config.h $(OBJECTS) libethereal.def ftypes dfilter dissectors $(DISSECTOR_SUPPORT_OBJECTS) doxygen $(EXTRA_OBJECTS) ..\image\libethereal.res
-	echo libethereal.dll
+	@echo Linking libethereal.dll
 	$(link) $(dlllflags) $(conlibsdll) \
 		$(LOCAL_LDFLAGS) \
 		/DEF:libethereal.def /OUT:libethereal.dll \
@@ -116,6 +116,8 @@
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ../dfilter
 	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
+	cd ../dissectors
+	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
 	cd ..
 
 ftypes:: ..\config.h
Index: trunk/epan/dissectors/Makefile.nmake
===================================================================
--- trunk/epan/dissectors/Makefile.nmake	(revision 11527)
+++ trunk/epan/dissectors/Makefile.nmake	(working copy)
@@ -99,5 +99,4 @@
 		$(DISSECTOR_OBJECTS) $(DISSECTOR_SUPPORT_OBJECTS)
 
 distclean: clean
-	rm -f $(BUILT_SOURCES) packet-ncp2222.c \
-		register.c x11-declarations.h x11-register-info.h
+	rm -f $(BUILT_SOURCES) packet-ncp2222.c