Changeset 7726

Timestamp:

2004-07-08T11:37:36+12:00 (20 years ago)

Author:

kjdon

Message:

some mods

File:

• trunk/gsdl3/Makefile.in (modified) (3 diffs)

trunk/gsdl3/Makefile.in

@@ -48 +48 @@
 ALLFILES = $(OBJECTS)
 
-INSTALLDIRS = packages/mg packages packages/mgpp
-
-MODULEDIRS = @MODULEDIRS@
-
-OTHERDIRS = packages packages/mg packages/mgpp
+SRCDIRS = packages src/java 
+DOCDIRS = docs
 
 all:
-    for odir in $(OTHERDIRS); do \
-      echo making $@ in $$odir; \
-      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
+    for subdir in $(SRCDIRS); do \
+      echo making $@ in $$subdir; \
+      (cd $$subdir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
 
-#   for odir in $(MODULEDIRS); do \
-#     echo making $@ in $$odir; \
-#     (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
-#   done
+docs: 
+    for subdir in $(DOCDIRS); do \
+      echo making $@ in $$subdir; \
+      (cd $$subdir && $(MAKE) docs) || exit 1; \
+    done    
 
 install: all
 
-    for idir in $(INSTALLDIRS); do \
-      echo installing $$idir; \
-      (cd $$idir && $(MAKE) install) || exit 1; \
+    for subdir in $(SRCDIRS); do \
+      echo installing $$subdir; \
+      (cd $$subdir && $(MAKE) install) || exit 1; \
     done
 
-# added test to check existence of Makefile, as src/recpt is in
-# both INSTALLDIRS and OTHERDIRS - can't make distclean twice!
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status
-    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
+    for subdir in $(SRCDIRS) $(DOCDIRS); do \
       echo cleaning $@ in $$subdir; \
-      (cd $$subdir && if test -e Makefile; then $(MAKE) distclean;fi) || exit 1; \
+      (cd $$subdir && $(MAKE) distclean) || exit 1; \
     done
 
 clean:
-    for subdir in $(INSTALLDIRS) $(OTHERDIRS); do \
+    for subdir in $(SRCDIRS) $(DOCDIRS); do \
       echo cleaning $@ in $$subdir; \
       (cd $$subdir && $(MAKE) clean) || exit 1; \
@@ -93 +89 @@
 config.status: configure
     ./config.status --recheck
-configure: configure.in aclocal.m4
+configure: configure.ac aclocal.m4
     cd $(srcdir) && autoconf
 
@@ -100 +96 @@
     CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
 config.h.in: stamp-h.in
-stamp-h.in: configure.in aclocal.m4 acconfig.h
+stamp-h.in: configure.ac aclocal.m4 acconfig.h
     cd $(srcdir) && autoheader
     $(TOUCH) $(srcdir)/stamp-h.in