diff --git a/fcl/go32v2/Makefile b/fcl/go32v2/Makefile
index 14b171a590..85309ca5c8 100644
--- a/fcl/go32v2/Makefile
+++ b/fcl/go32v2/Makefile
@@ -46,7 +46,7 @@ DEFAULTUNITS=1
 # They are default units for all platforms.
 include $(INC)/Makefile.inc
 
-UNITOBJECTS=$(INCUNITS)
+UNITOBJECTS=classes $(INCUNITS)
 EXEOBJECTS=
 
 
@@ -132,7 +132,10 @@ inifiles$(PPUEXT): classes$(PPUEXT) inifiles$(PASEXT)
 
 #
 # $Log$
-# Revision 1.4  1999-04-22 10:50:44  peter
+# Revision 1.5  1999-05-31 12:47:58  peter
+#   * classes unit to unitobjects
+#
+# Revision 1.4  1999/04/22 10:50:44  peter
 #   * set target always
 #
 # Revision 1.3	1999/04/08 10:18:48  peter
diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile
index 707046c5d8..0aa326f1f3 100644
--- a/fcl/linux/Makefile
+++ b/fcl/linux/Makefile
@@ -46,7 +46,7 @@ DEFAULTUNITS=1
 # They are default units for all platforms.
 include $(INC)/Makefile.inc
 
-UNITOBJECTS=$(INCUNITS)
+UNITOBJECTS=classes $(INCUNITS)
 EXEOBJECTS=
 
 
@@ -133,7 +133,10 @@ ezcgi$(PPUEXT): ezcgi$(PASEXT) ezcgi.inc
 
 #
 # $Log$
-# Revision 1.10  1999-04-27 19:13:44  michael
+# Revision 1.11  1999-05-31 12:46:31  peter
+#   * classes unit to unitobjects
+#
+# Revision 1.10  1999/04/27 19:13:44  michael
 # + Added ezcgi from Michael Hess
 #
 # Revision 1.9  1999/04/22 10:50:45  peter
diff --git a/fcl/linux/thread.inc b/fcl/linux/thread.inc
index 7acffe0201..336797de57 100644
--- a/fcl/linux/thread.inc
+++ b/fcl/linux/thread.inc
@@ -21,18 +21,12 @@ var
   ThreadRoot : PThreadRec;
   ThreadsInited : boolean;
 
-function StackPointer:longint;assembler;
-asm
-        movl    %esp,%eax
-end;
-
-
 function ThreadSelf:TThread;
 var
   hp : PThreadRec;
   sp : longint;
 begin
-  sp:=StackPointer;
+  sp:=SPtr;
   hp:=ThreadRoot;
   while assigned(hp) do
    begin
@@ -264,7 +258,10 @@ end;
 
 {
   $Log$
-  Revision 1.1  1999-05-30 10:46:42  peter
+  Revision 1.2  1999-05-31 12:47:59  peter
+    * classes unit to unitobjects
+
+  Revision 1.1  1999/05/30 10:46:42  peter
     * start of tthread for linux,win32
 
 }
diff --git a/fcl/os2/Makefile b/fcl/os2/Makefile
index bd93602c05..24b827d80f 100644
--- a/fcl/os2/Makefile
+++ b/fcl/os2/Makefile
@@ -42,7 +42,7 @@ DEFAULTUNITS=1
 # They are default units for all platforms.
 include $(INC)/Makefile.inc
 
-UNITOBJECTS=$(INCUNITS)
+UNITOBJECTS=classes $(INCUNITS)
 EXEOBJECTS=
 
 
@@ -126,7 +126,10 @@ classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
 
 #
 # $Log$
-# Revision 1.5  1999-04-08 15:59:54  michael
+# Revision 1.6  1999-05-31 12:48:00  peter
+#   * classes unit to unitobjects
+#
+# Revision 1.5  1999/04/08 15:59:54  michael
 # + INCUNITS added
 #
 # Revision 1.8  1999/04/08 15:58:44  michael
