* remove fpmake require

git-svn-id: trunk@7543 -

utils/fppkg/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/03/04]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/06/01]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -2184,7 +2184,7 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fcl-base fcl-xml fpmake libcurl
+override REQUIRE_PACKAGES=rtl fcl-base fcl-xml libcurl
 ifeq ($(FULL_TARGET),i386-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
@@ -2194,7 +2194,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
@@ -2204,7 +2203,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-win32)
@@ -2215,7 +2213,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_WINUNITS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-os2)
@@ -2225,7 +2222,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
@@ -2237,17 +2233,17 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
+REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
+REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
@@ -2258,7 +2254,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
@@ -2270,7 +2265,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
@@ -2280,17 +2274,15 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
+REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
@@ -2301,7 +2293,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
@@ -2311,7 +2302,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
@@ -2323,7 +2313,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
@@ -2333,7 +2322,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
@@ -2343,17 +2331,15 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_HASH=1
 REQUIRE_PACKAGES_PASZLIB=1
-REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
+REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-wince)
@@ -2363,7 +2349,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
@@ -2373,7 +2358,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
@@ -2383,7 +2367,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
@@ -2395,7 +2378,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
@@ -2407,7 +2389,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
@@ -2418,7 +2399,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
@@ -2428,7 +2408,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
@@ -2438,7 +2417,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
@@ -2449,7 +2427,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
@@ -2459,7 +2436,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
@@ -2469,7 +2445,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
@@ -2481,7 +2456,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
@@ -2492,7 +2466,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
@@ -2502,7 +2475,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
@@ -2512,7 +2484,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
@@ -2524,7 +2495,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
@@ -2534,7 +2504,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
@@ -2544,7 +2513,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
@@ -2556,7 +2524,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
@@ -2567,7 +2534,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
@@ -2579,7 +2545,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
@@ -2589,7 +2554,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
@@ -2601,7 +2565,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
@@ -2613,7 +2576,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
@@ -2624,7 +2586,6 @@ REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_WINUNITS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
@@ -2634,7 +2595,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-linux)
@@ -2646,7 +2606,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
@@ -2656,7 +2615,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-wince)
@@ -2666,7 +2624,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-gba)
@@ -2676,7 +2633,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-nds)
@@ -2686,7 +2642,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
@@ -2696,7 +2651,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
@@ -2706,7 +2660,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
@@ -2718,7 +2671,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
@@ -2730,7 +2682,6 @@ REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
@@ -2740,7 +2691,6 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL-XML=1
-REQUIRE_PACKAGES_FPMAKE=1
 REQUIRE_PACKAGES_LIBCURL=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -2951,32 +2901,6 @@ ifdef UNITDIR_FCL-XML
 override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FPMAKE
-PACKAGEDIR_FPMAKE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmake/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_FPMAKE),)
-ifneq ($(wildcard $(PACKAGEDIR_FPMAKE)/units/$(TARGETSUFFIX)),)
-UNITDIR_FPMAKE=$(PACKAGEDIR_FPMAKE)/units/$(TARGETSUFFIX)
-else
-UNITDIR_FPMAKE=$(PACKAGEDIR_FPMAKE)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_FPMAKE)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_FPMAKE) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMAKE)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_FPMAKE=
-UNITDIR_FPMAKE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmake/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FPMAKE),)
-UNITDIR_FPMAKE:=$(firstword $(UNITDIR_FPMAKE))
-else
-UNITDIR_FPMAKE=
-endif
-endif
-ifdef UNITDIR_FPMAKE
-override COMPILER_UNITDIR+=$(UNITDIR_FPMAKE)
-endif
-endif
 ifdef REQUIRE_PACKAGES_LIBCURL
 PACKAGEDIR_LIBCURL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /libcurl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_LIBCURL),)
@@ -3043,7 +2967,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
 ifndef CROSSBOOTSTRAP
 ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+override FPCOPT+=-XP$(BINUTILSPREFIX) 
 endif
 ifneq ($(BINUTILSPREFIX),)
 override FPCOPT+=-Xr$(RLINKPATH)
@@ -3271,6 +3195,7 @@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.inc $(COMPILER_INCLUDEDIR)
 vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_shared

utils/fppkg/Makefile.fpc

@@ -35,7 +35,7 @@ fpcpackage=y
 fpcdir=../..
 
 [require]
-packages=fcl-base fcl-xml fpmake libcurl
+packages=fcl-base fcl-xml libcurl
 
 [prerules]
 # Compatibility to compile with 2.0.x