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
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user