Browse Source

* regenerated

carl 24 years ago
parent
commit
e5da6924a9
1 changed files with 29 additions and 16 deletions
  1. 29 16
      utils/Makefile

+ 29 - 16
utils/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/08/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/09/29]
 #
 #
 default: all
 default: all
 override PATH:=$(subst \,/,$(PATH))
 override PATH:=$(subst \,/,$(PATH))
@@ -67,33 +67,28 @@ endif
 ifndef FPC
 ifndef FPC
 ifdef PP
 ifdef PP
 FPC=$(PP)
 FPC=$(PP)
-else
-ifdef inUnix
-CPU_SOURCE=$(shell uname -m)
-ifeq (m68k,$(CPU_SOURCE))
-FPC=ppc68k
-else
-FPC=ppc386
 endif
 endif
-else
-FPC=ppc386
 endif
 endif
+ifndef FPC
+FPC:=$(shell fpc -P?)
+ifneq ($(findstring Error,$(PPCBIN)),)
+override FPC=ppc386
 endif
 endif
 endif
 endif
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
 override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
-ifndef OS_TARGET
-OS_TARGET:=$(shell $(FPC) -iTO)
-endif
-ifndef OS_SOURCE
-OS_SOURCE:=$(shell $(FPC) -iSO)
-endif
 ifndef CPU_TARGET
 ifndef CPU_TARGET
 CPU_TARGET:=$(shell $(FPC) -iTP)
 CPU_TARGET:=$(shell $(FPC) -iTP)
 endif
 endif
 ifndef CPU_SOURCE
 ifndef CPU_SOURCE
 CPU_SOURCE:=$(shell $(FPC) -iSP)
 CPU_SOURCE:=$(shell $(FPC) -iSP)
 endif
 endif
+ifndef OS_TARGET
+OS_TARGET:=$(shell $(FPC) -iTO)
+endif
+ifndef OS_SOURCE
+OS_SOURCE:=$(shell $(FPC) -iSO)
+endif
 ifndef FPC_VERSION
 ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 endif
@@ -414,6 +409,16 @@ STATICLIBEXT=.a
 EXEEXT=.ttp
 EXEEXT=.ttp
 FPCMADE=fpcmade.ata
 FPCMADE=fpcmade.ata
 endif
 endif
+ifeq ($(OS_TARGET),beos)
+PPUEXT=.ppu
+ASMEXT=.s
+OEXT=.o
+SMARTEXT=.sl
+STATICLIBEXT=.a
+EXEEXT=
+FPCMADE=fpcmade.be
+ZIPSUFFIX=be
+endif
 ifdef REQUIRE_UNITSDIR
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
 endif
@@ -545,9 +550,14 @@ ifdef inUnix
 ifndef GCCLIBDIR
 ifndef GCCLIBDIR
 GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
 endif
+ifeq ($(OS_TARGET),linux)
 ifndef OTHERLIBDIR
 ifndef OTHERLIBDIR
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
+endif
+ifeq ($(OS_TARGET),netbsd)
+OTHERLIBDIR+=/usr/pkg/lib
+endif
 export GCCLIBDIR OTHERLIB
 export GCCLIBDIR OTHERLIB
 endif
 endif
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
@@ -591,6 +601,7 @@ endif
 ifeq ($(OS_TARGET),netbsd)
 ifeq ($(OS_TARGET),netbsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_INET=1
 REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_FCL=1
 endif
 endif
 ifeq ($(OS_TARGET),amiga)
 ifeq ($(OS_TARGET),amiga)
@@ -766,7 +777,9 @@ override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
 endif
 endif
 endif
 endif
 .PHONY: package_rtl package_paszlib package_inet package_fcl package_mysql package_ibase
 .PHONY: package_rtl package_paszlib package_inet package_fcl package_mysql package_ibase
+ifndef NOCPUDEF
 override FPCOPTDEF=$(CPU_TARGET)
 override FPCOPTDEF=$(CPU_TARGET)
+endif
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 override FPCOPT+=-T$(OS_TARGET)
 endif
 endif