Changeset 16525


Ignore:
Timestamp:
2008-07-24T09:59:51+12:00 (14 years ago)
Author:
kjdon
Message:

indexers makefile now has a gs2 target - does all compilation except for jni stuff. i.e. now includes lucene. top level makefile modified to use this

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/Makefile.in

    r15939 r16525  
    5757
    5858
    59 # we don't want to compile the java stuff in indexers for gs2
     59# we don't want to compile the jni stuff in indexers for gs2
    6060all:
    6161    for odir in $(INDEXERSDIR); do \
    6262      echo making $@ in $$odir; \
    63       (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
     63      (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \
    6464    done
    6565    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
     
    7171    for odir in $(INDEXERSDIR); do \
    7272      echo making $@ in $$odir; \
    73       (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
    74     done   
     73      (cd $$odir && $(MAKE) $(MDEFINES) install-gs2) || exit 1; \
     74    done
     75    cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar bin/java/
    7576    for idir in $(INSTALLDIRS); do \
    7677      echo installing $$idir; \
  • indexers/trunk/Makefile.in

    r13802 r16525  
    8585        done
    8686
     87# make everything except jni stuff
     88gs2:
     89    for odir in $(UNAC) lucene-gs; do \
     90          echo making $@ in $$odir; \
     91          (cd $$odir && $(MAKE) $(MDEFINES) all) || exit 1; \
     92        done
     93    for odir in mg mgpp; do \
     94          echo making $@ in $$odir; \
     95          (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
     96        done
     97
     98install-gs2:
     99    for odir in $(UNAC) lucene-gs; do \
     100          echo making $@ in $$odir; \
     101          (cd $$odir && $(MAKE) $(MDEFINES) install) || exit 1; \
     102        done
     103    for odir in mg mgpp; do \
     104          echo making $@ in $$odir; \
     105          (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
     106        done
     107
    87108
    88109distclean:
     
    92113        done
    93114    rm -f Makefile config.status config.log
     115
Note: See TracChangeset for help on using the changeset viewer.