a couple more prerelease fixes

diff --git a/Makefile.am b/Makefile.am
index d6596f039c80aefde7acacce07c5026940c7b176..ea4c6e19aa01bf9e5f9834e73692300a9588cb6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 122 1999-01-28 11:55:57Z phil $
+# $Id: Makefile.am 123 1999-01-28 19:48:49Z phil $
 
 MAINTAINERCLEANFILES = Makefile.in configure
 SUBDIRS = toolbox mm alpha jit comp nat threads mips tst
 
 EXTRA_DIST = html/cacaoinstall.html html/cacaoman.html html/index.html \
-                        doc/cacao.1
+                        doc
 
 CLEANFILES = @SYSDEP_DIR@/asmpart.o \
                         @SYSDEP_DIR@/asmpart.s \
@@ -16,7 +16,6 @@ CLEANFILES = @SYSDEP_DIR@/asmpart.o \
 
 bin_PROGRAMS = cacao
 noinst_PROGRAMS = cacaoh
-man_MANS = doc/cacao.1
 
 INCLUDES=-I/usr/include -I$(top_srcdir)/@SYSDEP_DIR@ -I$(top_srcdir)/jit -I@SYSDEP_DIR@ -I$(top_srcdir)
 

diff --git a/Makefile.in b/Makefile.in
index 34ed2a34dfcfbda6bdfd0a0a48c501c77b29b530..7147bc3d1a0a1eed53b79b43aa03a1924e1e66bc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# $Id: Makefile.in 122 1999-01-28 11:55:57Z phil $
+# $Id: Makefile.in 123 1999-01-28 19:48:49Z phil $
 
 
 SHELL = @SHELL@
@@ -76,7 +76,7 @@ VERSION = @VERSION@
 MAINTAINERCLEANFILES = Makefile.in configure
 SUBDIRS = toolbox mm alpha jit comp nat threads mips tst
 
-EXTRA_DIST = html/cacaoinstall.html html/cacaoman.html html/index.html                          doc/cacao.1
+EXTRA_DIST = html/cacaoinstall.html html/cacaoman.html html/index.html                          doc
 
 
 CLEANFILES = @SYSDEP_DIR@/asmpart.o                     @SYSDEP_DIR@/asmpart.s              @SYSDEP_DIR@/offsets.h              nativetable.hh                  nativetypes.hh
@@ -84,7 +84,6 @@ CLEANFILES = @SYSDEP_DIR@/asmpart.o                    @SYSDEP_DIR@/asmpart.s              @SYS
 
 bin_PROGRAMS = cacao
 noinst_PROGRAMS = cacaoh
-man_MANS = doc/cacao.1
 
 INCLUDES = -I/usr/include -I$(top_srcdir)/@SYSDEP_DIR@ -I$(top_srcdir)/jit -I@SYSDEP_DIR@ -I$(top_srcdir)
 
@@ -121,10 +120,6 @@ CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-man1dir = $(mandir)/man1
-MANS = $(man_MANS)
-
-NROFF = nroff
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
 Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 config.guess \
 config.h.in config.sub configure configure.in install-sh missing \
@@ -245,45 +240,6 @@ cacaoh: $(cacaoh_OBJECTS) $(cacaoh_DEPENDENCIES)
        @rm -f cacaoh
        $(LINK) $(cacaoh_LDFLAGS) $(cacaoh_OBJECTS) $(cacaoh_LDADD) $(LIBS)
 
-install-man1:
-       $(mkinstalldirs) $(DESTDIR)$(man1dir)
-       @list='$(man1_MANS)'; \
-       l2='$(man_MANS)'; for i in $$l2; do \
-         case "$$i" in \
-           *.1*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-         else file=$$i; fi; \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-         $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
-       done
-
-uninstall-man1:
-       @list='$(man1_MANS)'; \
-       l2='$(man_MANS)'; for i in $$l2; do \
-         case "$$i" in \
-           *.1*) list="$$list $$i" ;; \
-         esac; \
-       done; \
-       for i in $$list; do \
-         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-         echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-         rm -f $(DESTDIR)$(man1dir)/$$inst; \
-       done
-install-man: $(MANS)
-       @$(NORMAL_INSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) install-man1
-uninstall-man:
-       @$(NORMAL_UNINSTALL)
-       $(MAKE) $(AM_MAKEFLAGS) uninstall-man1
-
 # 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,
