Use default EXPORTS rules instead of installing headers by hand.

Bug #98371 sr=alecf

config/makefile.win

@@ -49,6 +49,8 @@ GARBAGE = *.obj *.sbr *.pdb build_number nsBuildID.h
 GARBAGE = $(GARBAGE) trace.dll trace.lib trace.exp
 !endif
 
+EXPORTS	= nsBuildID.h
+
 #//------------------------------------------------------------------------
 #//
 #// Include the common makefile rules
@@ -119,7 +121,6 @@ export:: \
         trace.dll     \
 !endif
         $(NULL)
-       $(MAKE_INSTALL) nsBuildID.h $(PUBLIC)
 !ifdef MOZ_COVERAGE
        $(MAKE_INSTALL) trace.dll $(DIST)/bin
        $(MAKE_INSTALL) trace.lib $(DIST)/lib

js/src/liveconnect/makefile.win

@@ -111,12 +111,7 @@ OBJS=                                       \
 #// install headers
 #//
 #//------------------------------------------------------------------------
-!ifdef MOZ_TRACK_MODULE_DEPS
-INSTALL_DIR=$(XPDIST)\include\$(MODULE)
-!else
-INSTALL_DIR=$(XPDIST)\include
-!endif
-INSTALL_FILE_LIST=	\
+EXPORTS =	\
 	jsjava.h \
 !ifdef MOZ_OJI
  nsILiveconnect.h \
@@ -139,7 +134,7 @@ JNI_GEN=                            \
 
 !endif
 
-EXPORTS =				       \
+EXPORTS =	$(EXPORTS)			       \
 	$(JNI_GEN_DIR)\netscape_javascript_JSObject.h    \
 	$(NULL)
 
@@ -152,11 +147,6 @@ EXPORTS =				       \
 #//------------------------------------------------------------------------
 
 LINCS=$(LINCS) -I$(JNI_GEN_DIR) \
-               -I$(PUBLIC)\js \
-               -I$(PUBLIC)\java \
-!ifdef MOZ_OJI
-               -I$(PUBLIC)\xpcom \
-!endif
 	$(NULL)
 
 
@@ -171,8 +161,6 @@ LINCS=$(LINCS) -I$(JNI_GEN_DIR) \
 #//------------------------------------------------------------------------
 include <$(DEPTH)/config/rules.mak>
 
-export::  INSTALL_FILES
-
 ####
 # this bit of extreme scariness came from the js/src makefile
 #  reproduced here since that's where jsjava.c lives now...

js/src/makefile.win

@@ -67,9 +67,9 @@ DLL		=.\$(OBJDIR)\$(DLLNAME).dll
 MAKE_OBJ_TYPE	= DLL
 
 !if "$(MOZ_BITS)" != "16"
-LINCS = -I$(PUBLIC)\layout \
+LINCS = \
         -I$(DEPTH)\include \
-        -I$(PUBLIC)\liblayer 
+        $(NULL)
 !endif
 
 !if "$(MOZ_BITS)" == "16"
@@ -131,12 +131,7 @@ OBJS =					\
 #// install headers
 #//
 #//------------------------------------------------------------------------
-!ifdef MOZ_TRACK_MODULE_DEPS
-INSTALL_DIR=$(XPDIST)\include\$(MODULE)
-!else
-INSTALL_DIR=$(XPDIST)\include
-!endif
-INSTALL_FILE_LIST=	\
+EXPORTS = \
 	js.msg		\
 	jsapi.h		\
 	jsarray.h	\
@@ -203,7 +198,7 @@ $(FDLIBM_LIBRARY):
     @cd $(MAKEDIR) 
 !endif
 
-export:: INSTALL_FILES $(DLL)
+export:: $(DLL)
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
 	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib