Changeset 16563 for gsdl/trunk/Makefile.in

Timestamp:

2008-07-28T16:53:09+12:00 (16 years ago)

Author:

davidb

Message:

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

File:

• gsdl/trunk/Makefile.in (modified) (5 diffs)

gsdl/trunk/Makefile.in

@@ -47 +47 @@
 ALLFILES = $(OBJECTS)
 
-# indexers are treated slightly differently as we don't want to do make all/install
-INDEXERSDIR = indexers
-# all directories should be compiled
-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
-# a subset of the directories get installed
-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
+
+COMPILEDIRS = gs2common gs2build gs2runtime
+
+INSTALLDIRS = gs2common gs2build gs2runtime
 
 MODULEDIRS = @MODULEDIRS@
@@ -59 +57 @@
 # we don't want to compile the jni stuff in indexers for gs2
 all:
-    for odir in $(INDEXERSDIR); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) gs2) || exit 1; \
-    done
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \
@@ -69 +63 @@
 
 install: all
-    for odir in $(INDEXERSDIR); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) install-gs2) || exit 1; \
-    done
-    cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper.jar bin/java/ 
     for idir in $(INSTALLDIRS); do \
       echo installing $$idir; \
@@ -81 +70 @@
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status
-    for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \
+    for subdir in $(COMPILEDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && $(MAKE) distclean) || exit 1; \
@@ -87 +76 @@
 
 clean:
-    for subdir in $(COMPILEDIRS) $(INDEXERSDIR); do \
+    for subdir in $(COMPILEDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && $(MAKE) clean) || exit 1; \