Switch to unified view

a/src/utils/Makefile b/src/utils/Makefile
...
...
11
    cd $(depth)/lib;$(MAKE)
11
    cd $(depth)/lib;$(MAKE)
12
force:
12
force:
13
13
14
FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o $(BIGLIB)
14
FSTREEWALK_OBJS= trfstreewalk.o fstreewalk.o $(BIGLIB)
15
trfstreewalk : $(FSTREEWALK_OBJS)
15
trfstreewalk : $(FSTREEWALK_OBJS)
16
    $(CXX) -o trfstreewalk $(FSTREEWALK_OBJS)
16
    $(CXX) -o trfstreewalk $(FSTREEWALK_OBJS) $(LIBICONV)
17
trfstreewalk.o : fstreewalk.cpp fstreewalk.h
17
trfstreewalk.o : fstreewalk.cpp fstreewalk.h
18
    $(CXX) -o trfstreewalk.o -c $(ALL_CXXFLAGS) \
18
    $(CXX) -o trfstreewalk.o -c $(ALL_CXXFLAGS) \
19
           -DTEST_FSTREEWALK fstreewalk.cpp
19
           -DTEST_FSTREEWALK fstreewalk.cpp
20
20
21
PATHUT_OBJS= trpathut.o  $(BIGLIB)
21
PATHUT_OBJS= trpathut.o  $(BIGLIB)
22
trpathut : $(PATHUT_OBJS) 
22
trpathut : $(PATHUT_OBJS) 
23
    $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS)
23
    $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS)  $(LIBICONV)
24
trpathut.o : pathut.cpp pathut.h
24
trpathut.o : pathut.cpp pathut.h
25
    $(CXX) -o trpathut.o -c $(ALL_CXXFLAGS) -DTEST_PATHUT pathut.cpp
25
    $(CXX) -o trpathut.o -c $(ALL_CXXFLAGS) -DTEST_PATHUT pathut.cpp
26
26
27
FILEUDI_OBJS= trfileudi.o  $(BIGLIB)
27
FILEUDI_OBJS= trfileudi.o  $(BIGLIB)
28
trfileudi : $(FILEUDI_OBJS) 
28
trfileudi : $(FILEUDI_OBJS) 
...
...
30
trfileudi.o : fileudi.cpp fileudi.h
30
trfileudi.o : fileudi.cpp fileudi.h
31
    $(CXX) -o trfileudi.o -c $(ALL_CXXFLAGS) -DTEST_FILEUDI fileudi.cpp
31
    $(CXX) -o trfileudi.o -c $(ALL_CXXFLAGS) -DTEST_FILEUDI fileudi.cpp
32
32
33
EXECMD_OBJS= trexecmd.o $(BIGLIB)
33
EXECMD_OBJS= trexecmd.o $(BIGLIB)
34
trexecmd : $(EXECMD_OBJS)
34
trexecmd : $(EXECMD_OBJS)
35
    $(CXX) $(ALL_CXXFLAGS) -o trexecmd $(EXECMD_OBJS)
35
    $(CXX) $(ALL_CXXFLAGS) -o trexecmd $(EXECMD_OBJS) $(LIBICONV)
36
trexecmd.o : execmd.cpp execmd.h
36
trexecmd.o : execmd.cpp execmd.h
37
    $(CXX) -o trexecmd.o -c $(ALL_CXXFLAGS) -DTEST_EXECMD execmd.cpp
37
    $(CXX) -o trexecmd.o -c $(ALL_CXXFLAGS) -DTEST_EXECMD execmd.cpp
38
38
39
TRANSCODE_OBJS= trtranscode.o  $(BIGLIB) 
39
TRANSCODE_OBJS= trtranscode.o  $(BIGLIB) 
40
transcode : $(TRANSCODE_OBJS)
40
transcode : $(TRANSCODE_OBJS)
...
...
77
trutf8iter.o : utf8iter.cpp utf8iter.h
77
trutf8iter.o : utf8iter.cpp utf8iter.h
78
    $(CXX) $(ALL_CXXFLAGS) -DTEST_UTF8ITER -c -o trutf8iter.o \
78
    $(CXX) $(ALL_CXXFLAGS) -DTEST_UTF8ITER -c -o trutf8iter.o \
79
           utf8iter.cpp
79
           utf8iter.cpp
80
80
81
81
82
CONFTREE_OBJS= trconftree.o  ../lib/pathut.o ../lib/smallut.o ../lib/conftree.o
82
CONFTREE_OBJS= trconftree.o  $(BIGLIB)
83
trconftree : $(CONFTREE_OBJS) $(BIGLIB)
83
trconftree : $(CONFTREE_OBJS)
84
    $(CXX) $(ALL_CXXFLAGS) -o trconftree $(CONFTREE_OBJS)
84
    $(CXX) $(ALL_CXXFLAGS) -o trconftree $(CONFTREE_OBJS) $(LIBICONV) 
85
trconftree.o : conftree.cpp 
85
trconftree.o : conftree.cpp 
86
    $(CXX) $(ALL_CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o \
86
    $(CXX) $(ALL_CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o \
87
           conftree.cpp
87
           conftree.cpp
88
88
89
BASE64_OBJS= trbase64.o  $(BIGLIB)
89
BASE64_OBJS= trbase64.o  $(BIGLIB)