Ignore:
Timestamp:
2009-12-09T21:49:32+13:00 (14 years ago)
Author:
ak19
Message:

Changes to makefiles, configure files, and source code to work with the new configure flags that allow indexers to be individually compiled up by setting each indexer to be enabled or disabled (enable-mg, enable-mgpp, enable-lucene).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/Makefile.in

    r19876 r21328  
    3737endif
    3838
    39 INDEXERDIRS = $(UNAC) mg mgpp lucene-gs
     39ENABLE_MG=@ENABLE_MG@
     40ifeq ($(ENABLE_MG), 1)
     41MG=mg
     42else
     43MG=
     44endif
     45
     46ENABLE_MGPP=@ENABLE_MGPP@
     47ifeq ($(ENABLE_MGPP), 1)
     48MGPP=mgpp
     49else
     50MGPP=
     51endif
     52
     53ENABLE_LUCENE=@ENABLE_LUCENE@
     54ifeq ($(ENABLE_LUCENE), 1)
     55LUCENE=lucene-gs
     56else
     57LUCENE=
     58endif
     59
     60INDEXERDIRS = $(UNAC) $(MG) $(MGPP) $(LUCENE)
     61
    4062
    4163all install clean:
    4264    for odir in $(INDEXERDIRS); do \
    43           echo making $@ in $$odir; \
    44           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     65      if test -d $$odir; then \
     66        echo making $@ in $$odir; \
     67        (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     68      fi; \
    4569        done
    4670
     
    5074          (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
    5175        done
    52     for odir in mg mgpp; do \
     76    for odir in $(MG) $(MGPP); do \
    5377          echo making $@ in $$odir; \
    5478          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     
    6084          (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
    6185        done
    62     for odir in mg mgpp; do \
     86    for odir in $(MG) $(MGPP); do \
    6387          echo making $@ in $$odir; \
    6488          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     
    6690
    6791javaonly:
    68     for odir in mg mgpp; do \
     92    for odir in $(MG) $(MGPP); do \
    6993          echo making $@ in $$odir; \
    7094          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
    7195        done
    72     for odir in lucene-gs; do \
     96    for odir in $(LUCENE); do \
    7397          echo making $@ in $$odir; \
    7498          (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
     
    76100
    77101install-javaonly:
    78     for odir in mg mgpp; do \
     102    for odir in $(MG) $(MGPP); do \
    79103          echo making $@ in $$odir; \
    80104          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
    81105        done
    82     for odir in lucene-gs; do \
     106    for odir in $(LUCENE); do \
    83107          echo making $@ in $$odir; \
    84108          (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
     
    87111# make everything except jni stuff
    88112gs2:
    89     for odir in $(UNAC) lucene-gs; do \
     113    for odir in $(UNAC) $(LUCENE); do \
    90114          echo making $@ in $$odir; \
    91115          (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
    92116        done
    93     for odir in mg mgpp; do \
     117    for odir in $(MG) $(MGPP); do \
    94118          echo making $@ in $$odir; \
    95119          (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
     
    97121
    98122install-gs2:
    99     for odir in $(UNAC) lucene-gs; do \
     123    for odir in $(UNAC) $(LUCENE); do \
    100124          echo making $@ in $$odir; \
    101125          (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
    102126        done
    103     for odir in mg mgpp; do \
     127    for odir in $(MG) $(MGPP); do \
    104128          echo making $@ in $$odir; \
    105129          (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
     
    108132distclean:
    109133    for odir in $(INDEXERDIRS); do \
    110           echo making $@ in $$odir; \
    111           (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     134      if test -d $$odir; then \
     135        echo making $@ in $$odir; \
     136        (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     137      fi; \
    112138        done
    113139    rm -f Makefile config.status config.log
Note: See TracChangeset for help on using the changeset viewer.