@@ -411,7 +367,7 @@ distdir: $(DISTFILES)
        -rm -rf $(distdir)
        mkdir $(distdir)
        -chmod 777 $(distdir)
-       $(mkinstalldirs) $(distdir)/doc $(distdir)/html
+       $(mkinstalldirs) $(distdir)/html
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
@@ -446,21 +402,21 @@ all-recursive-am: config.h
 install-exec-am: install-binPROGRAMS
 install-exec: install-exec-recursive
 
-install-data-am: install-man
+install-data-am:
 install-data: install-data-recursive
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-binPROGRAMS uninstall-man
+uninstall-am: uninstall-binPROGRAMS
 uninstall: uninstall-recursive
-all-am: Makefile $(PROGRAMS) $(MANS) config.h
+all-am: Makefile $(PROGRAMS) config.h
 all-redirect: all-recursive-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs: installdirs-recursive
 installdirs-am:
-       $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+       $(mkinstalldirs)  $(DESTDIR)$(bindir)
 
 
 mostlyclean-generic:
@@ -508,12 +464,11 @@ maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
 mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
 clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile install-man1 uninstall-man1 install-man \
-uninstall-man 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-compile 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 info-am info \
 dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \

diff --git a/configure b/configure
index 210003a372851d1017184d43f7167032a9750f00..582882b6d76e39fc6a3dc69f828af9753eabe6ce 100755 (executable)
--- a/configure
+++ b/configure
@@ -2428,6 +2428,7 @@ trap 'rm -fr `echo "Makefile \
           mips/Makefile \
           nat/Makefile \
           comp/Makefile \
+         doc/Makefile \
          tst/Makefile  config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -2536,6 +2537,7 @@ CONFIG_FILES=\${CONFIG_FILES-"Makefile \
           mips/Makefile \
           nat/Makefile \
           comp/Makefile \
+         doc/Makefile \
          tst/Makefile "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/configure.in b/configure.in
index 735b036c2467fa1fbed955e8cf7c676ee90b7302..4f0f485efcf7b13533713e06a429683dbb15c71e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -142,4 +142,5 @@ AC_OUTPUT(Makefile \
           mips/Makefile \
           nat/Makefile \
           comp/Makefile \
+         doc/Makefile \
          tst/Makefile )

diff --git a/main.c b/main.c
index 385dc95e07744c693f5ad8bd14b653bf46450b47..fd2ad97941ffa007af0a2046e56a38c4530cc188 100644 (file)
--- a/main.c
+++ b/main.c
@@ -17,7 +17,7 @@
                 Mark Probst         EMAIL: cacao@complang.tuwien.ac.at
                         Philipp Tomsich     EMAIL: cacao@complang.tuwien.ac.at
 
-       Last Change: $Id: main.c 88 1998-11-25 11:45:40Z phil $
+       Last Change: $Id: main.c 123 1999-01-28 19:48:49Z phil $
 
 *******************************************************************************/
 
@@ -203,7 +203,7 @@ static void print_usage()
 #ifdef OLD_COMPILER
        printf ("          -old ................. use old JIT compiler\n");
 #endif
-#ifdef NEW_GC
+#if 0
        printf ("          -gc1 ................. use the old garbage collector (default)\n");
        printf ("          -gc2 ................. use the new garbage collector\n");
 #endif

diff --git a/src/cacao/cacao.c b/src/cacao/cacao.c
index 0b9d8f8ec2cdd8380b4ced12657be6a224700c77..30534360cae9f069fc2cf5a37eb1144630f27932 100644 (file)
--- a/src/cacao/cacao.c
+++ b/src/cacao/cacao.c
@@ -17,7 +17,7 @@
                 Mark Probst         EMAIL: cacao@complang.tuwien.ac.at
                         Philipp Tomsich     EMAIL: cacao@complang.tuwien.ac.at
 
-       Last Change: $Id: cacao.c 88 1998-11-25 11:45:40Z phil $
+       Last Change: $Id: cacao.c 123 1999-01-28 19:48:49Z phil $
 
 *******************************************************************************/
 
@@ -203,7 +203,7 @@ static void print_usage()
 #ifdef OLD_COMPILER
        printf ("          -old ................. use old JIT compiler\n");
 #endif
-#ifdef NEW_GC
+#if 0
        printf ("          -gc1 ................. use the old garbage collector (default)\n");
        printf ("          -gc2 ................. use the new garbage collector\n");
 #endif