guile/guile-oops Makefile.am Makefile.in config...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/03/05 12:00:09

Modified files:
        guile-oops     : Makefile.am Makefile.in configure configure.in 

Log message:
        Fixed configuration

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/Makefile.am.diff?r1=1.36&r2=1.37
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/Makefile.in.diff?r1=1.43&r2=1.44
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/configure.diff?r1=1.18&r2=1.19
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/configure.in.diff?r1=1.18&r2=1.19

Patches:
Index: guile/guile-oops/Makefile.am
diff -u guile/guile-oops/Makefile.am:1.36 guile/guile-oops/Makefile.am:1.37
--- guile/guile-oops/Makefile.am:1.36   Sun Mar  4 21:33:02 2001
+++ guile/guile-oops/Makefile.am        Mon Mar  5 12:00:08 2001
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+SUBDIRS = debian
+
 lib_LTLIBRARIES = libgoopscore.la
 bin_PROGRAMS = guile-oops
 
@@ -37,9 +39,11 @@
 
 man_MANS = guile-oops.1
 
-miscdocs = ANON-CVS COPYRIGHTS HACKING SNAPSHOTS TAGS TODO mop.text
+miscdocs = \
+       ANON-CVS COPYRIGHTS HACKING SNAPSHOTS TAGS TODO mop.text guile-oops.1
 
-EXTRA_DIST = $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION 
relpath
+EXTRA_DIST = \
+       $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION relpath
 
 RELPATH = guile -e main -s $(srcdir)/relpath
 
Index: guile/guile-oops/Makefile.in
diff -u guile/guile-oops/Makefile.in:1.43 guile/guile-oops/Makefile.in:1.44
--- guile/guile-oops/Makefile.in:1.43   Sun Mar  4 21:33:02 2001
+++ guile/guile-oops/Makefile.in        Mon Mar  5 12:00:08 2001
@@ -85,6 +85,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+SUBDIRS = debian
+
 lib_LTLIBRARIES = libgoopscore.la
 bin_PROGRAMS = guile-oops
 
@@ -116,11 +118,13 @@
 goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt
 
 man_MANS = guile-oops.1
+
+miscdocs =     ANON-CVS COPYRIGHTS HACKING SNAPSHOTS TAGS TODO mop.text 
guile-oops.1
 
-miscdocs = ANON-CVS COPYRIGHTS HACKING SNAPSHOTS TAGS TODO mop.text
 
-EXTRA_DIST = $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION 
relpath
+EXTRA_DIST =   $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION 
relpath
 
+
 RELPATH = guile -e main -s $(srcdir)/relpath
 
 SUFFIXES = .x
@@ -513,6 +517,61 @@
          rm -f $(DESTDIR)$(includedir)/$$p; \
        done
 
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+#     (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+
address@hidden@
+
+all-recursive install-data-recursive install-exec-recursive \
+installdirs-recursive install-recursive uninstall-recursive  \
+check-recursive installcheck-recursive info-recursive dvi-recursive:
+       @set fnord $(MAKEFLAGS); amf=$$2; \
+       dot_seen=no; \
+       target=`echo $@ | sed s/-recursive//`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           dot_seen=yes; \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+       done; \
+       if test "$$dot_seen" = "no"; then \
+         $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+       fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+       @set fnord $(MAKEFLAGS); amf=$$2; \
+       dot_seen=no; \
+       rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+         rev="$$subdir $$rev"; \
+         test "$$subdir" = "." && dot_seen=yes; \
+       done; \
+       test "$$dot_seen" = "no" && rev=". $$rev"; \
+       target=`echo $@ | sed s/-recursive//`; \
+       for subdir in $$rev; do \
+         echo "Making $$target in $$subdir"; \
+         if test "$$subdir" = "."; then \
+           local_target="$$target-am"; \
+         else \
+           local_target="$$target"; \
+         fi; \
+         (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+          || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
+       done && test -z "$$fail"
+tags-recursive:
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+         test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); 
\
+       done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -523,9 +582,14 @@
        here=`pwd` && cd $(srcdir) \
          && mkid -f$$here/ID $$unique $(LISP)
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
        tags=; \
        here=`pwd`; \
