Switch to unified view

a/src/utils/Makefile b/src/utils/Makefile
1
include ../mk/sysconf
1
include ../mk/sysconf
2
2
3
BIGLIB = ../lib/librcl.a
3
BIGLIB = ../lib/librcl.a
4
4
5
PROGS = wipedir smallut trfstreewalk trpathut transcode trmimeparse trexecmd
5
PROGS = wipedir smallut trfstreewalk trpathut transcode trmimeparse \
6
      trexecmd utf8iter
7
6
all: $(PROGS)
8
all: $(PROGS)
7
9
8
FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o pathut.o
10
FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o pathut.o
9
trfstreewalk : $(FSTREEWALK_OBJS)
11
trfstreewalk : $(FSTREEWALK_OBJS)
10
    $(CXX) -o trfstreewalk $(FSTREEWALK_OBJS)
12
    $(CXX) -o trfstreewalk $(FSTREEWALK_OBJS)
...
...
49
wipedir : $(WIPEDIR_OBJS)
51
wipedir : $(WIPEDIR_OBJS)
50
    $(CXX) $(CXXFLAGS) -o wipedir $(WIPEDIR_OBJS) $(LIBICONV)
52
    $(CXX) $(CXXFLAGS) -o wipedir $(WIPEDIR_OBJS) $(LIBICONV)
51
trwipedir.o : ../utils/wipedir.cpp 
53
trwipedir.o : ../utils/wipedir.cpp 
52
    $(CXX) $(CXXFLAGS) -DTEST_WIPEDIR -c -o trwipedir.o \
54
    $(CXX) $(CXXFLAGS) -DTEST_WIPEDIR -c -o trwipedir.o \
53
           wipedir.cpp
55
           wipedir.cpp
56
57
UTF8ITER_OBJS= trutf8iter.o  $(BIGLIB)
58
utf8iter : $(UTF8ITER_OBJS)
59
  $(CXX) $(CXXFLAGS) -o utf8iter $(UTF8ITER_OBJS) $(LIBICONV)
60
trutf8iter.o : ../utils/utf8iter.cpp utf8iter.h
61
  $(CXX) $(CXXFLAGS) -DTEST_UTF8ITER -c -o trutf8iter.o \
62
         utf8iter.cpp
54
clean: 
63
clean: 
55
    rm -f *.o $(PROGS)
64
    rm -f *.o $(PROGS)