From 3a74228808b0fb5e03d85fefc9ea6e636ed95979 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Wed, 4 Nov 1998 05:36:35 +0000
Subject: [PATCH] Another fix for parallel builds and checked in generated
 files.

---
 htmlparser/src/Makefile.in        | 22 ++++++++++++----------
 parser/htmlparser/src/Makefile.in | 22 ++++++++++++----------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/htmlparser/src/Makefile.in b/htmlparser/src/Makefile.in
index c262d0ce0b7..4b4faf5ebcd 100644
--- a/htmlparser/src/Makefile.in
+++ b/htmlparser/src/Makefile.in
@@ -22,6 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+include $(topsrcdir)/config/config.mk
+
 LIBRARY_NAME = raptorhtmlpars
 
 DEFINES += -D_IMPL_NS_HTMLPARS
@@ -73,42 +75,42 @@ EXPORTS =     \
   nsParserCIID.h \
   $(NULL)
 
+EXTRA_EXPORTS = \
+	$(OBJDIR)/nsHTMLTags.h \
+	$(NULL)
+
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_EXPORTS =					\
-	$(OBJDIR)/nsHTMLTags.h				\
-	$(NULL)
+EXPORTS += $(EXTRA_EXPORTS)
 
 MODULE = raptor
 
 REQUIRES = xpcom netlib raptor
 
-include $(topsrcdir)/config/config.mk
-
 GARBAGE	+= $(OBJDIR)/nsHTMLTags.h $(OBJDIR)/nsHTMLTags.cpp $(OBJDIR)/nsHTMLEntities.cpp
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I.
 
-export:: removecheckedinkludge generate
+export:: generate
 	$(INSTALL) $(EXTRA_EXPORTS) $(PUBLIC)/$(MODULE)
 
 # Why are generated files being checked in?
 removecheckedinkludge:
-	@rm -f $(srcdir)/nsHTMLTags.h $(srcdir)/nsHTMLEntities.cpp
+	rm -f $(srcdir)/nsHTMLTags.h $(srcdir)/nsHTMLEntities.cpp
  
-generate: removecheckedinkludge $(OBJDIR)/nsHTMLTags.h $(OBJDIR)/nsHTMLEntities.cpp
+generate: $(OBJDIR)/nsHTMLTags.h $(OBJDIR)/nsHTMLEntities.cpp
 
 $(OBJDIR)/nsHTMLTags.o: $(OBJDIR)/nsHTMLTags.h
 
 GENTAGS = $(topsrcdir)/htmlparser/tools/gentags.pl
 GENENTITIES = $(topsrcdir)/htmlparser/tools/genentities.pl
 
-$(OBJDIR)/nsHTMLTags.h: $(GENTAGS)
+$(OBJDIR)/nsHTMLTags.h: removecheckedinkludge $(GENTAGS)
 	rm -f $@
 	$(PERL) $(GENTAGS) nsHTMLTags
 
-$(OBJDIR)/nsHTMLEntities.cpp: $(GENENTITIES)
+$(OBJDIR)/nsHTMLEntities.cpp: removecheckedinkludge $(GENENTITIES)
 	rm -f $@
 	$(PERL) $(GENENTITIES) nsHTMLEntities
diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in
index c262d0ce0b7..4b4faf5ebcd 100644
--- a/parser/htmlparser/src/Makefile.in
+++ b/parser/htmlparser/src/Makefile.in
@@ -22,6 +22,8 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+include $(topsrcdir)/config/config.mk
+
 LIBRARY_NAME = raptorhtmlpars
 
 DEFINES += -D_IMPL_NS_HTMLPARS
@@ -73,42 +75,42 @@ EXPORTS =     \
   nsParserCIID.h \
   $(NULL)
 
+EXTRA_EXPORTS = \
+	$(OBJDIR)/nsHTMLTags.h \
+	$(NULL)
+
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_EXPORTS =					\
-	$(OBJDIR)/nsHTMLTags.h				\
-	$(NULL)
+EXPORTS += $(EXTRA_EXPORTS)
 
 MODULE = raptor
 
 REQUIRES = xpcom netlib raptor
 
-include $(topsrcdir)/config/config.mk
-
 GARBAGE	+= $(OBJDIR)/nsHTMLTags.h $(OBJDIR)/nsHTMLTags.cpp $(OBJDIR)/nsHTMLEntities.cpp
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += -I.
 
-export:: removecheckedinkludge generate
+export:: generate
 	$(INSTALL) $(EXTRA_EXPORTS) $(PUBLIC)/$(MODULE)
 
 # Why are generated files being checked in?
 removecheckedinkludge:
-	@rm -f $(srcdir)/nsHTMLTags.h $(srcdir)/nsHTMLEntities.cpp
+	rm -f $(srcdir)/nsHTMLTags.h $(srcdir)/nsHTMLEntities.cpp
  
-generate: removecheckedinkludge $(OBJDIR)/nsHTMLTags.h $(OBJDIR)/nsHTMLEntities.cpp
+generate: $(OBJDIR)/nsHTMLTags.h $(OBJDIR)/nsHTMLEntities.cpp
 
 $(OBJDIR)/nsHTMLTags.o: $(OBJDIR)/nsHTMLTags.h
 
 GENTAGS = $(topsrcdir)/htmlparser/tools/gentags.pl
 GENENTITIES = $(topsrcdir)/htmlparser/tools/genentities.pl
 
-$(OBJDIR)/nsHTMLTags.h: $(GENTAGS)
+$(OBJDIR)/nsHTMLTags.h: removecheckedinkludge $(GENTAGS)
 	rm -f $@
 	$(PERL) $(GENTAGS) nsHTMLTags
 
-$(OBJDIR)/nsHTMLEntities.cpp: $(GENENTITIES)
+$(OBJDIR)/nsHTMLEntities.cpp: removecheckedinkludge $(GENENTITIES)
 	rm -f $@
 	$(PERL) $(GENENTITIES) nsHTMLEntities