Switch to unified view

a/src/Makefile.in b/src/Makefile.in
...
...
10
10
11
QMAKE = @QMAKE@
11
QMAKE = @QMAKE@
12
QTGUI = @QTGUI@
12
QTGUI = @QTGUI@
13
13
14
all: mk/sysconf common/rclversion.h
14
all: mk/sysconf common/rclversion.h
15
  cd lib; ${MAKE}
15
  ${MAKE} -C lib
16
  cd index; ${MAKE} recollindex
16
  ${MAKE} -C index recollindex
17
    @NOQTMAKE@cd $(QTGUI); ${QMAKE} recoll.pro; ${MAKE} depth=.. 
17
    @NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
18
  @NOQTMAKE@${MAKE} -C $(QTGUI) depth=..
18
    @NOCMDLINE@ cd query; ${MAKE} recollq
19
    @NOCMDLINE@ ${MAKE} -C query recollq
19
20
20
mk/sysconf:
21
mk/sysconf:
21
    @echo "You need to run configure first" ; exit 1
22
    @echo "You need to run configure first" ; exit 1
22
23
23
versfile=common/rclversion.h
24
versfile=common/rclversion.h
24
${versfile} : VERSION
25
${versfile} : VERSION
25
    echo 'static const char *rclversionstr = "'`cat VERSION`'";'>> ${versfile}
26
    echo 'static const char *rclversionstr = "'`cat VERSION`'";'>> ${versfile}
26
27
27
static: mk/sysconf common/rclversion.h
28
static: mk/sysconf common/rclversion.h
28
  cd lib; ${MAKE}
29
  ${MAKE} -C lib
29
  cd index; rm -f recollindex; \
30
  rm -f index/recollindex
30
      ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic \
31
    ${MAKE} -C index BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic \
31
            LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@" \
32
            LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@" \
32
           recollindex 
33
           recollindex 
33
    @NOQTMAKE@cd $(QTGUI); $(QMAKE) recoll.pro; \
34
    @NOQTMAKE@(cd $(QTGUI); $(QMAKE) recoll.pro)
34
    @NOQTMAKE@ rm -f recoll; \
35
    @NOQTMAKE@rm -f $(QTGUI)/recoll
35
    @NOQTMAKE@ ${MAKE} BSTATIC=-Wl,-Bstatic \
36
    @NOQTMAKE@${MAKE} -C $(QTGUI) BSTATIC=-Wl,-Bstatic \
36
    @NOQTMAKE@   BDYNAMIC=-Wl,-Bdynamic depth=.. \
37
    @NOQTMAKE@   BDYNAMIC=-Wl,-Bdynamic depth=.. \
37
    @NOQTMAKE@   LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@"
38
    @NOQTMAKE@   LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@"
38
39
39
clean:
40
clean:
40
  -cd common; ${MAKE} clean
41
  ${MAKE} -C common clean
41
  -cd index; ${MAKE} clean
42
  ${MAKE} -C index clean
42
  -cd internfile; ${MAKE} clean
43
  ${MAKE} -C internfile clean
43
  -cd lib; ${MAKE} clean
44
  ${MAKE} -C lib clean
44
  -cd query; ${MAKE} clean
45
  ${MAKE} -C query clean
45
  -cd utils; ${MAKE} clean
46
  ${MAKE} -C utils clean
46
        #cd doc/user; ${MAKE} clean
47
  @NOQTMAKE@@-${MAKE} -C $(QTGUI) clean
47
  @NOQTMAKE@@-cd qtgui; ${MAKE} clean
48
  @NOCMDLINE@ cd query; ${MAKE} clean
49
    rm -f qtgui/Makefile qtgui/confgui/Makefile qtgui/recoll
48
    rm -f qtgui/Makefile qtgui/confgui/Makefile qtgui/recoll
50
    rm -f common/rclversion.h
49
    rm -f common/rclversion.h
50
  rm -f filters/rclexecm.pyc
51
    rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui
51
    rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui
52
    rm -rf qtgui/.obj qtgui/.moc qtgui/.ui 
52
    rm -rf qtgui/.obj qtgui/.moc qtgui/.ui 
53
  rm -rf python/recoll/build
54
  rm -rf $(QTGUI)/recoll.app
53
55
54
# Note: we don't remove the top Makefile, to keep the "clean" targets
56
# Note: we don't remove the top Makefile, to keep the "clean" targets
55
# available but a "Make" won't work without a configure anyway
57
# available but a "Make" won't work without a configure anyway
56
distclean: clean
58
distclean: clean
57
    rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
59
    rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
...
...
59
       config.log config.status \
61
       config.log config.status \
60
       recollinstall \
62
       recollinstall \
61
       lib/*.dep common/autoconfig.h
63
       lib/*.dep common/autoconfig.h
62
    rm -f index/alldeps lib/alldeps query/alldeps bincimapmime/alldeps
64
    rm -f index/alldeps lib/alldeps query/alldeps bincimapmime/alldeps
63
    rm -rf autom4te.cache
65
    rm -rf autom4te.cache
64
  rm -f filters/rclexecm.pyc
65
66
66
maintainer-clean: distclean
67
maintainer-clean: distclean
67
    rm -f doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest
68
    rm -f doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest
68
    rm -f qtgui/i18n/*.qm
69
    rm -f qtgui/i18n/*.qm
69
70