Switch to unified view

a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in
1
TEMPLATE        = app
1
TEMPLATE        = app
2
LANGUAGE        = C++
2
LANGUAGE        = C++
3
3
4
@QMAKE_ENABLE_WEBKIT@QT += webkit
4
@QMAKE_ENABLE_WEBKIT@ QT += webkit
5
@QMAKE_DISABLE_WEBKIT@QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER -DSNIPPETS_TEXTBROWSER
5
@QMAKE_DISABLE_WEBKIT@ QMAKE_CXXFLAGS += -DRESLIST_TEXTBROWSER -DSNIPPETS_TEXTBROWSER
6
6
7
@QMAKE_ENABLE_ZEITGEIST@QT += dbus
7
@QMAKE_ENABLE_ZEITGEIST@ QT += dbus
8
@QMAKE_ENABLE_ZEITGEIST@QMAKE_CXXFLAGS += -DUSE_ZEITGEIST
8
@QMAKE_ENABLE_ZEITGEIST@ QMAKE_CXXFLAGS += -DUSE_ZEITGEIST
9
9
10
QT += xml
10
QT += xml
11
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets printsupport
11
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets webkitwidgets printsupport
12
12
13
CONFIG  += qt warn_on thread release 
13
CONFIG  += qt warn_on thread release 
...
...
92
92
93
unix {
93
unix {
94
  UI_DIR = .ui
94
  UI_DIR = .ui
95
  MOC_DIR = .moc
95
  MOC_DIR = .moc
96
  OBJECTS_DIR = .obj
96
  OBJECTS_DIR = .obj
97
  # Note: libdir may be substituted with sthing like $(exec_prefix)/lib
98
  # at this point and will go as such in the Makefile. Expansion will be
99
  # completed at make time.
100
  LIBS += $(BSTATIC) -L../lib -lrecoll
97
  LIBS += -L../.libs -lrecoll
101
98
102
  !macx {
99
  !macx {
100
    # Note: libdir may be substituted with sthing like $(exec_prefix)/lib
101
    # at this point and will go as such in the Makefile. Expansion will be
102
    # completed at make time.
103
    LIBS += -Wl,-rpath=@libdir@/recoll
103
    LIBS += -Wl,-rpath=@libdir@/recoll
104
  }
104
  }
105
105
106
  LIBS +=  @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
106
  LIBS +=  @LIBXAPIAN@ $(LIBXAPIANSTATICEXTRA) \
107
       @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
107
       @LIBICONV@ $(BDYNAMIC) @LIBQZEITGEIST@ -lz
108
108
109
  INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
109
  INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
110
              ../utils ../aspell ../rcldb ../qtgui \
110
              ../utils ../aspell ../rcldb ../qtgui \
111
              confgui
111
              confgui
112
  DEPENDPATH += $$INCLUDEPATH
112
  DEPENDPATH += $$INCLUDEPATH
113
  POST_TARGETDEPS = ../lib/librecoll.a
114
}
113
}
115
114
116
UNAME = $$system(uname -s)
115
UNAME = $$system(uname -s)
117
contains( UNAME, [lL]inux ) {
116
contains( UNAME, [lL]inux ) {
118
      LIBS += -ldl -lX11
117
      LIBS += -ldl -lX11
...
...
139
             i18n/recoll_tr.ts \
138
             i18n/recoll_tr.ts \
140
             i18n/recoll_uk.ts \
139
             i18n/recoll_uk.ts \
141
             i18n/recoll_xx.ts \
140
             i18n/recoll_xx.ts \
142
             i18n/recoll_zh_CN.ts \
141
             i18n/recoll_zh_CN.ts \
143
             i18n/recoll_zh.ts \
142
             i18n/recoll_zh.ts \
143
144
unix {
145
  isEmpty(PREFIX) {
146
    PREFIX = /usr/local
147
  }
148
  message("Prefix is $$PREFIX")
149
  DEFINES += PREFIX=\\\"$$PREFIX\\\"
150
151
 # Installation stuff
152
  target.path = "$$PREFIX/bin"
153
154
  imdata.files = mtpics/*.png
155
  imdata.path = $$PREFIX/share/recoll/images
156
  trdata.files = i18n/*.qm
157
  trdata.path = $$PREFIX/share/recoll/translations
158
  desktop.files += ../desktop/recoll-searchgui.desktop
159
  desktop.path = $$PREFIX/share/applications/
160
  icona.files += ../desktop/recoll.png
161
  icona.path = $$PREFIX/share/icons/hicolor/48x48/apps/
162
  iconb.files += ../desktop/recoll.png
163
  iconb.path = $$PREFIX/share/pixmaps/
164
  appdata.files = ../desktop/recoll.appdata.xml
165
  appdata.path = $$PREFIX/share/appdata/
166
  INSTALLS += target imdata trdata desktop icona iconb appdata
167
168
  # The recollinstall script used to do the following to install zh_CN as
169
  # zh. Is this still needed?
170
  #${INSTALL} -m 0444 ${I18N}/recoll_zh_CN.qm \
171
  #  ${datadir}/recoll/translations/recoll_zh.qm || exit 1
172
}