Switch to unified view

a/src/Makefile.am b/src/Makefile.am
...
...
238
utils/transcode.h \
238
utils/transcode.h \
239
utils/utf8iter.h \
239
utils/utf8iter.h \
240
utils/wipedir.cpp \
240
utils/wipedir.cpp \
241
utils/wipedir.h \
241
utils/wipedir.h \
242
utils/workqueue.h \
242
utils/workqueue.h \
243
utils/x11mon.cpp \
244
utils/x11mon.h \
245
xaposix/safefcntl.h \
243
xaposix/safefcntl.h \
246
xaposix/safesysstat.h \
244
xaposix/safesysstat.h \
247
xaposix/safesyswait.h \
245
xaposix/safesyswait.h \
248
xaposix/safeunistd.h
246
xaposix/safeunistd.h
249
247
...
...
254
# between recoll programs from the same release.
252
# between recoll programs from the same release.
255
# -version-info $(VERSION_INFO)
253
# -version-info $(VERSION_INFO)
256
librecoll_la_LDFLAGS = -release $(VERSION) \
254
librecoll_la_LDFLAGS = -release $(VERSION) \
257
    -Wl,--no-undefined -Wl,--warn-unresolved-symbols
255
    -Wl,--no-undefined -Wl,--warn-unresolved-symbols
258
256
259
librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(X_LIBX11) $(LIBTHREADS)
257
librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
260
258
261
# There is probably a better way to do this. The KIO needs to be linked
259
# There is probably a better way to do this. The KIO needs to be linked
262
# with librecoll, but librecoll is installed into a non-standard place
260
# with librecoll, but librecoll is installed into a non-standard place
263
# (/usr/lib/recoll). Debian packaging has something against setting an
261
# (/usr/lib/recoll). Debian packaging has something against setting an
264
# rpath on the kio (cause it's not the same package as the lib), so I don't
262
# rpath on the kio (cause it's not the same package as the lib), so I don't
...
...
285
endif
283
endif
286
284
287
recollindex_SOURCES = \
285
recollindex_SOURCES = \
288
                    index/recollindex.cpp \
286
                    index/recollindex.cpp \
289
                    index/rclmonprc.cpp \
287
                    index/rclmonprc.cpp \
290
                    index/rclmonrcv.cpp 
288
                    index/rclmonrcv.cpp \
289
                    utils/x11mon.cpp \
290
                    utils/x11mon.h 
291
recollindex_LDADD = librecoll.la
291
recollindex_LDADD = librecoll.la $(X_LIBX11)
292
292
293
recollq_SOURCES = query/recollqmain.cpp
293
recollq_SOURCES = query/recollqmain.cpp
294
recollq_LDADD = librecoll.la
294
recollq_LDADD = librecoll.la
295
295
296
xadump_SOURCES = query/xadump.cpp
296
xadump_SOURCES = query/xadump.cpp