diff --git a/fcl/template/Makefile b/fcl/template/Makefile
new file mode 100644
index 0000000000..b465f13351
--- /dev/null
+++ b/fcl/template/Makefile
@@ -0,0 +1,141 @@
+#
+#   $Id$
+#   Copyright (c) 1999 by the Free Pascal Development Team
+#
+#   Makefile for Free Component Library for Linux
+#
+#   See the file COPYING.FPC, included in this distribution,
+#   for details about the copyright.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+
+#####################################################################
+# Defaults
+#####################################################################
+
+# Default place of the makefile.fpc
+DEFAULTFPCDIR=../..
+
+# Include files
+INC=../inc
+PROCINC=../$(CPU)
+
+# Where to place the files
+TARGETDIR=.
+
+# We need always -S2
+NEEDOPT=-S2
+
+# As default make only the units
+DEFAULTUNITS=1
+
+
+#####################################################################
+# Real targets
+#####################################################################
+
+# INCUNITS is defined in makefile.inc
+# They are default units for all platforms.
+include $(INC)/Makefile.inc
+
+UNITOBJECTS=classes $(INCUNITS)
+EXEOBJECTS=
+
+
+#####################################################################
+# Common targets
+#####################################################################
+
+.PHONY: all clean install info \
+        staticlib sharedlib libsclean \
+        staticinstall sharedinstall libinstall \
+        
+all: testfpcmake fpc_all
+
+clean: testfpcmake fpc_clean
+
+install: testfpcmake fpc_install
+
+info: testfpcmake fpc_info
+
+staticlib: testfpcmake fpc_staticlib
+
+sharedlib: testfpcmake fpc_sharedlib
+
+libsclean: testfpcmake fpc_libsclean
+
+staticinstall: testfpcmake fpc_staticinstall
+
+sharedinstall: testfpcmake fpc_sharedinstall
+
+libinstall: testfpcmake fpc_libinstall
+
+
+#####################################################################
+# Include default makefile
+#####################################################################
+
+# test if FPCMAKE is still valid
+ifdef FPCMAKE
+ifeq ($(strip $(wildcard $(FPCMAKE))),)
+FPCDIR=
+FPCMAKE=
+endif
+endif
+
+ifndef FPCDIR
+ifdef DEFAULTFPCDIR
+FPCDIR=$(DEFAULTFPCDIR)
+endif
+endif
+
+ifndef FPCMAKE
+ifdef FPCDIR
+FPCMAKE=$(FPCDIR)/makefile.fpc
+else
+FPCMAKE=makefile.fpc
+endif
+endif
+
+override FPCMAKE:=$(strip $(wildcard $(FPCMAKE)))
+ifeq ($(FPCMAKE),)
+testfpcmake:
+	@echo makefile.fpc not found!
+	@echo Check the FPCMAKE and FPCDIR environment variables.
+	@exit
+else
+include $(FPCMAKE)
+testfpcmake:
+endif
+
+
+
+#####################################################################
+# Dependencies
+#####################################################################
+
+vpath %$(PASEXT) $(INC)
+
+INCFILES=$(addprefix $(INC)/,$(INCNAMES))
+
+classes$(PPUEXT): $(INCFILES) classes$(PASEXT)
+
+#
+# $Log$
+# Revision 1.1  1999-05-31 12:48:01  peter
+#   * classes unit to unitobjects
+#
+# Revision 1.5  1999/04/08 15:59:54  michael
+# + INCUNITS added
+#
+# Revision 1.8  1999/04/08 15:58:44  michael
+# + INCUNITS added
+#
+# Revision 1.7  1999/04/08 10:18:59  peter
+#   * makefile updates
+#
+#
diff --git a/fcl/win32/Makefile b/fcl/win32/Makefile
index 012f355f34..65425fbce6 100644
--- a/fcl/win32/Makefile
+++ b/fcl/win32/Makefile
@@ -46,7 +46,7 @@ DEFAULTUNITS=1
 # They are default units for all platforms.
 include $(INC)/Makefile.inc
 
-UNITOBJECTS=$(INCUNITS)
+UNITOBJECTS=classes $(INCUNITS)
 EXEOBJECTS=
 
 
@@ -134,7 +134,10 @@ ezcgi$(PPUEXT): ezcgi$(PASEXT) ezcgi.inc
 
 #
 # $Log$
-# Revision 1.8  1999-04-27 19:13:45  michael
+# Revision 1.9  1999-05-31 12:48:01  peter
+#   * classes unit to unitobjects
+#
+# Revision 1.8  1999/04/27 19:13:45  michael
 # + Added ezcgi from Michael Hess
 #
 # Revision 1.7  1999/04/22 10:50:46  peter