Pārlūkot izejas kodu

remove nostop before ide build

peter 20 gadi atpakaļ
vecāks
revīzija
e9cebe5dec
2 mainītis faili ar 5 papildinājumiem un 17 dzēšanām
  1. 3 8
      Makefile
  2. 2 9
      Makefile.fpc

+ 3 - 8
Makefile

@@ -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
 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
-ifdef SNAPSHOT
-NOSTOP=-
-else
-NOSTOP=
-endif
 PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
 ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
 PKGUNITSPRE=units
@@ -2198,7 +2193,7 @@ install: $(BUILDSTAMP)
 	$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
 	$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
-	$(NOSTOP)$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
+	$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
 endif
 zipinstall: $(BUILDSTAMP)
 	$(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) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
 ifdef IDE
-	$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
+	$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
 endif
 singlezipinstall: $(BUILDSTAMP)
 	$(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc-$(FULL_TARGET) $(INSTALLOPTS)

+ 2 - 9
Makefile.fpc

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