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 = trcopyfile trcircache trmd5 trreadfile trfileudi trconftree \
4
PROGS = trnetcon trcopyfile trcircache trmd5 trreadfile trfileudi trconftree \
5
      wipedir smallut \
5
        wipedir smallut \
6
      trfstreewalk trpathut \
6
        trfstreewalk trpathut \
7
      transcode trbase64 \
7
        transcode trbase64 \
8
      trmimeparse trexecmd utf8iter idfile
8
        trmimeparse trexecmd utf8iter idfile
9
9
10
all: $(PROGS) $(BIGLIB)
10
all: $(PROGS) $(BIGLIB)
11
11
12
$(BIGLIB): force
12
$(BIGLIB): force
13
    cd $(depth)/lib;$(MAKE)
13
    cd $(depth)/lib;$(MAKE)
...
...
51
PATHUT_OBJS= trpathut.o  $(BIGLIB)
51
PATHUT_OBJS= trpathut.o  $(BIGLIB)
52
trpathut : $(PATHUT_OBJS) 
52
trpathut : $(PATHUT_OBJS) 
53
    $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS)  $(LIBICONV) $(LIBSYS)
53
    $(CXX) $(ALL_CXXFLAGS) -o trpathut $(PATHUT_OBJS)  $(LIBICONV) $(LIBSYS)
54
trpathut.o : pathut.cpp pathut.h
54
trpathut.o : pathut.cpp pathut.h
55
    $(CXX) -o trpathut.o -c $(ALL_CXXFLAGS) -DTEST_PATHUT pathut.cpp
55
    $(CXX) -o trpathut.o -c $(ALL_CXXFLAGS) -DTEST_PATHUT pathut.cpp
56
57
NETCON_OBJS= trnetcon.o  $(BIGLIB)
58
trnetcon : $(NETCON_OBJS) 
59
  $(CXX) $(ALL_CXXFLAGS) -o trnetcon $(NETCON_OBJS)  $(LIBICONV) $(LIBSYS)
60
trnetcon.o : netcon.cpp netcon.h
61
  $(CXX) -o trnetcon.o -c $(ALL_CXXFLAGS) -DTEST_NETCON netcon.cpp
56
62
57
FILEUDI_OBJS= trfileudi.o  $(BIGLIB)
63
FILEUDI_OBJS= trfileudi.o  $(BIGLIB)
58
trfileudi : $(FILEUDI_OBJS) 
64
trfileudi : $(FILEUDI_OBJS) 
59
    $(CXX) $(ALL_CXXFLAGS) -o trfileudi $(FILEUDI_OBJS)
65
    $(CXX) $(ALL_CXXFLAGS) -o trfileudi $(FILEUDI_OBJS)
60
trfileudi.o : fileudi.cpp fileudi.h
66
trfileudi.o : fileudi.cpp fileudi.h