+       list='$(SUBDIRS)'; for subdir in $$list; do \
+   if test "$$subdir" = .; then :; else \
+           test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+   fi; \
+       done; \
        list='$(SOURCES) $(HEADERS)'; \
        unique=`for i in $$list; do echo $$i; done | \
          awk '    { files[$$0] = 1; } \
@@ -595,6 +659,16 @@
            || cp -p $$d/$$file $(distdir)/$$file || :; \
          fi; \
        done
+       for subdir in $(SUBDIRS); do \
+         if test "$$subdir" = .; then :; else \
+           test -d $(distdir)/$$subdir \
+           || mkdir $(distdir)/$$subdir \
+           || exit 1; \
+           chmod 777 $(distdir)/$$subdir; \
+           (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) 
distdir=../$(distdir)/$$subdir distdir) \
+             || exit 1; \
+         fi; \
+       done
        $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" 
distdir="$(distdir)" dist-info
        $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" 
distdir="$(distdir)" dist-hook
 
@@ -630,37 +704,38 @@
            >> .deps/$(*F).P; \
        rm -f .deps/$(*F).pp
 info-am: $(INFO_DEPS)
-info: info-am
+info: info-recursive
 dvi-am: $(DVIS)
-dvi: dvi-am
+dvi: dvi-recursive
 check-am: all-am
-check: check-am
+check: check-recursive
 installcheck-am:
-installcheck: installcheck-am
+installcheck: installcheck-recursive
 install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-install-exec: install-exec-am
+install-exec: install-exec-recursive
 
 install-data-am: install-info-am install-man install-goopsdataDATA \
                install-modincludeDATA install-subpkgdataDATA \
                install-includeHEADERS
-install-data: install-data-am
+install-data: install-data-recursive
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
+install: install-recursive
 uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
                uninstall-info uninstall-man uninstall-goopsdataDATA \
                uninstall-modincludeDATA uninstall-subpkgdataDATA \
                uninstall-includeHEADERS
-uninstall: uninstall-am
+uninstall: uninstall-recursive
 all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) \
                $(HEADERS)
-all-redirect: all-am
+all-redirect: all-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
+installdirs: installdirs-recursive
+installdirs-am:
        $(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
                $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1 \
                $(DESTDIR)$(goopsdatadir) $(DESTDIR)$(modincludedir) \
@@ -683,13 +758,13 @@
                mostlyclean-aminfo mostlyclean-tags mostlyclean-depend \
                mostlyclean-generic
 
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
 
 clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool \
                clean-binPROGRAMS clean-aminfo clean-tags clean-depend \
                clean-generic mostlyclean-am
 
-clean: clean-am
+clean: clean-recursive
 
 distclean-am:  distclean-libLTLIBRARIES distclean-compile \
                distclean-libtool distclean-binPROGRAMS \
@@ -697,7 +772,7 @@
                distclean-generic clean-am
        -rm -f libtool
 
-distclean: distclean-am
+distclean: distclean-recursive
        -rm -f config.status
 
 maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
@@ -708,7 +783,7 @@
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
        -rm -f config.status
 
 .PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
@@ -723,13 +798,18 @@
 uninstall-man1 install-man uninstall-man uninstall-goopsdataDATA \
 install-goopsdataDATA uninstall-modincludeDATA install-modincludeDATA \
 uninstall-subpkgdataDATA install-subpkgdataDATA \
-uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \
+uninstall-includeHEADERS install-includeHEADERS install-data-recursive \
+uninstall-data-recursive install-exec-recursive \
+uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+all-recursive check-recursive installcheck-recursive info-recursive \
+dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info-am info dvi-am dvi check check-am \
 installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
+all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
Index: guile/guile-oops/configure
diff -u guile/guile-oops/configure:1.18 guile/guile-oops/configure:1.19
--- guile/guile-oops/configure:1.18     Sun Mar  4 21:33:02 2001
+++ guile/guile-oops/configure  Mon Mar  5 12:00:08 2001
@@ -1757,7 +1757,7 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile versiondat.h debian/libgoops5.links" | sed "s/:[^ 
]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile versiondat.h debian/Makefile 
debian/libgoops5.links" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1870,7 +1870,7 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile versiondat.h debian/libgoops5.links"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile versiondat.h debian/Makefile 
debian/libgoops5.links"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
Index: guile/guile-oops/configure.in
diff -u guile/guile-oops/configure.in:1.18 guile/guile-oops/configure.in:1.19
--- guile/guile-oops/configure.in:1.18  Sun Mar  4 21:33:02 2001
+++ guile/guile-oops/configure.in       Mon Mar  5 12:00:08 2001
@@ -71,7 +71,7 @@
 
 AC_SUBST(LIBLOBJS)
 
-AC_OUTPUT(Makefile versiondat.h debian/libgoops5.links)
+AC_OUTPUT(Makefile versiondat.h debian/Makefile debian/libgoops5.links)
 
 dnl Local Variables:
 dnl comment-start: "dnl "