Changeset 13723

Timestamp:

2007-01-22T16:46:56+13:00 (17 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:

• branches/changing-indexers-branch/gsdl/Makefile.in (modified) (3 diffs)

branches/changing-indexers-branch/gsdl/Makefile.in

@@ -47 +47 @@
 ALLFILES = $(OBJECTS)
 
-INSTALLDIRS = src/recpt src/txt2db src/db2txt src/hashfile src/getpw packages/mg src/phind/generate packages src/mgpp src/oaiservr
+INDEXERSDIR = indexers
+INSTALLDIRS = packages src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate packages src/oaiservr
 
 MODULEDIRS = @MODULEDIRS@
 
-OTHERDIRS = packages packages/mg lib src/mgpp src/colservr src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/oaiservr
+OTHERDIRS = lib src/colservr 
 
+# we don't want to compile the java stuff in indexers for gs2
 all:
-    for odir in $(OTHERDIRS) $(MODULEDIRS); do \
+    for odir in $(INDEXERSDIR); do \
+      echo making $@ in $$odir; \
+      (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
+    done
+    for odir in $(OTHERDIRS) $(INSTALLDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
@@ -60 +66 @@
 
 install: all
-
+    for odir in $(INDEXERSDIR); do \
+      echo making $@ in $$odir; \
+      (cd $$odir && $(MAKE) $(MDEFINES) install-nojava) || exit 1; \
+    done    
     for idir in $(INSTALLDIRS); do \
       echo installing $$idir; \
@@ -68 +77 @@
 # added test to check existence of Makefile, as src/recpt is in
 # both INSTALLDIRS and OTHERDIRS - can't make distclean twice!
+# do we need this test now??
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status