t-suw****@users*****
t-suw****@users*****
2007年 9月 24日 (月) 19:04:34 JST
Index: AquaSKK/src/test/.cvsignore diff -u AquaSKK/src/test/.cvsignore:1.1.2.1 AquaSKK/src/test/.cvsignore:1.1.2.2 --- AquaSKK/src/test/.cvsignore:1.1.2.1 Mon Sep 24 18:55:36 2007 +++ AquaSKK/src/test/.cvsignore Mon Sep 24 19:04:34 2007 @@ -8,3 +8,4 @@ SKKRomanKanaConverter_TEST SKKRuleTreeNode_TEST SKKUserDictionary_TEST +skk-user-dic.utf8 Index: AquaSKK/src/test/Makefile diff -u AquaSKK/src/test/Makefile:1.1.2.6 AquaSKK/src/test/Makefile:1.1.2.7 --- AquaSKK/src/test/Makefile:1.1.2.6 Sun Sep 16 09:15:42 2007 +++ AquaSKK/src/test/Makefile Mon Sep 24 19:04:34 2007 @@ -3,15 +3,17 @@ ### VPATH = $(filter-out %/CVS,$(wildcard ../*)) ../.. -CPPFLAGS= $(foreach dir,$(VPATH),-I$(dir)) +CPPFLAGS= $(foreach dir,$(VPATH),-I$(dir)) -g SRCS = $(wildcard *_TEST.cpp) OBJS = $(SRCS:.cpp=.o) PROGS = $(SRCS:.cpp=) +DEPDIR = .depend LIB = libtest.a -LDFLAGS = -L. -ltest +LDFLAGS = -L. -ltest -framework Carbon LIBOBJS = SKKKeymapEntry.o SKKKeymap.o SKKRuleTreeNode.o SKKRomanKanaConverter.o \ - SKKInputBuffer.o jconv.o SKKEditBuffer.o + SKKInputBuffer.o jconv.o SKKEditBuffer.o KotoeriDictionary.o CppCFString.o \ + SKKDictionary.o SKKConfig.o CppCFData.o all: $(LIB) $(PROGS) @@ -19,7 +21,7 @@ @for prog in $(PROGS); do ./$$prog; done clean: - $(RM) -rf $(PROGS) $(LIB) *.o .depend + $(RM) -rf $(PROGS) $(LIB) *.o $(DEPDIR) $(LIB): $(LIBOBJS) $(AR) -rsu $@ $(LIBOBJS) @@ -27,12 +29,12 @@ $(PROGS): %: %.o $(LIB) $(CXX) -o $@ $< $(LDFLAGS) -.depend/%.d: %.cpp .depend +$(DEPDIR)/%.d: %.cpp $(DEPDIR) $(CXX) -MM $(CPPFLAGS) $< | sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' > $@ -.depend: - @mkdir .depend +$(DEPDIR): + @mkdir $@ ifneq ($(MAKECMDGOALS), clean) --include $(addprefix .depend/,$(LIBOBJS:.o=.d) $(OBJS:.o=.d)) +-include $(addprefix $(DEPDIR)/,$(LIBOBJS:.o=.d) $(OBJS:.o=.d)) endif
Fork