* small updates for go32v2

This commit is contained in:
peter 2000-07-09 12:57:51 +00:00
parent afb2ec2cb3
commit c5fb0d3c8c
4 changed files with 42 additions and 16 deletions

View File

@ -1441,13 +1441,13 @@ export RELEASE DESTZIPDIR
all: build
clean: $(addsuffix _distclean,$(DIROBJECTS))
$(DEL) build-stamp
$(DEL) build-stamp.$(OS_TARGET)
distclean: clean
build: build-stamp
build-stamp:
build: build-stamp.$(OS_TARGET)
build-stamp.$(OS_TARGET):
# create new compiler
ifeq ($(OS_TARGET),win32)
-$(MAKE) compiler_cycle
@ -1473,9 +1473,9 @@ endif
ifdef IDE
-$(MAKE) ide_full $(BUILDOPTS)
endif
$(ECHO) Build > build-stamp
$(ECHO) Build > build-stamp.$(OS_TARGET)
installbase: build-stamp
installbase: build-stamp.$(OS_TARGET)
# create dirs
$(MKDIR) $(BASEINSTALLDIR)
$(MKDIR) $(DOCINSTALLDIR)
@ -1500,7 +1500,7 @@ endif
$(MAKE) compiler_install $(INSTALLOPTS)
$(MAKE) rtl_install $(INSTALLOPTS)
install: build-stamp
install: build-stamp.$(OS_TARGET)
$(MAKE) installbase $(INSTALLOPTS)
$(MAKE) utils_install $(INSTALLOPTS)
$(MAKE) api_install $(INSTALLOPTS)
@ -1516,7 +1516,7 @@ ifndef SNAPSHOT
$(MAKE) packages_exampleinstall $(INSTALLOPTS)
endif
zipinstall: build-stamp
zipinstall: build-stamp.$(OS_TARGET)
$(MAKE) fpc_zipinstall ZIPTARGET=installbase PACKAGENAME=base $(INSTALLOPTS)
$(MAKE) utils_zipinstall $(INSTALLOPTS)
$(MAKE) api_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE)

View File

@ -259,13 +259,13 @@ export RELEASE DESTZIPDIR
all: build
clean: $(addsuffix _distclean,$(DIROBJECTS))
$(DEL) build-stamp
$(DEL) build-stamp.$(OS_TARGET)
distclean: clean
build: build-stamp
build-stamp:
build: build-stamp.$(OS_TARGET)
build-stamp.$(OS_TARGET):
# create new compiler
ifeq ($(OS_TARGET),win32)
-$(MAKE) compiler_cycle
@ -291,9 +291,9 @@ endif
ifdef IDE
-$(MAKE) ide_full $(BUILDOPTS)
endif
$(ECHO) Build > build-stamp
$(ECHO) Build > build-stamp.$(OS_TARGET)
installbase: build-stamp
installbase: build-stamp.$(OS_TARGET)
# create dirs
$(MKDIR) $(BASEINSTALLDIR)
$(MKDIR) $(DOCINSTALLDIR)
@ -318,7 +318,7 @@ endif
$(MAKE) compiler_install $(INSTALLOPTS)
$(MAKE) rtl_install $(INSTALLOPTS)
install: build-stamp
install: build-stamp.$(OS_TARGET)
$(MAKE) installbase $(INSTALLOPTS)
$(MAKE) utils_install $(INSTALLOPTS)
$(MAKE) api_install $(INSTALLOPTS)
@ -334,7 +334,7 @@ ifndef SNAPSHOT
$(MAKE) packages_exampleinstall $(INSTALLOPTS)
endif
zipinstall: build-stamp
zipinstall: build-stamp.$(OS_TARGET)
$(MAKE) fpc_zipinstall ZIPTARGET=installbase PACKAGENAME=base $(INSTALLOPTS)
$(MAKE) utils_zipinstall $(INSTALLOPTS)
$(MAKE) api_zipinstall $(INSTALLOPTS) PACKAGEPREFIX=$(PKGPRE)

View File

@ -869,12 +869,14 @@ install: $(addsuffix _install,$(DIROBJECTS))
sourceinstall: fpc_sourceinstall
exampleinstall: $(addsuffix _exampleinstall,$(DIROBJECTS))
exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(DIROBJECTS))
zipinstall: $(addsuffix _zipinstall,$(PKGOBJECTS))
zipsourceinstall: fpc_zipsourceinstall
zipexampleinstall: fpc_zipexampleinstall
clean: $(addsuffix _clean,$(DIROBJECTS))
distclean: $(addsuffix _distclean,$(DIROBJECTS))
@ -883,7 +885,7 @@ cleanall: $(addsuffix _cleanall,$(DIROBJECTS))
require: $(addsuffix _require,$(DIROBJECTS))
.PHONY: all debug examples test smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall require
.PHONY: all debug examples test smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall clean distclean cleanall require
#####################################################################
# SourceInstall rules
@ -899,6 +901,24 @@ fpc_sourceinstall: clean
$(MKDIR) $(SOURCEINSTALLDIR)
$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
#####################################################################
# exampleinstall rules
#####################################################################
.PHONY: fpc_exampleinstall
fpc_exampleinstall: $(addsuffix _clean,$(EXAMPLEDIROBJECTS))
ifdef EXAMPLESOURCEFILES
$(MKDIR) $(EXAMPLEINSTALLDIR)
$(COPY) $(EXAMPLESOURCEFILES) $(EXAMPLEINSTALLDIR)
endif
ifdef EXAMPLEDIROBJECTS
ifndef EXAMPLESOURCEFILES
$(MKDIR) $(EXAMPLEINSTALLDIR)
endif
$(COPYTREE) $(addsuffix /*,$(EXAMPLEDIROBJECTS)) $(EXAMPLEINSTALLDIR)
endif
#####################################################################
# Zip
#####################################################################
@ -960,6 +980,11 @@ endif
fpc_zipsourceinstall:
$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
.PHONY: fpc_zipexampleinstall
fpc_zipexampleinstall:
$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
#####################################################################
# Directories
#####################################################################

View File

@ -35,4 +35,5 @@ examplesubdirs=1
[sections]
none=1
zipsourceinstall=1
zipexampleinstall=1