* fpcmake updated

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:10
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:45
 #
 
 defaultrule: all
@@ -153,6 +153,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -196,9 +199,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -662,22 +665,22 @@ info: fpc_info $(addsuffix _info,$(DIROBJECTS))
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
-ifneq ($(wildcard $(FCLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(FCLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(FCLDIR)),)
+ifeq ($(wildcard $(FCLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=fcl
 fcl_package:
-	$(MAKE) -C $(FCLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(FCLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package $(OS_TARGET)_package
+.PHONY:  rtl_package fcl_package
 
 #####################################################################
 # Exes
@@ -703,7 +706,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

utils/fpcmake.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..104] of string[240]=(
+const fpcmakeini : array[0..103] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..104,1..240] of char=(
+const fpcmakeini : array[0..103,1..240] of char=(
 {$endif Delphi}
   ';'#010+
   '; $Id$'#010+
@@ -178,9 +178,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# create fcldir,rtldir,unitdir'#010+
   'ifdef FPCDIR'#010+
   'ifneq ($(FPCDIR),.)'#010+
-  'override RTLDIR=$(FPCDIR)/rtl'#010+
-  'override FCLDIR=$(FPCDIR)/fcl'#010+
-  'override U','NITDIR=$(FPCDIR)/units'#010+
+  'override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)'#010+
+  'override FCLDIR=$(FPCDIR)/f','cl/$(OS_TARGET)'#010+
+  'override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -188,9 +188,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '[dir_install]'#010+
   '#####################################################################'#010+
   '# Install Directories'#010+
-  '#####################################################################'#010+
+  '#########################################################','###########'+
+  '#'#010+
   #010+
-  '# set the base directory w','here to install everything'#010+
+  '# set the base directory where to install everything'#010+
   'ifndef BASEINSTALLDIR'#010+
   'ifdef inlinux'#010+
   'BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)'#010+
@@ -199,8 +200,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# set the directory where to install the binaries'#010+
-  'ifndef BININSTAL','LDIR'#010+
+  '# set the directory where ','to install the binaries'#010+
+  'ifndef BININSTALLDIR'#010+
   'ifdef inlinux'#010+
   'BININSTALLDIR=$(PREFIXINSTALLDIR)/bin'#010+
   'else'#010+
@@ -210,7 +211,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '# set the directory where to install the units.'#010+
   'ifndef UNITINSTALLDIR'#010+
-  'UNITINSTALLDIR=$(BASEINSTALLDIR)/$(UNITPREFIX)','/$(OS_TARGET)'#010+
+  'UNITIN','STALLDIR=$(BASEINSTALLDIR)/$(UNITPREFIX)/$(OS_TARGET)'#010+
   'endif'#010+
   #010+
   '# Where to install shared libraries'#010+
@@ -222,8 +223,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Where the source files will be stored'#010+
-  'ifndef SOURCEINSTALL','DIR'#010+
+  '# Where the source f','iles will be stored'#010+
+  'ifndef SOURCEINSTALLDIR'#010+
   'ifdef inlinux'#010+
   'SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)'#010+
   'else'#010+
@@ -233,8 +234,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '# Where the doc files will be stored'#010+
   'ifndef DOCINSTALLDIR'#010+
-  'ifdef inlinux'#010+
-  'DOCINSTALLDIR=$(PREFIXINSTALLD','IR)/doc/fpc/$(FPC_VERSION)'#010+
+  'ifde','f inlinux'#010+
+  'DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc/$(FPC_VERSION)'#010+
   'else'#010+
   'DOCINSTALLDIR=$(BASEINSTALLDIR)/doc'#010+
   'endif'#010+
@@ -247,8 +248,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   #010+
   #010+
-  '[dir_gcclib]'#010+
-  '# On linux, try to find where ','libgcc.a is.'#010+
+  '[di','r_gcclib]'#010+
+  '# On linux, try to find where libgcc.a is.'#010+
   'ifdef inlinux'#010+
   'ifndef GCCLIBDIR'#010+
   'export GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{'+
@@ -259,10 +260,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '[dir_otherlib]'#010+
   '# Where to find other libraries'#010+
-  'ifdef inlinux'#010+
+  'ifdef inlin','ux'#010+
   'ifndef OTHERLIBDIR'#010+
-  'export OTHERLIBDIR',':=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039+
-  '{ ORS=" "; print $1 }'#039')'#010+
+  'export OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{'+
+  ' ORS=" "; print $1 }'#039')'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -270,15 +271,15 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '[command_begin]'#010+
   '#####################################################################'#010+
   '# Compiler Command Line'#010+
-  '#############################################','#######################'+
+  '#####','###############################################################'+
   '#'#010+
   #010+
   '# Load commandline OPTDEF and add FPC_CPU define'#010+
   'override FPCOPTDEF:=-d$(CPU_TARGET)'#010+
   #010+
   '# Load commandline OPT and add target and unit dir to be sure'#010+
-  'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
-  'override FPCOPT+=-T$(OS_TARGET)'#010,
+  'ifneq ($(OS_TARGET),$(OS_S','OURCE))'#010+
+  'override FPCOPT+=-T$(OS_TARGET)'#010+
   'endif'#010+
   #010+
   '[command_needopt]'#010+
@@ -294,11 +295,11 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '[command_unitsdir]'#010+
   'ifdef UNITSDIR'#010+
-  'override FPCOPT+=-Fu$(UNITSDIR)'#010+
+  'override FPCOPT+=-Fu$(UN','ITSDIR)'#010+
   'endif'#010+
   #010+
   '[command_needunit]'#010+
-  'ifdef ','NEEDUNITDIR'#010+
+  'ifdef NEEDUNITDIR'#010+
   'override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))'#010+
   'endif'#010+
   #010+
@@ -309,7 +310,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '[command_needobj]'#010+
   'ifdef NEEDOBJDIR'#010+
-  'override FPCOPT+=$(addprefix -Fo,$(NEEDOBJDIR))',#010+
+  'overrid','e FPCOPT+=$(addprefix -Fo,$(NEEDOBJDIR))'#010+
   'endif'#010+
   #010+
   '[command_needinc]'#010+
@@ -323,8 +324,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
   'endif'#010+
   #010+
-  '[command_otherlib]'#010+
-  '# Add Other dirs path ','if asked'#010+
+  '[','command_otherlib]'#010+
+  '# Add Other dirs path if asked'#010+
   'ifdef OTHERLIBDIR'#010+
   'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
   'endif'#010+
@@ -336,8 +337,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   #010+
   '[command_unittarget]'#010+
-  'ifdef UNITTARGETDIR'#010+
-  'override FPCOPT+=-FU$(UNITTAR','GETDIR)'#010+
+  'ifdef UNI','TTARGETDIR'#010+
+  'override FPCOPT+=-FU$(UNITTARGETDIR)'#010+
   'endif'#010+
   #010+
   '[command_end]'#010+
@@ -354,9 +355,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# Add commandline options'#010+
   'ifdef OPT'#010+
   'override FPCOPT+=$(OPT)'#010+
-  'endif'#010+
+  'endif',#010+
   'ifdef UNITDIR'#010+
-  'override FPCOPT+=$(addpre','fix -Fu,$(UNITDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
   'endif'#010+
   'ifdef LIBDIR'#010+
   'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
@@ -365,10 +366,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
   'endif'#010+
   'ifdef INCDIR'#010+
-  'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fi,$(','INCDIR))'#010+
   'endif'#010+
   #010+
-  '# Add defines from FPCOP','TDEF to FPCOPT'#010+
+  '# Add defines from FPCOPTDEF to FPCOPT'#010+
   'ifdef FPCOPTDEF'#010+
   'override FPCOPT+=$(FPCOPTDEF)'#010+
   'endif'#010+
@@ -380,10 +381,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '# Was a config file specified ?'#010+
   'ifdef CFGFILE'#010+
-  'override FPCOPT+=@$(CFGFILE)'#010+
+  'override FPCOPT','+=@$(CFGFILE)'#010+
   'endif'#010+
   #010+
-  'override COMPILER=$','(FPC) $(FPCOPT)'#010+
+  'override COMPILER=$(FPC) $(FPCOPT)'#010+
   #010+
   #010+
   '[shelltools]'#010+
@@ -391,10 +392,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# Shell tools'#010+
   '#####################################################################'#010+
   #010+
-  '# To copy pograms'#010+
+  '# To copy pogr','ams'#010+
   'ifndef COPY'#010+
   'export COPY:=cp -fp'#010+
-  'endi','f'#010+
+  'endif'#010+
   #010+
   '# Copy a whole tree'#010+
   'ifndef COPYTREE'#010+
@@ -411,9 +412,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'export DEL:=rm -f'#010+
   'endif'#010+
   #010+
-  '# Check deltree program'#010+
+  '# Check deltre','e program'#010+
   'ifndef DELTREE'#010+
-  'export DELTREE:','=rm -rf'#010+
+  'export DELTREE:=rm -rf'#010+
   'endif'#010+
   #010+
   '# To install files'#010+
@@ -428,9 +429,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# To install programs'#010+
   'ifndef INSTALLEXE'#010+
   'ifdef inlinux'#010+
-  'export INSTALLEXE:=install -m 755'#010+
+  'export INS','TALLEXE:=install -m 755'#010+
   'else'#010+
-  'export INST','ALLEXE:=$(COPY)'#010+
+  'export INSTALLEXE:=$(COPY)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -445,7 +446,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   #010+
   '[tool_default]'#010+
-  '##############################################################','######'+
+  '######################','##############################################'+
   '#'#010+
   '# Default Tools'#010+
   '#####################################################################'#010+
@@ -455,9 +456,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'FPCMAKED=fpcmaked'#010+
   'endif'#010+
   #010+
-  '# assembler, redefine it if cross compiling'#010+
+  '# assembler, redef','ine it if cross compiling'#010+
   'ifndef AS'#010+
-  'AS=a','s'#010+
+  'AS=as'#010+
   'endif'#010+
   #010+
   '# linker, but probably not used'#010+
@@ -476,8 +477,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# also call ppas if with command option -s'#010+
-  'ifeq (,$(findstring -s',' ,$(COMPILER)))'#010+
+  '# also call ppas if with ','command option -s'#010+
+  'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
   'EXECPPAS='#010+
   'else'#010+
   'EXECPPAS=@$(PPAS)'#010+
@@ -492,8 +493,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '# echo'#010+
   'ifndef ECHO'#010+
-  'ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))'#010+
-  'ifeq ($(EC','HO),)'#010+
+  'ECHO:=$(strip $(wildcard $(addsuffix /e','cho$(EXEEXT),$(SEARCHPATH))))'+
+  #010+
+  'ifeq ($(ECHO),)'#010+
   'export ECHO:=echo'#010+
   'else'#010+
   'export ECHO:=$(firstword $(ECHO))'#010+
@@ -507,9 +509,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))'+
   #010+
   'ifeq ($(PPDEP),)'#010+
-  'PPDEP='#010+
+  'P','PDEP='#010+
   'else'#010+
-  'export PPDEP:=$(firstword $(P','PDEP))'#010+
+  'export PPDEP:=$(firstword $(PPDEP))'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -521,12 +523,12 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'ifeq ($(PPUMOVE),)'#010+
   'PPUMOVE='#010+
   'else'#010+
-  'export PPUMOVE:=$(firstword $(PPUMOVE))'#010+
+  'export PPUMOVE:=$(firstword $(PP','UMOVE))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   '[tool_ppufiles]'#010+
-  '# p','pufiles'#010+
+  '# ppufiles'#010+
   'ifndef PPUFILES'#010+
   'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPA'+
   'TH))))'#010+
@@ -537,11 +539,11 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '[tool_data2inc]'#010+
+  '[tool_dat','a2inc]'#010+
   '# data2inc'#010+
   'ifndef DATA2INC'#010+
-  'DATA2I','NC:=$(strip $(wildcard $(addsuffix /data2inc$(EXEEXT),$(SEARCH'+
-  'PATH))))'#010+
+  'DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(EXEEXT),$(SEARCHPA'+
+  'TH))))'#010+
   'ifeq ($(DATA2INC),)'#010+
   'DATA2INC='#010+
   'else'#010+
@@ -552,7 +554,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '[tool_diff]'#010+
   '# diff'#010+
   'ifndef DIFF'#010+
-  'DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEE','XT),$(SEARCHPATH))))'+
+  'DIFF:=$(','strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))'+
   #010+
   'ifeq ($(DIFF),)'#010+
   'DIFF='#010+
@@ -565,10 +567,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# cmp'#010+
   'ifndef CMP'#010+
   'CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))'#010+
-  'ifeq ($(CMP),)'#010+
+  'ifeq ($(CM','P),)'#010+
   'CMP='#010+
   'else'#010+
-  'export CMP:=$(firstword $','(CMP))'#010+
+  'export CMP:=$(firstword $(CMP))'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -584,7 +586,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   #010+
   '[tool_upx]'#010+
-  '# Look if UPX is found for go32v2 and win32.',' We can'#039't use $UPX b'+
+  '# Lo','ok if UPX is found for go32v2 and win32. We can'#039't use $UPX b'+
   'ecuase'#010+
   '# upx uses that one itself (PFV)'#010+
   'ifndef UPXPROG'#010+
@@ -595,7 +597,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'UPXPROG:=1'#010+
   'endif'#010+
   'ifdef UPXPROG'#010+
-  'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPA','TH))'+
+  'UPXPROG:=$(strip $(wildc','ard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))'+
   '))'#010+
   'ifeq ($(UPXPROG),)'#010+
   'UPXPROG='#010+
@@ -610,11 +612,11 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '[tool_date]'#010+
   '# gdate/date'#010+
   'ifndef DATE'#010+
-  'DATE:=$(strip $(wildcard $(addsuffix /date$(EXEEXT),$(SEARCHPATH))))'#010+
-  'ifeq ($(DATE),)'#010+
-  'DATE:','=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))'+
+  'DATE:=$(strip $(wildcard $(addsuffix /date$(EXEEXT','),$(SEARCHPATH))))'+
   #010+
   'ifeq ($(DATE),)'#010+
+  'DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))'#010+
+  'ifeq ($(DATE),)'#010+
   'DATE='#010+
   'else'#010+
   'export DATE:=$(firstword $(DATE))'#010+
@@ -625,9 +627,9 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef DATE'#010+
-  'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+
+  'DATEST','R:=$(shell $(DATE) +%Y%m%d)'#010+
   'else'#010+
-  'DATESTR','='#010+
+  'DATESTR='#010+
   'endif'#010+
   #010+
   '[tool_zip]'#010+
@@ -638,8 +640,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'ifeq ($(ZIPPROG),)'#010+
   'ZIPPROG='#010+
   'else'#010+
-  'export ZIPPROG:=$(firstword $(ZIPPROG)) -D9 -r'#010+
-  'end','if'#010+
+  'export ZIP','PROG:=$(firstword $(ZIPPROG)) -D9 -r'#010+
+  'endif'#010+
   'endif'#010+
   #010+
   'ifndef ZIPEXT'#010+
@@ -650,9 +652,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '[extensions]'#010+
   '#####################################################################'#010+
   '# Default extensions'#010+
-  '#####################################################################'#010+
+  '####################################################','################'+
+  '#'#010+
   #010+
-  '# Default needed exte','nsions (Go32v2,Linux)'#010+
+  '# Default needed extensions (Go32v2,Linux)'#010+
   'LOADEREXT=.as'#010+
   'PPLEXT=.ppl'#010+
   'PPUEXT=.ppu'#010+
@@ -667,10 +670,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'ifeq ($(OS_TARGET),go32v1)'#010+
   'PPUEXT=.pp1'#010+
   'OEXT=.o1'#010+
-  'ASMEXT=.s1'#010+
+  'ASM','EXT=.s1'#010+
   'SMARTEXT=.sl1'#010+
   'STATICLIBEXT=.a1'#010+
-  'S','HAREDLIBEXT=.so1'#010+
+  'SHAREDLIBEXT=.so1'#010+
   'PACKAGESUFFIX=v1'#010+
   'endif'#010+
   #010+
@@ -686,10 +689,10 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   '# Win32'#010+
   'ifeq ($(OS_TARGET),win32)'#010+
-  'PPUEXT=.ppw'#010+
+  'PP','UEXT=.ppw'#010+
   'OEXT=.ow'#010+
   'ASMEXT=.sw'#010+
-  'SMARTEXT=.','slw'#010+
+  'SMARTEXT=.slw'#010+
   'STATICLIBEXT=.aw'#010+
   'SHAREDLIBEXT=.dll'#010+
   'PACKAGESUFFIX=win32'#010+
@@ -704,11 +707,11 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'STATICLIBEXT=.ao2'#010+
   'SHAREDLIBEXT=.dll'#010+
   'PACKAGESUFFIX=os2'#010+
-  'endif'#010+
+  'en','dif'#010+
   #010+
   '# library prefix'#010+
   'LIBPREFIX=lib'#010+
-  'ifeq',' ($(OS_TARGET),go32v2)'#010+
+  'ifeq ($(OS_TARGET),go32v2)'#010+
   'LIBPREFIX='#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),go32v1)'#010+
@@ -718,8 +721,8 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# determine which .pas extension is used'#010+
   'ifndef PASEXT'#010+
   'ifdef EXEOBJECTS'#010+
-  'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(EX'+
-  'EOBJECTS)))))',#010+
+  'override TESTPAS:=$(strip $(wildcard $(adds','uffix .pas,$(firstword $('+
+  'EXEOBJECTS)))))'#010+
   'else'#010+
   'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(UN'+
   'ITOBJECTS)))))'#010+
@@ -732,33 +735,32 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   #010+
   '[standardrules]'#010+
-  '###################################################################','#'+
+  '###########################','#########################################'+
   '#'#010+
   '# Standard rules'#010+
   '#####################################################################'#010+
   #010+
   '[packagedependrules]'#010+
   '#####################################################################'#010+
-  '# Package depends'#010+
-  '########################################','############################'+
-  '#'#010+
+  '# Package depends'#010,
+  '#####################################################################'#010+
   #010+
   '[loaderrules]'#010+
   '#####################################################################'#010+
   '# Loaders'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_loaders'#010+
+  '.PHO','NY: fpc_loaders'#010+
   #010+
-  '%$(OEXT): %$(LOADEREXT)',#010+
+  '%$(OEXT): %$(LOADEREXT)'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
   #010+
   'override ALLTARGET+=fpc_loaders'#010+
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
-  'override INSTALLTARGET+=fpc_loaders_install'#010+
+  'override INSTALLTARGET+=fpc_loaders_install'#010,
   #010+
-  'override LOADEROFILES=$(addsuffix $(OEX','T),$(LOADEROBJECTS))'#010+
+  'override LOADEROFILES=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
   #010+
   'fpc_loaders: $(LOADEROFILES)'#010+
   #010+
@@ -768,17 +770,18 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'fpc_loaders_showinstall:'#010+
   '        @$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))'#010+
   #010+
-  'fpc_loaders_install:'#010+
-  '        $(MKDIR) $(U','NITINSTALLDIR)'#010+
+  'f','pc_loaders_install:'#010+
+  '        $(MKDIR) $(UNITINSTALLDIR)'#010+
   '        $(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)'#010+
   #010+
   #010+
   '[unitrules]'#010+
   '#####################################################################'#010+
   '# Units'#010+
-  '#####################################################################'#010+
+  '########################################','############################'+
+  '#'#010+
   #010+
-  '.PHONY: f','pc_units'#010+
+  '.PHONY: fpc_units'#010+
   #010+
   'override ALLTARGET+=fpc_units'#010+
   #010+
@@ -786,20 +789,19 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
   #010+
-  'fpc_units: $(UNITPPUFILES)'#010+
+  'fpc_units: $(UNI','TPPUFILES)'#010+
   #010+
   #010+
   #010+
   '[exerules]'#010+
-  '###############','#####################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Exes'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_exes'#010+
   #010+
-  'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))'#010+
-  'override EXEOFILES=$(addsuffix $(O','EXT),$(EXEOBJECTS))'#010+
+  'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJE','CTS))'#010+
+  'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
   'override INSTALLEXEFILES+=$(EXEFILES)'#010+
@@ -809,7 +811,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   #010+
   '[examplerules]'#010+
-  '###############################################################','#####'+
+  '#######################','#############################################'+
   '#'#010+
   '# Examples'#010+
   '#####################################################################'#010+
@@ -817,7 +819,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '.PHONY: fpc_examples fpc_test'#010+
   #010+
   'override EXAMPLEFILES=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
-  'override EXAMPLEOFILES=$(addsuffix $(OEXT),$(EXAMPLEOBJEC','TS))'#010+
+  'override EXAMPLEO','FILES=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
   #010+
   'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
   #010+
@@ -828,32 +830,33 @@ const fpcmakeini : array[0..104,1..240] of char=(
   #010+
   #010+
   '[compilerules]'#010+
-  '#####################################################################'#010+
-  '# General compile rules'#010+
-  '##########','##########################################################'+
+  '################################################################','####'+
   '#'#010+
+  '# General compile rules'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_all fpc_debug'#010+
   #010+
   '$(FPCMAKED):'#010+
   '        @$(ECHO) Compiled > $(FPCMAKED)'#010+
   #010+
-  'fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMA'+
-  'KED)'#010+
+  'fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \'#010+
+  '      ','   $(addsuffix _component,$(COMPILECOMPONENTS)) \'#010+
+  '         $(ALLTARGET) $(FPCMAKED)'#010+
   #010+
   'fpc_debug:'#010+
-  '        $(M','AKE) all DEBUG=1'#010+
+  '        $(MAKE) all DEBUG=1'#010+
   #010+
   '# General compile rules, available for both possible PASEXT'#010+
   #010+
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
   #010+
-  '%$(PPUEXT): %.pp'#010+
+  '%$(PP','UEXT): %.pp'#010+
   '        $(COMPILER) $< $(REDIR)'#010+
   '        $(EXECPASS)'#010+
   #010+
   '%$(PPUEXT): %.pas'#010+
-  '        $(COMPILER) $< $','(REDIR)'#010+
+  '        $(COMPILER) $< $(REDIR)'#010+
   '        $(EXECPASS)'#010+
   #010+
   '%$(EXEEXT): %.pp'#010+
@@ -861,22 +864,21 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '        $(EXECPASS)'#010+
   #010+
   '%$(EXEEXT): %.pas'#010+
-  '        $(COMPILER) $< $(REDIR)'#010+
+  '        $(COMPIL','ER) $< $(REDIR)'#010+
   '        $(EXECPASS)'#010+
   #010+
   #010+
   '[libraryrules]'#010+
-  '######################################################','##############'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Library'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_smart fpc_shared'#010+
   #010+
-  '# Default sharedlib units are all unit objects'#010+
+  '# Defa','ult sharedlib units are all unit objects'#010+
   'ifndef SHAREDLIBUNITOBJECTS'#010+
   'SHAREDLIBUNITOBJECTS=$(UNITOBJECTS)'#010+
-  'en','dif'#010+
+  'endif'#010+
   #010+
   'fpc_smart:'#010+
   '        $(MAKE) all SMARTLINK=1'#010+
@@ -886,106 +888,107 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'ifndef LIBNAME'#010+
   '        @$(ECHO) LIBNAME not set'#010+
   'else'#010+
-  '        $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
+  ' ','       $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
   'endif'#010+
   'else'#010+
-  '        @$(ECHO) Shared Libraries not sup','ported'#010+
+  '        @$(ECHO) Shared Libraries not supported'#010+
   'endif'#010+
   #010+
   #010+
   '[installrules]'#010+
   '#####################################################################'#010+
   '# Install rules'#010+
-  '#####################################################################'#010+
+  '#################','###################################################'+
+  '#'#010+
   #010+
   '.PHONY: fpc_showinstall fpc_install'#010+
   #010+
-  'ifdef EXTRAINSTA','LLUNITS'#010+
+  'ifdef EXTRAINSTALLUNITS'#010+
   'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
   'endif'#010+
   #010+
   'ifdef INSTALLPPUFILES'#010+
   'ifdef PPUFILES'#010+
-  'ifdef inlinux'#010+
+  'ifdef inlin','ux'#010+
   'INSTALLPPULINKFILES=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
-  'INSTALLPPULIBFILES=$(shell $(PPUFILES)',' -L $(INSTALLPPUFILES))'#010+
+  'INSTALLPPULIBFILES=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
   'else'#010+
   'INSTALLPPULINKFILES=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
   'endif'#010+
   'else'#010+
-  'INSTALLPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))'#010+
+  'INSTALLPPULINKFILES=$(subst $(PPU','EXT),$(OEXT),$(INSTALLPPUFILES))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+
   'ifdef INSTALLEXEFILES'#010+
-  ' ','       @$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES'+
-  '))'#010+
+  '        @$(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILES))'+
+  #010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
-  '        @$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFILES)'+
-  ')'#010+
+  '        @$(ECHO) $(addprefix "\n"$(','UNITINSTALLDIR)/,$(INSTALLPPUFILE'+
+  'S))'#010+
   'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '        @$(ECHO) $(addprefix "\n"$(UNI','TINSTALLDIR)/,$(INSTALLPPULINK'+
-  'FILES))'#010+
+  '        @$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULINKFI'+
+  'LES))'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
-  '        @$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBFILE'+
-  'S))'#010+
+  '        @$(ECHO) $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTA','LLPPULIBFI'+
+  'LES))'#010+
   'endif'#010+
   'endif'#010+
   'ifdef EXTRAINSTALLFILES'#010+
-  '        @$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(','EXTRAINSTALLF'+
-  'ILES))'#010+
+  '        @$(ECHO) $(addprefix "\n"$(EXTRAINSTALLDIR)/,$(EXTRAINSTALLFIL'+
+  'ES))'#010+
   'endif'#010+
   #010+
   'fpc_install: $(INSTALLTARGET)'#010+
   '# Create UnitInstallFiles'#010+
   'ifdef INSTALLEXEFILES'#010+
-  '        $(MKDIR) $(BININSTALLDIR)'#010+
+  '        $(MKDIR) $(BININSTAL','LDIR)'#010+
   '# Compress the exes if upx is defined'#010+
   'ifdef UPXPROG'#010+
   '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
   'endif'#010+
-  '    ','    $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
+  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(UNITINSTALLDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
+  '        $(INSTAL','L) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
   'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '        $(INSTALL) $(INSTALLPPULINK','FILES) $(UNITINSTALLDIR)'#010+
+  '        $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
   '        $(MKDIR) $(LIBINSTALLDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
+  '        $(INSTALL) $(INSTALLPPULIBFIL','ES) $(LIBINSTALLDIR)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef EXTRAINSTALLFILES'#010+
   '        $(MKDIR) $(EXTRAINSTALLDIR)'#010+
-  '        $(INST','ALL) $(EXTRAINSTALLFILES) $(EXTRAINSTALLDIR)'#010+
+  '        $(INSTALL) $(EXTRAINSTALLFILES) $(EXTRAINSTALLDIR)'#010+
   'endif'#010+
   #010+
   #010+
   '[sourceinstallrules]'#010+
-  '#####################################################################'#010+
+  '###########################################################','#########'+
+  '#'#010+
   '# Source install rules'#010+
   '#####################################################################'#010+
   #010+
-  '.P','HONY: fpc_sourceinstall'#010+
+  '.PHONY: fpc_sourceinstall'#010+
   #010+
   'fpc_sourceinstall: clean'#010+
   '        $(MKDIR) $(SOURCEINSTALLDIR)'#010+
-  '        $(COPYTREE) $(BASEDIR) $(SOURCEINSTALLDIR)'#010+
+  '        $(COPYTREE) $(BASEDIR) $(SOURCEINSTALL','DIR)'#010+
   #010+
   '[zipinstallrules]'#010+
   '#####################################################################'#010+
   '# Zip'#010+
-  '#######','#############################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_zipinstall fpc_zipinstalladd'#010+
   #010+
-  '# Temporary path to pack a file'#010+
+  '# Temporary path to pack a ','file'#010+
   'ifndef PACKDIR'#010+
   'ifndef inlinux'#010+
   'PACKDIR=pack_tmp'#010+
@@ -994,7 +997,7 @@ const fpcmakeini : array[0..104,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Test dir if n','one specified'#010+
+  '# Test dir if none specified'#010+
   'ifndef DESTZIPDIR'#010+
   'DESTZIPDIR=$(BASEDIR)'#010+
   'endif'#010+
@@ -1002,161 +1005,162 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '# Add .zip/.tar.gz extension'#010+
   'ifdef ZIPNAME'#010+
   'ifndef inlinux'#010+
-  'override ZIPNAME:=$(ZIPNAME)$(ZIPEXT)'#010+
+  'override ZIPNA','ME:=$(ZIPNAME)$(ZIPEXT)'#010+
   'endif'#010+
   'endif'#010+
   #010+
   '# Note: This will not remove the zipfile first'#010+
   'fpc_zipinstalladd:'#010+
-  'ifnd','ef ZIPNAME'#010+
+  'ifndef ZIPNAME'#010+
   '        @$(ECHO) Please specify ZIPNAME!'#010+
   '        @exit'#010+
   'else'#010+
   '        $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
-  'ifdef inlinux'#010+
+  'ifdef',' inlinux'#010+
   '        gzip -d $(DESTZIPDIR)/$(ZIPNAME).tar.gz'#010+
-  '        cd $(PACKDIR) ; tar rv --file $(DESTZIPDIR',')/$(ZIPNAME).tar *'+
-  ' ; cd $(BASEDIR)'#010+
+  '        cd $(PACKDIR) ; tar rv --file $(DESTZIPDIR)/$(ZIPNAME).tar * ;'+
+  ' cd $(BASEDIR)'#010+
   '        gzip $(DESTZIPDIR)/$(ZIPNAME).tar'#010+
   'else'#010+
-  '        cd $(PACKDIR) ; $(ZIPPROG) $(DESTZIPDIR)/$(ZIPNAME) * ; cd $(B'+
-  'ASEDIR)'#010+
+  '        cd $(PACKDIR) ; $(ZIPPROG) $(DESTZIPDIR)/$(','ZIPNAME) * ; cd $'+
+  '(BASEDIR)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   'endif'#010+
   #010+
-  '# First remove the zip and then insta','ll'#010+
+  '# First remove the zip and then install'#010+
   'fpc_zipinstall:'#010+
   'ifndef ZIPNAME'#010+
   '        @$(ECHO) Please specify ZIPNAME!'#010+
   '        @exit'#010+
   'else'#010+
-  '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)'#010+
+  '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)',#010+
   '        $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
   'ifdef inlinux'#010+
-  '        cd $(PACKDIR) ; tar cvz --f','ile $(DESTZIPDIR)/$(ZIPNAME).tar.'+
-  'gz * ; cd $(BASEDIR)'#010+
+  '        cd $(PACKDIR) ; tar cvz --file $(DESTZIPDIR)/$(ZIPNAME).tar.gz'+
+  ' * ; cd $(BASEDIR)'#010+
   'else'#010+
   '        cd $(PACKDIR) ; $(ZIPPROG) $(DESTZIPDIR)/$(ZIPNAME) * ; cd $(B'+
-  'ASEDIR)'#010+
+  'ASED','IR)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   'endif'#010+
   #010+
   #010+
   '[cleanrules]'#010+
-  '##############################################','######################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Clean rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_clean fpc_cleanall'#010+
+  '.PHONY: fpc_clean fpc_cl','eanall'#010+
   #010+
   'ifdef EXTRACLEANUNITS'#010+
   'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
   'endif'#010+
   #010+
-  'ifde','f CLEANPPUFILES'#010+
+  'ifdef CLEANPPUFILES'#010+
   'ifdef PPUFILES'#010+
   'CLEANPPULINKFILES=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
   'else'#010+
-  'CLEANPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES))'#010+
+  'CLEANPPULINKFILES=$(subst $(PPUEXT),$(OEX','T),$(CLEANPPUFILES))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   'fpc_clean: $(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
-  '        -$(DEL) $(CLEANEXEF','ILES)'#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
   'endif'#010+
   'ifneq ($(CLEANPPULINKFILES),)'#010+
-  '        -$(DEL) $(CLEANPPULINKFILES)'#010+
+  '        -$(DEL) $(CLEANPPULINKFI','LES)'#010+
   'endif'#010+
   'ifdef EXTRACLEANFILES'#010+
   '        -$(DEL) $(EXTRACLEANFILES)'#010+
   'endif'#010+
-  '        -$(DEL) $(FPCMAKED) $(PPA','S) link.res $(REDIRFILE)'#010+
+  '        -$(DEL) $(FPCMAKED) $(PPAS) link.res $(REDIRFILE)'#010+
   #010+
   'fpc_cleanall: $(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
-  '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHA'+
-  'REDLIBEXT) *$(PPLEXT)'#010+
+  '        -$(DEL) *$(','OEXT) *$(PPUEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(S'+
+  'HAREDLIBEXT) *$(PPLEXT)'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
-  ' ','       -$(DEL) $(FPCMAKED) $(PPAS) link.res $(REDIRFILE)'#010+
+  '        -$(DEL) $(FPCMAKED) $(PPAS) link.res $(REDIRFILE)'#010+
   #010+
   #010+
   '[dependrules]'#010+
-  '#####################################################################'#010+
+  '############################################################','########'+
+  '#'#010+
   '# Depend rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc','_depend'#010+
+  '.PHONY: fpc_depend'#010+
   #010+
   'fpc_depend:'#010+
   '        $(PPDEP) $(UNITOBJECTS)'#010+
   #010+
   #010+
   '[inforules]'#010+
-  '#####################################################################'#010+
+  '##################################################################','##'+
+  '#'#010+
   '# Info rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_info fp','c_cfginfo fpc_objectinfo fpc_toolsinfo fpc_instal'+
-  'linfo \'#010+
+  '.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+
+  'nfo \'#010+
   '        fpc_dirinfo'#010+
   #010+
   'fpc_info: $(INFOTARGET)'#010+
   #010+
   '[info_cfg]'#010+
   'fpc_infocfg:'#010+
-  '        @$(ECHO)'#010+
+  '      ','  @$(ECHO)'#010+
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  FPC....... $(FPC)'#010,
+  '        @$(ECHO)  FPC....... $(FPC)'#010+
   '        @$(ECHO)  Version... $(FPC_VERSION)'#010+
   '        @$(ECHO)  CPU....... $(CPU_TARGET)'#010+
   '        @$(ECHO)  Source.... $(OS_SOURCE)'#010+
-  '        @$(ECHO)  Target.... $(OS_TARGET)'#010+
+  '    ','    @$(ECHO)  Target.... $(OS_TARGET)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[info_dirs]'#010+
   'fpc_infodirs:'#010+
   'ifdef inlinux'#010+
-  '        @$(','ECHO)'#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
   'ifdef NEEDGCCLIB'#010+
   '        @$(ECHO)  GCC library is needed.'#010+
   'endif'#010+
-  'ifdef NEEDOTHERLIB'#010+
+  'ifdef N','EEDOTHERLIB'#010+
   '        @$(ECHO)  Other library is needed.'#010+
   'endif'#010+
-  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010,
+  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)'#010+
-  'endif'#010+
+  'e','ndif'#010+
   #010+
   '[info_tools]'#010+
   'fpc_infotools:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
-  '    ','    @$(ECHO)  Pwd....... $(PWD)'#010+
+  '        @$(ECHO)  Pwd....... $(PWD)'#010+
   '        @$(ECHO)  Echo...... $(ECHO)'#010+
   'ifdef PPDEP'#010+
   '        @$(ECHO)  PPDep..... $(PPDEP)'#010+
   'endif'#010+
-  'ifdef PPUMOVE'#010+
+  'ifdef PP','UMOVE'#010+
   '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
   'endif'#010+
   'ifdef PPUFILES'#010+
-  '        @$(ECHO)  PPUFiles.. $(PPUFILES)',#010+
+  '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
   'endif'#010+
   'ifdef DATA2INC'#010+
   '        @$(ECHO)  Data2Inc.. $(DATA2INC)'#010+
@@ -1165,77 +1169,61 @@ const fpcmakeini : array[0..104,1..240] of char=(
   '        @$(ECHO)  Sed....... $(SED)'#010+
   'endif'#010+
   'ifdef DATE'#010+
-  '        @$(ECHO)  Date...... $(DATE)'#010+
+  ' ','       @$(ECHO)  Date...... $(DATE)'#010+
   'endif'#010+
   'ifdef DIFF'#010+
   '        @$(ECHO)  Diff...... $(DIFF)'#010+
   'endif'#010+
   'ifdef CMP'#010+
-  ' ','       @$(ECHO)  Cmp....... $(CMP)'#010+
+  '        @$(ECHO)  Cmp....... $(CMP)'#010+
   'endif'#010+
   'ifdef UPXPROG'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
   'endif'#010+
   'ifdef ZIPPROG'#010+
-  '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
+  '        @$(ECHO)  ','Zip....... $(ZIPPROG)'#010+
   'endif'#010+
   '        @$(ECHO)'#010+
   #010+
   '[info_objects]'#010+
   'fpc_infoobjects:'#010+
   '        @$(ECHO)'#010+
-  '        @$(E','CHO)  == Object info =='#010+
+  '        @$(ECHO)  == Object info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)'#010+
-  '        @$(ECHO)  UnitObjects....... $(UNITOBJECTS)'#010+
+  '        @$(ECHO)  UnitObjects....... $','(UNITOBJECTS)'#010+
   '        @$(ECHO)  ExeObjects........ $(EXEOBJECTS)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  ExtraCl','eanUnits... $(EXTRACLEANUNITS)'#010+
+  '        @$(ECHO)  ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+
   '        @$(ECHO)  ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
+  '        @$(ECHO)  ExtraInstal','lUnits. $(EXTRAINSTALLUNITS)'#010+
   '        @$(ECHO)  ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
   '        @$(ECHO)'#010+
   #010+
-  '[i','nfo_install]'#010+
+  '[info_install]'#010+
   'fpc_infoinstall:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Install info =='#010+
   '        @$(ECHO)'#010+
   'ifdef DATE'#010+
-  '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
+  '        @$(ECHO)  Dat','eStr.............. $(DATESTR)'#010+
   'endif'#010+
   '        @$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)'#010+
-  '        @$(ECH','O)'#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  BaseInstallDir....... $(BASEINSTALLDIR)'#010+
   '        @$(ECHO)  BinInstallDir........ $(BININSTALLDIR)'#010+
-  '        @$(ECHO)  LibInstallDir........ $(LIBINSTALLDIR)'#010+
+  '        @$(ECHO',')  LibInstallDir........ $(LIBINSTALLDIR)'#010+
   '        @$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)'#010+
-  '       ',' @$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
+  '        @$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
   '        @$(ECHO)  DocInstallDir........ $(DOCINSTALLDIR)'#010+
-  '        @$(ECHO)  ExtraInstallDir...... $(EXTRAINSTALLDIR)'#010+
+  '        @$(ECHO)  Extra','InstallDir...... $(EXTRAINSTALLDIR)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[userrules]'#010+
-  '#########################################','###########################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Users rules'#010+
   '#####################################################################'#010+
   #010+
-  '[end]'#010+
-  ';'#010+
-  '; $Log$
-  '; Revision 1.3  1999-11-25 20:23:00  peter
-  ';   * package dependencies
-  ';'#010+
-  '; Revision 1.8  1999/11/24 23:53:00  peter'#010+
-  ';   * packages'#010+
-  ';   * lot of other changes'#010+
-  ';'#010+
-  '; Revis','ion 1.7  1999/11/23 09:43:35  peter'#010+
-  ';   + internal .ini file'#010+
-  ';   + packages support'#010+
-  ';   * ppufiles,data2inc support'#010+
-  ';'#010+
-  ';'#010
+  '[end]'#010
 );

utils/fpcmake.ini

@@ -168,9 +168,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -808,7 +808,9 @@ fpc_test: examples
 $(FPCMAKED):
         @$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+         $(addsuffix _component,$(COMPILECOMPONENTS)) \
+         $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
         $(MAKE) all DEBUG=1
@@ -1177,18 +1179,3 @@ endif
 #####################################################################
 
 [end]
-;
-; $Log$
-; Revision 1.9  1999-11-25 20:23:01  peter
-;   * package dependencies
-;
-; Revision 1.8  1999/11/24 23:53:00  peter
-;   * packages
-;   * lot of other changes
-;
-; Revision 1.7  1999/11/23 09:43:35  peter
-;   + internal .ini file
-;   + packages support
-;   * ppufiles,data2inc support
-;
-;

utils/fpcmake.pp

@@ -112,6 +112,7 @@ type
     DefaultOptions : string;
     DirFpc,
     DirPackage,
+    DirComponent,
     DirUnit,
     DirLib,
     DirObj,
@@ -121,6 +122,7 @@ type
     DirInc         : string;
     PackageRTL,
     PackageFCL     : boolean;
+    Components,
     Packages       : TTargetsString;
     LibName,
     LibUnits       : string;
@@ -259,12 +261,14 @@ begin
      DefaultCPU:=ReadString(ini_defaults,'defaultcpu','');
      DefaultOptions:=ReadString(ini_defaults,'defaultoptions','');
    { packages }
+     ReadTargetsString(Components,ini_packages,'components','');
      ReadTargetsString(Packages,ini_packages,'packages','');
      PackageRTL:=ReadBool(ini_packages,'rtl',true);
      PackageFCL:=ReadBool(ini_packages,'fcl',false);
    { dirs }
      DirFpc:=ReadString(ini_dirs,'fpcdir','');
      DirPackage:=ReadString(ini_dirs,'packagedir','$(FPCDIR)/packages');
+     DirComponent:=ReadString(ini_dirs,'componentdir','$(FPCDIR)/components');
      DirUnit:=ReadString(ini_dirs,'unitdir','');
      DirLib:=ReadString(ini_dirs,'libdir','');
      DirObj:=ReadString(ini_dirs,'objdir','');
@@ -515,19 +519,39 @@ var
   end;
 
   procedure AddPackageDep(const packagedir,s,s2:string;ifdefneed:boolean);
+  var
+    s3 : string;
   begin
+    if s<>'' then
+     s3:='/'+s
+    else
+     s3:='';
     if ifdefneed then
      mf.Add('ifdef PACKAGE'+Uppercase(s));
-    mf.Add('ifneq ($(wildcard '+packagedir+'/'+s+'),)');
-    mf.Add('ifeq ($(wildcard '+packagedir+'/'+s+'/$(FPCMAKED)),)');
+    mf.Add('ifneq ($(wildcard '+packagedir+s3+'),)');
+    mf.Add('ifeq ($(wildcard '+packagedir+s3+'/$(FPCMAKED)),)');
     mf.Add('override COMPILEPACKAGES+='+s2);
     mf.Add(s2+'_package:');
-    mf.Add(#9'$(MAKE) -C '+packagedir+'/'+s+' all');
+    mf.Add(#9'$(MAKE) -C '+packagedir+s3+' all');
     mf.Add('endif');
     mf.Add('endif');
     if ifdefneed then
      mf.Add('endif');
-    Phony:=Phony+' '+s+'_package';
+    Phony:=Phony+' '+s2+'_package';
+  end;
+
+  procedure AddComponentDep(const s:string);
+  begin
+    mf.Add('ifdef COMPONENT'+Uppercase(s));
+    mf.Add('ifneq ($(wildcard $(COMPONENTDIR)/'+s+'),)');
+    mf.Add('ifeq ($(wildcard $(COMPONENTDIR)/'+s+'/$(FPCMAKED)),)');
+    mf.Add('override COMPILECOMPONENTS+='+s);
+    mf.Add(s+'_component:');
+    mf.Add(#9'$(MAKE) -C $(COMPONENTDIR)/'+s+' all');
+    mf.Add('endif');
+    mf.Add('endif');
+    mf.Add('endif');
+    Phony:=Phony+' '+s+'_component';
   end;
 
   function AddTargetDefines(const ts:TTargetsString;const prefix:string):string;
@@ -655,6 +679,13 @@ begin
         Add('PACKAGEDIR='+userini.dirpackage);
         Add('endif');
       end;
+     if userini.dircomponent<>'' then
+      begin
+        { this dir can be set in the environment, it's more a default }
+        Add('ifndef COMPONENTDIR');
+        Add('COMPONENTDIR='+userini.dircomponent);
+        Add('endif');
+      end;
      if userini.dirunit<>'' then
       Add('override NEEDUNITDIR='+userini.dirunit);
      if userini.dirlib<>'' then
@@ -679,10 +710,13 @@ begin
    { Packages }
      AddHead('Packages');
      AddTargets('PACKAGES',userini.packages,false);
+     AddTargets('COMPONENTS',userini.components,false);
      if userini.PackageFCL then
       Add('override NEEDUNITDIR+=$(FPCDIR)/fcl/$(OS_TARGET)');
      if not TargetStringEmpty(userini.Packages) then
       Add('override NEEDUNITDIR+=$(addprefix $(PACKAGEDIR)/,$(PACKAGES))');
+     if not TargetStringEmpty(userini.Components) then
+      Add('override NEEDUNITDIR+=$(addprefix $(COMPONENTDIR)/,$(COMPONENTS))');
 
    { Libs }
      AddHead('Libraries');
@@ -740,7 +774,8 @@ begin
         AddSection((userini.dirfpc<>''),'command_unitsdir');
         AddSection((userini.dirunit<>'') or
                    (userini.packagefcl) or
-                   (not TargetStringEmpty(userini.packages))
+                   (not TargetStringEmpty(userini.packages)) or
+                   (not TargetStringEmpty(userini.components))
                    ,'command_needunit');
         AddSection((userini.dirlib<>''),'command_needlib');
         AddSection((userini.dirobj<>''),'command_needobj');
@@ -789,9 +824,9 @@ begin
      AddSection(true,'packagedependrules');
      Phony:='';
      if userini.packagertl then
-      AddPackageDep('$(RTLDIR)','$(OS_TARGET)','rtl',false);
+      AddPackageDep('$(RTLDIR)','','rtl',false);
      if userini.packagefcl then
-      AddPackageDep('$(FCLDIR)','$(OS_TARGET)','fcl',false);
+      AddPackageDep('$(FCLDIR)','','fcl',false);
      Add('');
      if not TargetStringEmpty(userini.Packages) then
       begin
@@ -811,10 +846,30 @@ begin
         Add('');
       end;
 
-   { compile rules for making units/loaders/exes/examples }
+   { Components }
+     Phony:='';
+     if not TargetStringEmpty(userini.Components) then
+      begin
+        hs:=AddTargetDefines(userini.Components,'COMPONENT');
+        repeat
+          i:=pos(' ',hs);
+          if i=0 then
+           i:=length(hs)+1;
+          AddComponentDep(Copy(hs,1,i-1));
+          system.delete(hs,1,i);
+        until hs='';
+        Add('');
+      end;
+     if Phony<>'' then
+      begin
+        Add('.PHONY: '+Phony);
+        Add('');
+      end;
+
+   { compile rules for making loaders/units/exes/examples }
+     AddSection(not TargetStringEmpty(userini.targetloaders),'loaderrules');
      AddSection(not TargetStringEmpty(userini.targetunits),'unitrules');
      AddSection(not TargetStringEmpty(userini.targetprograms),'exerules');
-     AddSection(not TargetStringEmpty(userini.targetloaders),'loaderrules');
      AddSection(not TargetStringEmpty(userini.targetexamples),'examplerules');
 
    { default fpc_ rules }
@@ -886,7 +941,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.9  1999-11-25 20:23:01  peter
+  Revision 1.10  1999-11-26 00:20:15  peter
+    * fpcmake updated
+
+  Revision 1.9  1999/11/25 20:23:01  peter
     * package dependencies
 
   Revision 1.8  1999/11/24 23:53:00  peter

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:10
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:45
 #
 
 defaultrule: all
@@ -153,6 +153,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -192,9 +195,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -637,15 +640,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Exes
@@ -671,7 +674,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:10
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:45
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -632,15 +635,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Exes
@@ -666,7 +669,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:10
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:45
 #
 
 defaultrule: all
@@ -163,6 +163,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -202,9 +205,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -647,15 +650,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -695,7 +698,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1