--- a/src/rcldb/Makefile
+++ b/src/rcldb/Makefile
@@ -1,15 +1,10 @@
-depth = ..
-include $(depth)/mk/sysconf
-
-# Only test executables get build in here
PROGS = synfamily stoplist
-all: librecoll $(PROGS)
+all: $(PROGS)
STOPLIST_OBJS= trstoplist.o
stoplist : $(STOPLIST_OBJS)
- $(CXX) $(ALL_CXXFLAGS) -o stoplist $(STOPLIST_OBJS) \
- $(LIBRECOLL) $(LIBICONV) $(LIBSYS)
+ $(CXX) $(ALL_CXXFLAGS) -o stoplist $(STOPLIST_OBJS) $(LIBRECOLL)
trstoplist.o : stoplist.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_STOPLIST -c -o trstoplist.o \
stoplist.cpp
@@ -17,9 +12,10 @@
SYNFAMILY_OBJS= trsynfamily.o
synfamily : $(SYNFAMILY_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o synfamily $(SYNFAMILY_OBJS) \
- $(LIBRECOLL) $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
+ $(LIBRECOLL) -lxapian
+
trsynfamily.o : synfamily.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_SYNFAMILY -c -o trsynfamily.o \
synfamily.cpp
-include $(depth)/mk/commontargets
+include ../utils/utmkdefs.mk