Show
Ignore:
Timestamp:
28.07.2008 16:53:09 (12 years ago)
Author:
davidb
Message:

Mods to Makefile.in and configure.in to work with newly organized files: gs2build gs2common and gs2runtime

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/Makefile.in

    r16525 r16563  
    4747ALLFILES = $(OBJECTS) 
    4848 
    49 # indexers are treated slightly differently as we don't want to do make all/install 
    50 INDEXERSDIR = indexers 
    51 # all directories should be compiled 
    52 COMPILEDIRS = packages src/lib src/gdbmedit/txt2db src/gdbmedit/db2txt src/gdbmedit/gdbmget src/gdbmedit/gdbmset src/hashfile src/getpw src/phind/generate src/colservr src/protocol src/z3950 src/recpt src/corba src/oaiservr 
    53 # a subset of the directories get installed 
    54 INSTALLDIRS = packages src/gdbmedit/db2txt src/gdbmedit/txt2db src/gdbmedit/gdbmget src/gdbmedit/gdbmset src/hashfile src/getpw src/phind/generate src/z3950 src/recpt src/corba src/oaiservr 
     49 
     50COMPILEDIRS = gs2common gs2build gs2runtime 
     51 
     52INSTALLDIRS = gs2common gs2build gs2runtime 
    5553 
    5654MODULEDIRS = @MODULEDIRS@ 
     
    5957# we don't want to compile the jni stuff in indexers for gs2 
    6058all: 
    61     for odir in $(INDEXERSDIR); do \ 
    62       echo making $@ in $$odir; \ 
    63       (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \ 
    64     done 
    6559    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
    6660      echo making $@ in $$odir; \ 
     
    6963 
    7064install: all 
    71     for odir in $(INDEXERSDIR); do \ 
    72       echo making $@ in $$odir; \ 
    73       (cd $$odir && $(MAKE) $(MDEFINES) install-gs2) || exit 1; \ 
    74     done 
    75     cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar bin/java/  
    7665    for idir in $(INSTALLDIRS); do \ 
    7766      echo installing $$idir; \ 
     
    8170distclean: clean 
    8271    rm -f Makefile config.cache config.h config.log stamp-h config.status 
    83     for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \ 
     72    for subdir in $(COMPILEDIRS); do \ 
    8473      echo cleaning $@ in $$subdir; \ 
    8574      (cd $$subdir && $(MAKE) distclean) || exit 1; \ 
     
    8776 
    8877clean: 
    89     for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \ 
     78    for subdir in $(COMPILEDIRS); do \ 
    9079      echo cleaning $@ in $$subdir; \ 
    9180      (cd $$subdir && $(MAKE) clean) || exit 1; \