From 1b6455c0ffa1fc81eb08346eac117d51ec4e12b5 Mon Sep 17 00:00:00 2001 From: "mccabe%netscape.com" Date: Sat, 8 May 1999 01:57:37 +0000 Subject: [PATCH] Build xpidl before export phase of any xpcom directory. git-svn-id: svn://10.0.0.236/trunk@30805 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/Makefile.in | 5 ++++- mozilla/xpcom/libxpt/Makefile.in | 3 ++- mozilla/xpcom/libxpt/makefile.win | 5 ++++- mozilla/xpcom/makefile.win | 5 ++++- mozilla/xpcom/typelib/xpt/Makefile.in | 3 ++- mozilla/xpcom/typelib/xpt/makefile.win | 5 ++++- 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/mozilla/xpcom/Makefile.in b/mozilla/xpcom/Makefile.in index e973d81d541..994aaef6924 100644 --- a/mozilla/xpcom/Makefile.in +++ b/mozilla/xpcom/Makefile.in @@ -21,7 +21,10 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = public src idl libxpt tools +# Build xpidl first, so it's available to process idl. +# Explicitly recur into libxpt/xptinfo and libxpt/xptcall, +# as they depend on xpidl and can't be in the DIRS for libxpt. +DIRS = libxpt tools/xpidl public src idl libxpt/xptinfo libxpt/xptcall ifdef ENABLE_TESTS DIRS += tests diff --git a/mozilla/xpcom/libxpt/Makefile.in b/mozilla/xpcom/libxpt/Makefile.in index 4772170d9d9..12a95905ad4 100644 --- a/mozilla/xpcom/libxpt/Makefile.in +++ b/mozilla/xpcom/libxpt/Makefile.in @@ -27,6 +27,7 @@ DIRS += tests DIRS += tools -DIRS += xptinfo xptcall +# Don't recur into xptinfo and xptcall, because they may require xpidl, +# which hasn't been built yet. They'll be called from the xpcom makefile. include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/libxpt/makefile.win b/mozilla/xpcom/libxpt/makefile.win index f01ec8c54dc..90df92cf5f9 100644 --- a/mozilla/xpcom/libxpt/makefile.win +++ b/mozilla/xpcom/libxpt/makefile.win @@ -16,6 +16,9 @@ DEPTH=..\.. IGNORE_MANIFEST=1 -DIRS=public src tests tools xptinfo xptcall + +# Don't recur into xptinfo and xptcall, because they may require xpidl, +# which hasn't been built yet. They'll be called from the xpcom makefile. +DIRS=public src tests tools include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/makefile.win b/mozilla/xpcom/makefile.win index 1e43b4ec159..ede5d12c6b8 100644 --- a/mozilla/xpcom/makefile.win +++ b/mozilla/xpcom/makefile.win @@ -19,6 +19,9 @@ DEPTH=.. IGNORE_MANIFEST=1 -DIRS=libxpt tools public src tests +# Build xpidl first, so it's available to process idl. +# Explicitly recur into libxpt/xptinfo and libxpt/xptcall, +# as they depend on xpidl and can't be in the DIRS for libxpt. +DIRS=libxpt tools\xpidl public src libxpt\xptinfo libxpt\xptcall tests include <$(DEPTH)\config\rules.mak> diff --git a/mozilla/xpcom/typelib/xpt/Makefile.in b/mozilla/xpcom/typelib/xpt/Makefile.in index 4772170d9d9..12a95905ad4 100644 --- a/mozilla/xpcom/typelib/xpt/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/Makefile.in @@ -27,6 +27,7 @@ DIRS += tests DIRS += tools -DIRS += xptinfo xptcall +# Don't recur into xptinfo and xptcall, because they may require xpidl, +# which hasn't been built yet. They'll be called from the xpcom makefile. include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/typelib/xpt/makefile.win b/mozilla/xpcom/typelib/xpt/makefile.win index f01ec8c54dc..90df92cf5f9 100644 --- a/mozilla/xpcom/typelib/xpt/makefile.win +++ b/mozilla/xpcom/typelib/xpt/makefile.win @@ -16,6 +16,9 @@ DEPTH=..\.. IGNORE_MANIFEST=1 -DIRS=public src tests tools xptinfo xptcall + +# Don't recur into xptinfo and xptcall, because they may require xpidl, +# which hasn't been built yet. They'll be called from the xpcom makefile. +DIRS=public src tests tools include <$(DEPTH)\config\rules.mak>