tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add -ldl -lX11 for binutils-gold

Browse Source
This commit is contained in:
dockes 2009-11-15 14:18:42 +00:00
parent 0ccf8fccd9
commit f547760c35
2 changed files with 97 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/qt4gui/recoll.pro.in
View File

@ -1,9 +1,9 @@
TEMPLATE = app TEMPLATE = app
LANGUAGE = C++ LANGUAGE = C++
CONFIG += qt warn_on thread release debug CONFIG += qt warn_on thread release debug
HEADERS += \ HEADERS += \
../qtgui/advsearch_w.h \ ../qtgui/advsearch_w.h \
../qtgui/confgui/confgui.h \ ../qtgui/confgui/confgui.h \
../qtgui/confgui/confguiindex.h \ ../qtgui/confgui/confguiindex.h \
@ -16,7 +16,7 @@ HEADERS += \
../qtgui/spell_w.h \ ../qtgui/spell_w.h \
../qtgui/ssearch_w.h \ ../qtgui/ssearch_w.h \
../qtgui/uiprefs_w.h \ ../qtgui/uiprefs_w.h \
../qtgui/viewaction_w.h ../qtgui/viewaction_w.h \
SOURCES += \ SOURCES += \
@ -35,18 +35,18 @@ SOURCES += \
../qtgui/spell_w.cpp \ ../qtgui/spell_w.cpp \
../qtgui/ssearch_w.cpp \ ../qtgui/ssearch_w.cpp \
../qtgui/uiprefs_w.cpp \ ../qtgui/uiprefs_w.cpp \
../qtgui/viewaction_w.cpp ../qtgui/viewaction_w.cpp \
FORMS = \
advsearch.ui \ FORMS = \
rclmain.ui \ ../qtgui/advsearch.ui \
sort.ui \ ../qtgui/rclmain.ui \
spell.ui \ ../qtgui/sort.ui \
ssearchb.ui \ ../qtgui/spell.ui \
uiprefs.ui \ ../qtgui/ssearchb.ui \
viewaction.ui ../qtgui/uiprefs.ui \
../qtgui/viewaction.ui \
RESOURCES = recoll.qrc RESOURCES = recoll.qrc
@ -61,27 +61,30 @@ unix {
-lz -lz
INCLUDEPATH += ../common ../index ../internfile ../query ../unac \ INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
../utils ../aspell ../rcldb ../qt4gui/.ui \ ../utils ../aspell ../rcldb ../qt4gui/.ui \
../qtgui ../../qtgui \ ../qtgui ../../qtgui \
../qtgui/confgui ../../qtgui/confgui ../qtgui/confgui ../../qtgui/confgui
POST_TARGETDEPS = ../lib/librcl.a POST_TARGETDEPS = ../lib/librcl.a
} }
UNAME = $$system(uname -s) UNAME = $$system(uname -s)
contains( UNAME, [lL]inux ) { contains( UNAME, [lL]inux ) {
LIBS -= -liconv LIBS -= -liconv
LIBS += -ldl -lX11
} }
contains( UNAME, SunOS ) { contains( UNAME, SunOS ) {
LIBS += -ldl LIBS += -ldl
} }
TRANSLATIONS = ../qtgui/i18n/recoll_de.ts \ TRANSLATIONS = \
../qtgui/i18n/recoll_fr.ts \ ../qtgui/i18n/recoll_de.ts \
../qtgui/i18n/recoll_it.ts \ ../qtgui/i18n/recoll_fr.ts \
../qtgui/i18n/recoll_ru.ts \ ../qtgui/i18n/recoll_it.ts \
../qtgui/i18n/recoll_tr.ts \ ../qtgui/i18n/recoll_ru.ts \
../qtgui/i18n/recoll_uk.ts \ ../qtgui/i18n/recoll_tr.ts \
../qtgui/i18n/recoll_xx.ts ../qtgui/i18n/recoll_uk.ts \
../qtgui/i18n/recoll_xx.ts \
QT += qt3support QT += qt3support

130
src/qtgui/recoll.pro.in
View File

