Fix to 6156.

Added $(EXTRA_DEPS) dependency to $(PROGRAM) in rules.mk, so xpidl can ask to be recompiled when libxpt changes.

config/rules.mk

@@ -423,7 +423,7 @@ endif
 # PROGRAM = Foo
 # creates OBJS, links with LIBS to create Foo
 #
-$(PROGRAM): $(PROGOBJS)
+$(PROGRAM): $(PROGOBJS) $(EXTRA_DEPS)
 ifeq ($(OS_ARCH),OS2)
 	$(LINK) -FREE -OUT:$@ $(LDFLAGS) $(OS_LFLAGS) $(PROGOBJS)  $(EXTRA_LIBS) -MAP:$(@:.exe=.map) $(OS_LIBS) $(DEF_FILE)
 else

xpcom/tools/xpidl/Makefile.in

@@ -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
@@ -35,7 +34,7 @@ CSRCS = \
 
 LIBS = -lxpt $(LIBIDL_LIBS)
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
 
 CFLAGS += $(LIBIDL_CFLAGS)
 
@@ -43,7 +42,9 @@ CFLAGS += $(LIBIDL_CFLAGS)
 # without setting the shared library path.
 LDFLAGS += -static
 
-include $(topsrcdir)/config/rules.mk
+# Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes.
+EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*)
 
 # Build xpidl early.
 export:: install
+

xpcom/typelib/xpidl/Makefile.in

@@ -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
@@ -35,7 +34,7 @@ CSRCS = \
 
 LIBS = -lxpt $(LIBIDL_LIBS)
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
 
 CFLAGS += $(LIBIDL_CFLAGS)
 
@@ -43,7 +42,9 @@ CFLAGS += $(LIBIDL_CFLAGS)
 # without setting the shared library path.
 LDFLAGS += -static
 
-include $(topsrcdir)/config/rules.mk
+# Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes.
+EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*)
 
 # Build xpidl early.
 export:: install
+