remove nostop before ide build

This commit is contained in:
peter 2004-12-06 16:04:32 +00:00
parent d45dea5db8
commit e9cebe5dec
2 changed files with 5 additions and 17 deletions

View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05] # Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/06]
# #
default: help default: help
MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@ -280,11 +280,6 @@ ALLTARGET=all
endif endif
endif endif
endif endif
ifdef SNAPSHOT
NOSTOP=-
else
NOSTOP=
endif
PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),) ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
PKGUNITSPRE=units PKGUNITSPRE=units
@ -2198,7 +2193,7 @@ install: $(BUILDSTAMP)
$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS) $(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS) $(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
ifdef IDE ifdef IDE
$(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS) $(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
endif endif
zipinstall: $(BUILDSTAMP) zipinstall: $(BUILDSTAMP)
$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS)
@ -2206,7 +2201,7 @@ zipinstall: $(BUILDSTAMP)
$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE) $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX) $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
ifdef IDE ifdef IDE
$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX) $(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
endif endif
singlezipinstall: $(BUILDSTAMP) singlezipinstall: $(BUILDSTAMP)
$(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc-$(FULL_TARGET) $(INSTALLOPTS) $(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc-$(FULL_TARGET) $(INSTALLOPTS)

View File

@ -90,13 +90,6 @@ endif
endif endif
endif endif
# Stop with an error?
ifdef SNAPSHOT
NOSTOP=-
else
NOSTOP=
endif
# Prefix for units # Prefix for units
PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),) ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
@ -324,7 +317,7 @@ install: $(BUILDSTAMP)
$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS) $(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS) $(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
ifdef IDE ifdef IDE
$(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS) $(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
endif endif
zipinstall: $(BUILDSTAMP) zipinstall: $(BUILDSTAMP)
@ -333,7 +326,7 @@ zipinstall: $(BUILDSTAMP)
$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE) $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX) $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
ifdef IDE ifdef IDE
$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX) $(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
endif endif
singlezipinstall: $(BUILDSTAMP) singlezipinstall: $(BUILDSTAMP)