Changeset 13723


Ignore:
Timestamp:
2007-01-22T16:46:56+13:00 (15 years ago)
Author:
kjdon
Message:

mg and mgpp now in indexers. want to use nojava instead of all, and install-nojava instead of install as these packages now come with java/jni wrapper which is not needed for gs2. also changed the OTHERDIRS and INSTALLDIRS lists so no overlap

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/changing-indexers-branch/gsdl/Makefile.in

    r9742 r13723  
    4747ALLFILES = $(OBJECTS)
    4848
    49 INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile src/getpw packages/mg src/phind/generate packages src/mgpp src/oaiservr
     49INDEXERSDIR = indexers
     50INSTALLDIRS = packages src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate packages src/oaiservr
    5051
    5152MODULEDIRS = @MODULEDIRS@
    5253
    53 OTHERDIRS = packages packages/mg lib src/mgpp src/colservr src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/oaiservr
     54OTHERDIRS = lib src/colservr
    5455
     56# we don't want to compile the java stuff in indexers for gs2
    5557all:
    56     for odir in $(OTHERDIRS) $(MODULEDIRS); do \
     58    for odir in $(INDEXERSDIR); do \
     59      echo making $@ in $$odir; \
     60      (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
     61    done
     62    for odir in $(OTHERDIRS) $(INSTALLDIRS) $(MODULEDIRS); do \
    5763      echo making $@ in $$odir; \
    5864      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     
    6066
    6167install: all
    62 
     68    for odir in $(INDEXERSDIR); do \
     69      echo making $@ in $$odir; \
     70      (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
     71    done   
    6372    for idir in $(INSTALLDIRS); do \
    6473      echo installing $$idir; \
     
    6877# added test to check existence of Makefile, as src/recpt is in
    6978# both INSTALLDIRS and OTHERDIRS - can't make distclean twice!
     79# do we need this test now??
    7080distclean: clean
    7181    rm -f Makefile config.cache config.h config.log stamp-h config.status
Note: See TracChangeset for help on using the changeset viewer.