Changeset 13716 for trunk/indexers

Timestamp:

2007-01-22T16:24:50+13:00 (17 years ago)

Author:

kjdon

Message:

added nojava and install-nojava targets for use with gs2

Location:

trunk/indexers

Files:

• mg/Makefile.in (modified) (2 diffs)
• mgpp/Makefile.in (modified) (4 diffs)

trunk/indexers/mg/Makefile.in

@@ -46 +46 @@
 #infodir='$(infodir)' infodir='$(infodir)' libexecdir='$(libexecdir)'
 
-SUBDIRS = lib src/text src/images src/scripts java/org/greenstone/mg jni
+SUBDIRS = lib src/text src/images src/scripts 
+OTHERDIRS = java/org/greenstone/mg jni
 
 .SUFFIXES:
 
 all install uninstall execinstall execuninstall maninstall manuninstall: config.h
-    for subdir in $(SUBDIRS); do \
+    for subdir in $(SUBDIRS) $(JAVADIRS); do \
       echo making $@ in $$subdir; \
       (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
 
-javaonly:
-    cd java/org/greenstone/mg && $(MAKE) $(MDEFINES) all
+nojava: 
+    for subdir in $(SUBDIRS); do \
+      echo making $@ in $$subdir; \
+      (cd $$subdir && $(MAKE) $(MDEFINES) all) || exit 1; \
+    done
 
-installjava:
-    cd java/org/greenstone/mg && $(MAKE) $(MDEFINES) install
-
-# Have not written any texinfo files for the documentation yet
-#info dvi:
-#   cd doc && $(MAKE) $@
+install-nojava: 
+    for subdir in $(SUBDIRS); do \
+      echo making $@ in $$subdir; \
+      (cd $$subdir && $(MAKE) $(MDEFINES) install) || exit 1; \
+    done
 
 check: all
@@ -81 +84 @@
 
 mostlyclean-recursive clean-recursive distclean-recursive maintainer-clean-recursive:
-    for subdir in $(SUBDIRS); do \
+    for subdir in $(SUBDIRS) $(OTHERDIRS); do \
       target=`echo $@ | sed 's/-recursive//'`; \
       echo making $$target in $$subdir; \

trunk/indexers/mgpp/Makefile.in

@@ -1 @@
-# Main Makefile for GNU tar.
+ # Main Makefile for MGPP
 # Copyright (C) 1994, 1995 Free Software Foundation, Inc.
  
@@ -47 +47 @@
 #infodir='$(infodir)' infodir='$(infodir)' libexecdir='$(libexecdir)'
 
-SUBDIRS = lib text java/org/greenstone/mgpp jni
-
+SUBDIRS = lib text 
+JAVADIRS = java/org/greenstone/mgpp jni
 
 .SUFFIXES:
@@ -54 +54 @@
 all install uninstall execinstall execuninstall maninstall manuninstall:
 #config.h
-    for subdir in $(SUBDIRS); do \
+    for subdir in $(SUBDIRS) $(JAVADIRS); do \
       echo making $@ in $$subdir; \
       (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
 
-javaonly:
-    cd java/org/greenstone/mgpp && $(MAKE) $(MDEFINES) all 
+nojava: 
+    for subdir in $(SUBDIRS); do \
+      echo making $@ in $$subdir; \
+      (cd $$subdir && $(MAKE) $(MDEFINES) all) || exit 1; \
+    done
 
-installjava:
-    cd java/org/greenstone/mgpp && $(MAKE) $(MDEFINES) install
+install-nojava: 
+    for subdir in $(SUBDIRS); do \
+      echo making $@ in $$subdir; \
+      (cd $$subdir && $(MAKE) $(MDEFINES) install) || exit 1; \
+    done
 
-# Have not written any texinfo files for the documentation yet
-#info dvi:
-#   cd doc && $(MAKE) $@
 
 mostlyclean: mostlyclean-recursive mostlyclean-local
@@ -81 +84 @@
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-    for subdir in $(SUBDIRS); do \
+    for subdir in $(SUBDIRS) $(OTHERDIRS); do \
       target=`echo $@ | sed 's/-recursive//'`; \
       echo making $$target in $$subdir; \