--- a/src/index/Makefile
+++ b/src/index/Makefile
@@ -4,12 +4,13 @@
PROGS = recollindex
SRCS = recollindex.cpp rclmonrcv.cpp rclmonprc.cpp
-all: depend $(PROGS) $(BIGLIB)
+all: depend $(PROGS) librecoll
-RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o $(BIGLIB)
-recollindex : $(RECOLLINDEX_OBJS)
- $(CXX) $(ALL_CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \
- $(BSTATIC) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \
+RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o
+recollindex : $(RECOLLINDEX_OBJS) librecoll
+ $(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) -o recollindex \
+ $(RECOLLINDEX_OBJS) \
+ $(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \
$(LIBICONV) $(BDYNAMIC) \
$(LIBFAM) \
$(X_LIBS) $(X_PRE_LIBS) $(X_LIBX11) $(X_EXTRA_LIBS) \
@@ -21,33 +22,21 @@
rclmonprc.o : rclmonprc.cpp
$(CXX) $(ALL_CXXFLAGS) -c -o rclmonprc.o $<
-SUBTREELIST_OBJS= subtreelist.o $(BIGLIB)
+SUBTREELIST_OBJS= subtreelist.o
subtreelist : $(SUBTREELIST_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o subtreelist $(SUBTREELIST_OBJS) \
- $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
+ $(LIBRECOLL) $(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
subtreelist.o : subtreelist.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_SUBTREELIST -c subtreelist.cpp
MIMETYPE_OBJS= trmimetype.o $(BIGLIB)
mimetype : $(MIMETYPE_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o mimetype $(MIMETYPE_OBJS) \
- $(LIBICONV) $(LIBSYS)
+ $(LIBRECOLL) $(LIBICONV) $(LIBSYS)
trmimetype.o : mimetype.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_MIMETYPE -c -o trmimetype.o \
mimetype.cpp
-$(BIGLIB): force
- cd $(depth)/lib;$(MAKE)
-force:
-
-depend: alldeps.stamp
-alldeps.stamp : $(SRCS)
- $(CXX) -M $(ALL_CXXFLAGS) $(SRCS) > alldeps
- touch alldeps.stamp
-
-clean:
- cp /dev/null alldeps
- rm -f alldeps.stamp
- rm -f *.o $(PROGS)
+include $(depth)/mk/commontargets
include alldeps