Switch to unified view

a/src/query/Makefile b/src/query/Makefile
...
...
2
include $(depth)/mk/sysconf
2
include $(depth)/mk/sysconf
3
3
4
PROGS = xadump recollq #trhist qtry qxtry 
4
PROGS = xadump recollq #trhist qtry qxtry 
5
SRCS = xadump.cpp 
5
SRCS = xadump.cpp 
6
6
7
all: depend $(PROGS) librecoll
7
all: depend librecoll $(PROGS)
8
8
9
XADUMP_OBJS= xadump.o 
9
XADUMP_OBJS= xadump.o 
10
xadump : $(XADUMP_OBJS)
10
xadump : $(XADUMP_OBJS)
11
    $(CXX) $(ALL_CXXFLAGS) -o xadump $(XADUMP_OBJS) \
11
    $(CXX) $(ALL_CXXFLAGS) -o xadump $(XADUMP_OBJS) \
12
           $(depth)/lib/librecoll.a $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
12
           $(depth)/lib/librecoll.a $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
13
xadump.o : xadump.cpp 
13
xadump.o : xadump.cpp 
14
    $(CXX) $(ALL_CXXFLAGS) -c xadump.cpp
14
    $(CXX) $(ALL_CXXFLAGS) -c xadump.cpp
15
15
16
RECOLLQ_OBJS= recollq.o 
16
RECOLLQ_OBJS= recollq.o 
17
recollq : $(RECOLLQ_OBJS) librecoll
17
recollq : $(RECOLLQ_OBJS)
18
    $(CXX) $(ALL_CXXFLAGS) -o recollq $(RECOLLQ_OBJS) \
18
    $(CXX) $(ALL_CXXFLAGS) -o recollq $(RECOLLQ_OBJS) \
19
           $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \
19
           $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBICONV) $(BDYNAMIC) \
20
               $(LIBSYS)
20
               $(LIBSYS)
21
recollq.o : recollq.cpp 
21
recollq.o : recollq.cpp 
22
    $(CXX) $(ALL_CXXFLAGS) -DTEST_RECOLLQ -c recollq.cpp
22
    $(CXX) $(ALL_CXXFLAGS) -DTEST_RECOLLQ -c recollq.cpp
23
23
24
HISTORY_OBJS= trhist.o  $(BIGLIB) 
24
HISTORY_OBJS= trhist.o
25
trhist : $(HISTORY_OBJS)
25
trhist : $(HISTORY_OBJS)
26
    $(CXX) $(ALL_CXXFLAGS) -o trhist $(HISTORY_OBJS) \
26
    $(CXX) $(ALL_CXXFLAGS) -o trhist $(HISTORY_OBJS) \
27
           $(LIBICONV) $(LIBXAPIAN)
27
           $(LIBICONV) $(LIBXAPIAN)
28
trhist.o : history.cpp history.h
28
trhist.o : history.cpp history.h
29
    $(CXX) $(ALL_CXXFLAGS) -DTEST_HISTORY -c -o trhist.o history.cpp
29
    $(CXX) $(ALL_CXXFLAGS) -DTEST_HISTORY -c -o trhist.o history.cpp