Changeset 13765

Timestamp:

2007-01-24T09:51:45+13:00 (17 years ago)

Author:

kjdon

Message:

changed OTHERDIRS to COMPILEDIRS and added all the common ones back in - need to compile in a certain order so can't just compile others then install ones

File:

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

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

@@ -47 +47 @@
 ALLFILES = $(OBJECTS)
 
+# indexers are treated slightly differently as we don't want to do make all/install
 INDEXERSDIR = indexers
-INSTALLDIRS = packages src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate packages src/oaiservr
+# all directories to be compiled
+COMPILEDIRS = packages lib src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/colservr src/recpt src/oaiservr
+# a subset of the directories get installed
+INSTALLDIRS = packages src/recpt src/txt2db src/db2txt src/hashfile src/getpw src/phind/generate src/oaiservr
 
 MODULEDIRS = @MODULEDIRS@
 
-OTHERDIRS = lib src/colservr 
 
 # we don't want to compile the java stuff in indexers for gs2
@@ -60 +63 @@
       (cd $$odir && $(MAKE) $(MDEFINES) nojava) || exit 1; \
     done
-    for odir in $(OTHERDIRS) $(INSTALLDIRS) $(MODULEDIRS); do \
+    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \
       echo making $@ in $$odir; \
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
@@ -80 +83 @@
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status
-    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
+    for subdir in $(COMPILEDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && if test -e Makefile; then $(MAKE) distclean;fi) || exit 1; \
@@ -86 +89 @@
 
 clean:
-    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
+    for subdir in $(COMPILEDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && if test -e Makefile; then $(MAKE) clean; fi) || exit 1; \