From 6b790408c82c02b280a18469214b936c16e97143 Mon Sep 17 00:00:00 2001 From: "mcafee%netscape.com" Date: Wed, 10 Feb 1999 00:49:34 +0000 Subject: [PATCH] More portable way of writing this Makefile. --- intl/unicharutil/tests/Makefile.in | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in index ed4431610ff4..1509b86abec5 100644 --- a/intl/unicharutil/tests/Makefile.in +++ b/intl/unicharutil/tests/Makefile.in @@ -23,28 +23,17 @@ include $(DEPTH)/config/autoconf.mk CPPSRCS = UnicharSelfTest.cpp -include $(topsrcdir)/config/rules.mk +include $(topsrcdir)/config/config.mk #DEFINES += -DUSE_NSREG INCLUDES += -I$(srcdir)/../public -I$(DIST)/include -EX_LIBS = $(DIST)/lib/libxpcom.$(LIB_SUFFIX) \ - $(DIST)/lib/libreg.$(LIB_SUFFIX) \ - $(NULL) +LIBS = \ + -lxpcom \ + -lreg \ + $(NSPR_LIBS) \ + $(NULL) -PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=)) +PROGRAM = UnicharSelfTest -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