Support for the new, single dist/include directory mechanism.

cmd/xfe/src/Makefile

@@ -1,4 +1,3 @@
-#! gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
@@ -65,8 +64,7 @@ REQUIRES	=\
 			caps
 
 ifdef OJI
-REQUIRES +=	  oji \
-		  ojiimpl
+REQUIRES	+= oji ojiimpl
 endif
 
 ifdef MOZ_MAIL_NEWS
@@ -324,7 +322,7 @@ INCLUDES	+= -I$(OBJDIR) -I.. -I../DtWidgets -I$(DEPTH)/modules/libreg/include \
 		-I$(DEPTH)/dist/public/security
 
 ifdef MOZ_MAIL_NEWS
-INCLUDES	+= -I$(DEPTH)/lib/libmsg  -I$(DEPTH)/dist/public/ldap
+INCLUDES	+= -I$(DEPTH)/lib/libmsg
 endif
 
 DEFINES		+= -DNEW_DECODERS -DDELAYED_MENU_CREATION -DNETCASTER_ZAXIS_HACKERY

config/config.mk

@@ -295,14 +295,13 @@ endif
 # be put in the library directories where it belongs so that it can
 # get exported to dist properly.
 #
-INCLUDES	= $(LOCAL_PREINCLUDES) $(MODULE_PREINCLUDES) -I$(topsrcdir)/include $(LOCAL_INCLUDES) $(OS_INCLUDES) $(G++INCLUDES)
+INCLUDES	= $(LOCAL_INCLUDES) -I$(DIST)/include -I$(XPDIST)/include -I$(topsrcdir)/include $(OS_INCLUDES) $(G++INCLUDES)
 
 LIBNT		= $(DIST)/lib/libnt.$(LIB_SUFFIX)
 LIBAWT		= $(DIST)/lib/libawt.$(LIB_SUFFIX)
 LIBMMEDIA	= $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
 
 NSPRDIR		= nsprpub
-INCLUDES	+= -I$(DIST)/include
 LIBNSPR		= $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX)
 PURELIBNSPR	= $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX)
 

config/rules.mk

@@ -150,10 +150,6 @@ endif
 
 OBJS			:= $(addprefix $(OBJDIR)/, $(OBJS))
 
-ifdef REQUIRES
-MODULE_PREINCLUDES	= $(addprefix -I$(XPDIST)/public/, $(REQUIRES))
-endif
-
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 ifdef DLL
 DLL			:= $(addprefix $(OBJDIR)/, $(DLL))
@@ -493,6 +489,8 @@ $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE) $(JMCSRCDIR)::
 		echo Creating $@;	\
 		rm -rf $@;		\
 		$(NSINSTALL) -D $@;	\
+	else				\
+		true;			\
 	fi
 
 ################################################################################
@@ -719,15 +717,15 @@ endif
 # Copy each element of EXPORTS to $(XPDIST)/public/$(MODULE)/
 #
 ifneq ($(EXPORTS),)
-$(XPDIST)/public/$(MODULE)::
-	@if test ! -d $@; then	    \
-		echo Creating $@;   \
-		rm -rf $@;	    \
-		$(NSINSTALL) -D $@; \
-	fi
+$(XPDIST)/include$(INCL_SUBDIR)::
+	@if test ! -d $@; then echo Creating $@; rm -rf $@; $(NSINSTALL) -D $@; else true; fi
 
-export:: $(EXPORTS) $(XPDIST)/public/$(MODULE)
-	$(INSTALL) -m 444 $(EXPORTS) $(XPDIST)/public/$(MODULE)
+#
+# INCL_SUBDIR is used for special cases like XfeWidgets/* where the
+# headers are expected to live in subdirs.
+#
+export:: $(EXPORTS) $(XPDIST)/include$(INCL_SUBDIR)
+	$(INSTALL) -m 444 $^
 endif
 
 ################################################################################