From 8e9f576f1fa2fde4c96a542425a174472ecc0b71 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Fri, 22 Jan 1999 10:03:32 +0000 Subject: [PATCH] Removed hard-coded link line, use the one in rules.mk instead. --- editor/txmgr/tests/Makefile.in | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/editor/txmgr/tests/Makefile.in b/editor/txmgr/tests/Makefile.in index 268a3f212e5..f640d7fe70e 100644 --- a/editor/txmgr/tests/Makefile.in +++ b/editor/txmgr/tests/Makefile.in @@ -21,32 +21,16 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = dynamic - CPPSRCS = TestTXMgr.cpp -include $(topsrcdir)/config/rules.mk - INCLUDES += -I$(DIST)/include -EX_LIBS = \ - $(DIST)/lib/libraptorbase.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcom.$(LIB_SUFFIX) \ +LIBS = \ + -lraptorbase \ + -lxpcom \ + $(NSPR_LIBS) \ $(NULL) -PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=)) +PROGRAM = TestTXMgr -TARGETS = $(PROGS) - -ifeq ($(OS_ARCH),Rhapsody) -$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS) - @$(MAKE_OBJDIR) - $(CC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(OS_LIBS) -else -$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS) - @$(MAKE_OBJDIR) - $(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(NSPR_LIBS) $(OS_LIBS) -endif - -install:: $(PROGS) - $(INSTALL) $(PROGS) $(DIST)/bin +include $(topsrcdir)/config/rules.mk