More portable makefile, fixing -lreg breakage.

git-svn-id: svn://10.0.0.236/trunk@20754 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/intl/locale/tests/Makefile.in

@@ -26,39 +26,18 @@ CPPSRCS = \
 	nsLocaleTest.cpp	\
 	$(NULL)
 
+SIMPLE_PROGRAMS =  $(CPPSRCS:.cpp=)
+LOCAL_INCLUDES = -I$(srcdir)/../src
 
+include $(topsrcdir)/config/config.mk
 
-PROGS = LocaleSelfTest nsLocaleTest
-
-include $(topsrcdir)/config/rules.mk
-INCLUDES+=-I$(srcdir)/../src -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom
-
-DIRS	=
-
-OBJS	= $(CPPSRCS:.cpp=.o)
-
-EX_LIBS = -lnslocale -lraptorbase -lxpcom
-
-ifeq (linux,$(ARCH))
-OS_LIBS += /usr/lib/libdl.so
-endif
-
-PROGS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
-
-TARGETS = $(PROGS)
+LIBS = \
+	-lnslocale \
+	-lraptorbase \
+	-lxpcom \
+	-lreg \
+	$(NSPR_LIBS) \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-$(OBJDIR)/%.o: %.cpp
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $(CFLAGS) -c $<
-
-$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o
-	@$(MAKE_OBJDIR)
-	$(CCC) -o $@ $@.o $(LDFLAGS) -L$(DIST)/bin $(EX_LIBS) $(NSPR_LIBS) $(OS_LIBS)
-
-export::
-
-install:: $(TARGETS)
-	$(INSTALL) $(PROGS) $(DIST)/bin
-