yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

build with lib moved to recoll subdir works for debian

Browse source
This commit is contained in:
Jean-Francois Dockes 2012-12-30 16:11:51 +01:00
parent cd69601085
commit a9002d1a01
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/index/Makefile
View file

@ -4,10 +4,10 @@ include $(depth)/mk/sysconf
PROGS = recollindex
SRCS = recollindex.cpp rclmonrcv.cpp rclmonprc.cpp
all: depend $(PROGS) librecoll
all: depend librecoll $(PROGS)
RECOLLINDEX_OBJS= recollindex.o rclmonrcv.o rclmonprc.o
recollindex : $(RECOLLINDEX_OBJS) librecoll
recollindex : $(RECOLLINDEX_OBJS)
$(CXX) $(ALL_CXXFLAGS) $(RECOLL_LDFLAGS) -o recollindex \
$(RECOLLINDEX_OBJS) \
$(BSTATIC) $(LIBRECOLL) $(LIBXAPIAN) $(LIBXAPIANSTATICEXTRA) \

2
src/lib/Makefile
View file

@ -18,7 +18,7 @@ librecoll.a : $(DEPS) $(OBJS)
# no effort whatsoever to maintain any kind of ABI compat in this lib. Only
# programs or modules from the same Recoll release can be compatible.
$(LIBRECOLL): $(DEPS) $(OBJS)
g++ -shared -Wl,--no-undefined -Wl,-rpath=$(libdir) -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) -lxapian -lz -lX11 -lpthread -ldl
g++ -shared -Wl,--no-undefined -Wl,-soname=$(LIBRECOLL) -o $(LIBRECOLL) $(OBJS) -lxapian -lz -lX11 -lpthread -ldl
rm -f librecoll.so
ln -s $(LIBRECOLL) librecoll.so

2
src/lib/mkMake
View file

@ -131,7 +131,7 @@ librecoll.a : \$(DEPS) \$(OBJS)
# no effort whatsoever to maintain any kind of ABI compat in this lib. Only
# programs or modules from the same Recoll release can be compatible.
\$(LIBRECOLL): \$(DEPS) \$(OBJS)
g++ -shared -Wl,--no-undefined -Wl,-rpath=\$(libdir) \
g++ -shared -Wl,--no-undefined \
-Wl,-soname=\$(LIBRECOLL) -o \$(LIBRECOLL) \$(OBJS) \
-lxapian -lz -lX11 -lpthread -ldl
rm -f librecoll.so

6
src/python/recoll/setup.py.in
View file

@ -7,7 +7,11 @@ top = os.path.join('..', '..')
library_dirs = [os.path.join(top, 'lib')]
libraries = ['recoll']
runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')]
runtime_library_dirs = []
try:
runtime_library_dirs = [os.path.join(os.environ['libdir'], 'recoll')]
except:
pass
# Verify that the Recoll library was compiled with the PIC options
localdefs = os.path.join(top, 'mk', 'localdefs')