diff --git a/xpcom/reflect/xptcall/tests/Makefile.in b/xpcom/reflect/xptcall/tests/Makefile.in
index 3b2b976bcda..9ee4f28191d 100644
--- a/xpcom/reflect/xptcall/tests/Makefile.in
+++ b/xpcom/reflect/xptcall/tests/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
@@ -14,49 +13,34 @@
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
-DEPTH = ../../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE = TestXPTC
+MODULE		= TestXPTC
+SIMPLE_PROGRAMS	= TestXPTCInvoke
 
-SIMPLE_PROGRAMS = TestXPTCInvoke
-
-CPPSRCS = \
-	TestXPTCInvoke.cpp \
-	$(NULL)
+CPPSRCS		= TestXPTCInvoke.cpp
 
 include $(topsrcdir)/config/config.mk
 
-CFLAGS += -DJS_THREADSAFE
+CFLAGS		+= -DJS_THREADSAFE
 
-LIBS		= 		\
-	-L$(DIST)/bin \
-	-lxpcom       \
-	-l$(MOZ_LIB_UTIL_PREFIX)util    \
-	$(NSPR_LIBS) 	\
-	$(NULL)
-
-
-# PROGS = $(OBJDIR)/TestXPTCInvoke
-
-# TARGETS= $(PROGS)
+LIBS		= \
+		-L$(DIST)/bin \
+		-lxpcom \
+		-l$(MOZ_LIB_UTIL_PREFIX)util \
+		$(NSPR_LIBS) \
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-# INCLUDES	+= -I$(PUBLIC)/xpcom -I$(PUBLIC)/js -I$(PUBLIC)/raptor
-
-#$(PROGS): $(OBJS)
-#	@$(MAKE_OBJDIR)
-#	$(CC) -o $@ $(OBJS) $(LD_FLAGS) -L$(DIST)/lib $(LIBS) $(OS_LIBS)
-
-# export:: $(TARGETS)
-# 	$(INSTALL) $(PROGS) $(DIST)/bin
-
-# clobber::
-# 	rm -f $(DIST)/bin/TestXPTCInvoke
-# 	rm -f $(PROGS) $(OBJS)
+# For _write().
+ifeq ($(OS_ARCH),BSD_OS)
+OS_LIBS		+= -lgcc
+endif