From 999f279f03b2dbbda95cfc814691b18dca52e8fd Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Mon, 28 Sep 1998 05:37:23 +0000 Subject: [PATCH] Removed two local rules, instead relying on global rules in config/rules.mk. git-svn-id: svn://10.0.0.236/trunk@11201 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/tests/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mozilla/xpcom/tests/Makefile b/mozilla/xpcom/tests/Makefile index 239c2310075..c6429110eb4 100644 --- a/mozilla/xpcom/tests/Makefile +++ b/mozilla/xpcom/tests/Makefile @@ -19,6 +19,8 @@ DEPTH=../.. include $(DEPTH)/config/config.mk +CFLAGS += -DUSE_NSREG + CPPSRCS = \ RegFactory.cpp \ TestFactory.cpp \ @@ -28,8 +30,6 @@ INCLUDES=-I../src -I$(DIST)/include DIRS = dynamic -OBJS = $(CPPSRCS:.cpp=.o) - EX_LIBS = \ $(DIST)/bin/libreg.$(DLL_SUFFIX) \ $(DIST)/bin/libxpcom.$(DLL_SUFFIX) \ @@ -45,10 +45,6 @@ TARGETS = $(NON_DIRS) include $(DEPTH)/config/rules.mk -$(OBJDIR)/%.o: %.cpp - @$(MAKE_OBJDIR) - $(CCC) -o $@ $(CFLAGS) -DUSE_NSREG -c $*.cpp - $(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS) @$(MAKE_OBJDIR) $(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS)