--- gforth/Makefile.in 2008/11/01 17:10:57 1.434 +++ gforth/Makefile.in 2009/03/17 17:35:02 1.444 @@ -82,7 +82,7 @@ BUILDFORTH = $(ENGINE) --die-on-signal - # the forth system plus flags we use to build FORTHB = $(BUILDFORTH) exboot.fs -e 'fpath= .|~+|$(srcdir)' # the Forth system for running prims2x.fs -FORTHP = $(FORTH) +#FORTHP = $(FORTH) ENGINE_FAST = ./gforth-fast FORTH_FAST = $(ENGINE_FAST) $(FORTH_ARGS) FORTHKFLAGS= --die-on-signal -p ".$(PATHSEP)~+$(PATHSEP)$(srcdir)" -i $(kernel_fi) @@ -143,14 +143,14 @@ siteforthdir=$(datadir)/gforth/site-fort PROFOBJS = @PROFOBJS@ PROFEXES = @PROFEXES@ -CVSDIRS = CVS engine/CVS kernel/CVS doc/CVS asm/CVS ec/CVS test/CVS \ - compat/CVS unix/CVS \ - arch/CVS arch/generic/CVS arch/m68k/CVS arch/mips/CVS \ - arch/386/CVS arch/hppa/CVS arch/sparc/CVS arch/power/CVS \ - arch/alpha/CVS arch/4stack/CVS arch/misc/CVS arch/6502/CVS \ - arch/8086/CVS arch/avr/CVS arch/c165/CVS arch/h8/CVS \ - arch/shboom/CVS arch/sharc/CVS arch/ia64/CVS arch/amd64/CVS \ - arch/arm/CVS arch/r8c/CVS +INSTALLDIRS = kernel doc asm ec test \ + compat unix \ + arch arch/generic arch/m68k arch/mips \ + arch/386 arch/hppa arch/sparc arch/power \ + arch/alpha arch/4stack arch/misc arch/6502 \ + arch/8086 arch/avr arch/c165 arch/h8 \ + arch/shboom arch/sharc arch/ia64 arch/amd64 \ + arch/arm arch/r8c INCLUDES = engine/forth.h engine/threaded.h engine/io.h engine/longlong.h @@ -355,7 +355,14 @@ ARCHS = \ arch/sharc/g21k-3.3.4-bp1.diff \ arch/r8c/asm.fs \ arch/r8c/mach.fs \ - arch/r8c/prim.fs + arch/r8c/errors.fs \ + arch/r8c/prim.fs \ + arch/r8c/asm-test.fs \ + arch/r8c/errors.fs \ + arch/r8c/lauflicht.fs \ + arch/r8c/tasker.fs \ + arch/r8c/terminal.fs \ + arch/sharc/unistd.h #not included in distribution until distribution terms are included: ARCHS_NO_DIST = \ @@ -372,15 +379,9 @@ ARCHS_NO_DIST = \ arch/c165/mach.fs \ arch/c165/prim.fs \ arch/h8/asm.fs \ - arch/r8c/asm-test.fs \ - arch/r8c/errors.fs \ - arch/r8c/lauflicht.fs \ - arch/r8c/tasker.fs \ - arch/r8c/terminal.fs \ - arch/r8c/tt.fs \ - arch/sharc/unistd.h + arch/r8c/tt.fs -VMGEN_EX = vmgen-ex/CVS vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ +VMGEN_EX = vmgen-ex/Makefile vmgen-ex/README vmgen-ex/disasm.c \ vmgen-ex/engine.c vmgen-ex/fib.mini \ vmgen-ex/mini-inst.vmg vmgen-ex/mini-super.vmg vmgen-ex/mini.h \ vmgen-ex/mini.l vmgen-ex/mini.y vmgen-ex/peephole-blacklist \ @@ -403,7 +404,7 @@ ENGINE_SOURCES = engine/Makefile.in engi engine/fnmatch.h engine/fnmatch.c \ engine/makefile.dos engine/makefile.os2 -SOURCES = $(CVSDIRS) $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ +SOURCES = $(ENGINE_SOURCES) compat Makefile.in Makedist.in \ gforthmi.in vmgen.in preforth.in gfgen README.vmgen NEWS.vmgen \ autogen.sh configure.in configure config.sub config.guess \ elisp-comp missing stamp-h.in envos.fs.in \ @@ -478,6 +479,9 @@ all: kernel/version.fs more check # use this dependency for phony targets just as mostlyclean,... FORCE: ; +#targets of failed commands should be deleted: +.DELETE_ON_ERROR: + #this rule avoids remaking everything after minor changes in Makefile.in version: Makefile.in configure.in if test -r $@ && test x'$(VERSION)' = x`cat $@` ; then true ; else echo $(VERSION) > $@ ; fi @@ -639,16 +643,16 @@ installdirs: mkinstalldirs for i in $(bindir) $(man1dir) $(infodir) $(libdir)/gforth/$(VERSION) $(datadir)/gforth/$(VERSION) $(libdir)/gforth/site-forth $(siteforthdir) $(includedir)/gforth/$(VERSION) $(libccdir); do \ $(srcdir)/mkinstalldirs $(DESTDIR)$$i; \ done - for i in $(CVSDIRS); do \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/`dirname $$i`; \ + # + for i in $(INSTALLDIRS); do \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/gforth/$(VERSION)/$$i; \ done - $(RM) -rf $(DESTDIR)$(datadir)/gforth/$(VERSION)/engine #deinstall all files specific to this version of gforth #to uninstall version foo, type `make uninstall VERSION=foo' uninstall: FORCE $(NORMAL_UNINSTALL) - -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION) + -$(RM) -rf $(DESTDIR)$(libdir)/gforth/$(VERSION) $(DESTDIR)$(datadir)/gforth/$(VERSION) $(DESTDIR)$(bindir)/gforth-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc-$(VERSION)$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi-$(VERSION) $(DESTDIR)$(bindir)/vmgen-$(VERSION) $(DESTDIR)$(includedir)/gforth/$(VERSION) @echo -e "To remove Gforth completely, type\n$(RM) -rf $(DESTDIR)$(bindir)/gforth$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-fast$(EC)$(EXE) $(DESTDIR)$(bindir)/gforth-itc$(EC)$(EXE) $(DESTDIR)$(bindir)/gforthmi $(DESTDIR)$(bindir)/vmgen $(DESTDIR)$(man1dir)/gforth.1 $(DESTDIR)$(infodir)/gforth.info* $(DESTDIR)$(datadir)/gforth $(DESTDIR)$(libdir)/gforth" build-libcc-named: $(LIBCC_BUILD_SRC) $(FORTH_GEN) $(GEN) FORCE @@ -879,8 +883,8 @@ TAGS: gforth.TAGS tags: gforth.tags $(CP) gforth.tags $@ -install.TAGS: TAGS - sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' install-tags.fs -e bye >install.TAGS +install.TAGS: TAGS install-tags.fs + sed 's;^\$(srcdir)/;;' TAGS|./gforth -e 's" '$(datadir)/gforth/$(VERSION)/'"' $(srcdir)/install-tags.fs -e bye >install.TAGS gforth.TAGS: @kernel_fi@ gforth$(EC)$(EXE) $(GFORTH_FI_SRC) prim.TAGS kernel.TAGS $(FORTHK) etags.fs except.fs startup.fs -e bye @@ -1008,14 +1012,18 @@ config.status: configure ./config.status --recheck #create files for DOS, because DOS cannot do it itself -makefile.dos engine/makefile.dos: mkdosmf.sed Makefile.in engine/Makefile.in +makefile.dos: mkdosmf.sed Makefile.in sed -f mkdosmf.sed makefile.dos + +engine/makefile.dos: mkdosmf.sed engine/Makefile.in sed -f mkdosmf.sed engine/makefile.dos -makefile.os2 engine/makefile.os2: mkos2mf.sed Makefile.in engine/Makefile.in +makefile.os2: mkos2mf.sed Makefile.in sed -f mkos2mf.sed makefile.os2 + echo '%.o: %.c' >>makefile.os2 + echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2 + +engine/makefile.os2: mkos2mf.sed engine/Makefile.in sed -f mkos2mf.sed engine/makefile.os2 - echo '%.o: %.c' >>makefile.os2 - echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>makefile.os2 - echo '%.o: %.c' >>engine/makefile.os2 - echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2 + echo '%.o: %.c' >>engine/makefile.os2 + echo ' $$(GCC) $$(CFLAGS) $$(CPPFLAGS) -c $$<' >>engine/makefile.os2