@ -1,63 +1,67 @@
TEMPLATE = app TEMPLATE = app
LANGUAGE = C++ LANGUAGE = C++
CONFIG += qt warn_on thread release debug CONFIG += qt warn_on thread release debug
HEADERS += \ HEADERS += \
advsearch_w.h \ ../qtgui/advsearch_w.h \
spell_w.h \ ../qtgui/confgui/confgui.h \
preview_w.h \ ../qtgui/confgui/confguiindex.h \
rclmain_w.h \ ../qtgui/preview_w.h \
reslist.h \ ../qtgui/rclhelp.h \
rclhelp.h \ ../qtgui/rclmain_w.h \
sort_w.h \ ../qtgui/reslist.h \
searchclause_w.h \ ../qtgui/searchclause_w.h \
ssearch_w.h \ ../qtgui/sort_w.h \
uiprefs_w.h \ ../qtgui/spell_w.h \
viewaction_w.h \ ../qtgui/ssearch_w.h \
confgui/confgui.h \ ../qtgui/uiprefs_w.h \
confgui/confguiindex.h ../qtgui/viewaction_w.h \
SOURCES += \ SOURCES += \
guiutils.cpp \ ../qtgui/advsearch_w.cpp \
idxthread.cpp \ ../qtgui/confgui/confgui.cpp \
main.cpp \ ../qtgui/confgui/confguiindex.cpp \
rclmain_w.cpp \ ../qtgui/guiutils.cpp \
reslist.cpp \ ../qtgui/idxthread.cpp \
advsearch_w.cpp \ ../qtgui/main.cpp \
rclhelp.cpp \ ../qtgui/preview_w.cpp \
spell_w.cpp \ ../qtgui/rclhelp.cpp \
preview_w.cpp \ ../qtgui/rclmain_w.cpp \
sort_w.cpp \ ../qtgui/reslist.cpp \
searchclause_w.cpp \ ../qtgui/searchclause_w.cpp \
ssearch_w.cpp \ ../qtgui/sort_w.cpp \
uiprefs_w.cpp \ ../qtgui/spell_w.cpp \
viewaction_w.cpp \ ../qtgui/ssearch_w.cpp \
confgui/confgui.cpp \ ../qtgui/uiprefs_w.cpp \
confgui/confguiindex.cpp ../qtgui/viewaction_w.cpp \
FORMS = \
advsearch.ui \
spell.ui \
rclmain.ui \
sort.ui \
ssearchb.ui \
uiprefs.ui \
viewaction.ui
IMAGES = \
images/asearch.png \ FORMS = \
images/d_firstpage.png \ ../qtgui/advsearch.ui \
images/d_nextpage.png \ ../qtgui/rclmain.ui \
images/d_prevpage.png \ ../qtgui/sort.ui \
images/d_spell.png \ ../qtgui/spell.ui \
images/firstpage.png \ ../qtgui/ssearchb.ui \
images/history.png \ ../qtgui/uiprefs.ui \
images/nextpage.png \ ../qtgui/viewaction.ui \
images/prevpage.png \
images/sortparms.png \
images/spell.png IMAGES = \
../qtgui/images/asearch.png \
../qtgui/images/d_firstpage.png \
../qtgui/images/d_nextpage.png \
../qtgui/images/d_prevpage.png \
../qtgui/images/d_spell.png \
../qtgui/images/firstpage.png \
../qtgui/images/history.png \
../qtgui/images/nextpage.png \
../qtgui/images/prevpage.png \
../qtgui/images/sortparms.png \
../qtgui/images/spell.png \
unix { unix {
UI_DIR = .ui UI_DIR = .ui
@ -69,22 +73,24 @@ unix {
-lz -lz
INCLUDEPATH += ../common ../index ../internfile ../query ../unac \ INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
../utils ../aspell ../rcldb confgui ../utils ../aspell ../rcldb confgui
POST_TARGETDEPS = ../lib/librcl.a POST_TARGETDEPS = ../lib/librcl.a
} }
UNAME = $$system(uname -s) UNAME = $$system(uname -s)
contains( UNAME, [lL]inux ) { contains( UNAME, [lL]inux ) {
LIBS -= -liconv LIBS -= -liconv
LIBS += -ldl -lX11
} }
contains( UNAME, SunOS ) { contains( UNAME, SunOS ) {
LIBS += -ldl LIBS += -ldl
} }
TRANSLATIONS = i18n/recoll_de.ts \ TRANSLATIONS = \
i18n/recoll_fr.ts \ ../qtgui/i18n/recoll_de.ts \
i18n/recoll_it.ts \ ../qtgui/i18n/recoll_fr.ts \
i18n/recoll_ru.ts \ ../qtgui/i18n/recoll_it.ts \
i18n/recoll_tr.ts \ ../qtgui/i18n/recoll_ru.ts \
i18n/recoll_uk.ts \ ../qtgui/i18n/recoll_tr.ts \
i18n/recoll_xx.ts ../qtgui/i18n/recoll_uk.ts \
../qtgui/i18n/recoll_xx.ts \