Switch to unified view

a/src/utils/Makefile b/src/utils/Makefile
1
depth = ..
1
depth = ..
2
include $(depth)/mk/sysconf
2
include $(depth)/mk/sysconf
3
3
4
PROGS = trfileudi trconftree wipedir smallut trfstreewalk trpathut \
4
PROGS = trreadfile trfileudi trconftree wipedir smallut trfstreewalk trpathut \
5
      transcode trbase64 \
5
      transcode trbase64 \
6
      trmimeparse trexecmd utf8iter idfile
6
      trmimeparse trexecmd utf8iter idfile
7
7
8
all: $(PROGS) $(BIGLIB)
8
all: $(PROGS) $(BIGLIB)
9
9
...
...
15
trfstreewalk : $(FSTREEWALK_OBJS)
15
trfstreewalk : $(FSTREEWALK_OBJS)
16
    $(CXX) -o trfstreewalk $(FSTREEWALK_OBJS) $(LIBICONV)
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
21
READFILE_OBJS= trreadfile.o readfile.o $(BIGLIB)
22
trreadfile : $(READFILE_OBJS)
23
  $(CXX) -o trreadfile $(READFILE_OBJS) $(LIBICONV) $(LIBSYS)
24
trreadfile.o : readfile.cpp readfile.h
25
  $(CXX) -o trreadfile.o -c $(ALL_CXXFLAGS) \
26
         -DTEST_READFILE readfile.cpp
20
27
21
PATHUT_OBJS= trpathut.o  $(BIGLIB)
28
PATHUT_OBJS= trpathut.o  $(BIGLIB)
22
trpathut : $(PATHUT_OBJS) 
29
trpathut : $(PATHUT_OBJS) 
23
    $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS)  $(LIBICONV)
30
    $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS)  $(LIBICONV)
24
trpathut.o : pathut.cpp pathut.h
31
trpathut.o : pathut.cpp pathut.h