added package and cross compilation output dirs

git-svn-id: trunk@5013 -

.gitattributes

@@ -57,6 +57,8 @@ components/gtk/gtkglarea/tgtkglareacontrol.xpm -text svneol=native#image/x-xpixm
 components/htmllite/html32.res svneol=native#unset
 components/htmllite/htmllite.dcr -text svneol=native#application/x-director
 components/htmllite/htmllite.pas svneol=native#text/pascal
+components/htmllite/lazhtmllite.lpk svneol=native#text/pascal
+components/htmllite/lazhtmllite.pas svneol=native#text/pascal
 components/htmllite/litecons.inc svneol=native#text/pascal
 components/htmllite/litedith.pas svneol=native#text/pascal
 components/htmllite/litegif1.pas svneol=native#text/pascal

components/htmllite/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/03]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx
+MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -10,6 +10,7 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
+SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@@ -204,50 +205,12 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=htmllite
 override PACKAGE_VERSION=0.2a
-override DEFAULT_LCLDIR=../../lcl
-ifndef LCL_PLATFORM
-ifeq ($(OS_TARGET),win32)
-LCL_PLATFORM=win32
-else
-LCL_PLATFORM=gtk
-endif
-endif
-export LCL_PLATFORM
-ifdef LCLDIR
-override LCLDIR:=$(subst \,/,$(LCLDIR))
-ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)
-override LCLDIR=wrong
-endif
-else
-override LCLDIR=wrong
-endif
-ifdef DEFAULT_LCLDIR
-override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))
-ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)
-override LCLDIR=wrong
-endif
-endif
-ifeq ($(LCLDIR),wrong)
-override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))
-ifeq ($(LCLDIR),)
-override LCLDIR=wrong
-endif
-endif
-ifeq ($(LCLDIR),wrong)
-override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))
-ifeq ($(LCLDIR),)
-override LCLDIR=wrong
-endif
-endif
-override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDIR)/units)
-override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../components $(LCLDIR)/components)
-export LCLDIR LCLUNITDIR LCLCOMPONENTDIR
-override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)
-override COMPILER_UNITDIR+=$(LCLUNITDIR)
 override TARGET_UNITS+=htmllite
 override TARGET_IMPLICITUNITS+=htmllite litepars litesubs litedith litegif2 litereadthd liteun2 litesbs1
-override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+override CLEAN_FILES+=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) $(COMPILER_UNITTARGETDIR)/$(wildcard *$(OEXT)) $(COMPILER_UNITTARGETDIR)/$(wildcard *$(PPUEXT)) $(COMPILER_UNITTARGETDIR)/$(wildcard *$(RSTEXT))
 override COMPILER_OPTIONS+=-gl -dHL_LAZARUS
+override COMPILER_UNITDIR+=../../lcl/units/$(CPU_TARGET)/$(OS_TARGET) .
+override COMPILER_UNITTARGETDIR+=units/$(CPU_TARGET)/$(OS_TARGET)
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -330,9 +293,17 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
+else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
+endif
+else
+ifdef CROSSCOMPILE
+INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
+endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@@ -441,16 +412,16 @@ endif
 else
 CROSSBINDIR=
 endif
-ifdef inUnix
+ifeq ($(OS_SOURCE),linux)
 ifndef GCCLIBDIR
 GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
 endif
-ifeq ($(OS_TARGET),linux)
 ifndef OTHERLIBDIR
 OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
 endif
 endif
-ifeq ($(OS_TARGET),netbsd)
+ifdef inUnix
+ifeq ($(OS_SOURCE),netbsd)
 OTHERLIBDIR+=/usr/pkg/lib
 endif
 export GCCLIBDIR OTHERLIB
@@ -478,6 +449,14 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.wat
+ZIPSUFFIX=watc
+OEXT=.obj
+ASMEXT=.asm
+SHAREDLIBEXT=.dll
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -580,6 +559,11 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
+ifeq ($(OS_TARGET),watcom)
+STATICLIBPREFIX=
+FPCMADE=fpcmade.dos
+ZIPSUFFIX=watcom
+endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -768,7 +752,11 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
+ifndef inUnix
+ECHOREDIR=echo
+else
+ECHOREDIR=$(ECHO)
+endif
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@@ -839,14 +827,16 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=$(BINUTILSPREFIX)as
+LDNAME=$(BINUTILSPREFIX)ld
+ARNAME=$(BINUTILSPREFIX)ar
+RCNAME=$(BINUTILSPREFIX)rc
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+ifeq ($(OS_TARGET),win32)
 ASNAME=as
 LDNAME=ld
 ARNAME=ar
-RCNAME=rc
+endif
-ifeq ($(OS_TARGET),win32)
-ASNAME=asw
-LDNAME=ldw
-ARNAME=arw
 endif
 ifndef ASPROG
 ifdef CROSSBINDIR
@@ -919,20 +909,18 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl lcl
+override REQUIRE_PACKAGES=rtl fcl
 ifeq ($(OS_TARGET),linux)
 ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -941,13 +929,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -956,13 +942,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -971,13 +955,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),linux)
@@ -986,13 +968,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),go32v2)
@@ -1000,11 +980,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),win32)
@@ -1013,12 +990,10 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
+REQUIRE_PACKAGES_SQLITE=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),os2)
@@ -1026,11 +1001,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),freebsd)
@@ -1039,13 +1011,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),freebsd)
@@ -1054,13 +1024,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
+REQUIRE_PACKAGES_PTHREADS=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),beos)
@@ -1068,11 +1036,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),netbsd)
@@ -1082,12 +1047,9 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),netbsd)
@@ -1097,12 +1059,9 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -1110,11 +1069,8 @@ ifeq ($(CPU_TARGET),m68k)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),atari)
@@ -1122,11 +1078,8 @@ ifeq ($(CPU_TARGET),m68k)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),sunos)
@@ -1134,11 +1087,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),sunos)
@@ -1146,11 +1096,8 @@ ifeq ($(CPU_TARGET),sparc)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),qnx)
@@ -1158,11 +1105,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),netware)
@@ -1170,11 +1114,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),openbsd)
@@ -1184,12 +1125,9 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),openbsd)
@@ -1199,12 +1137,9 @@ REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_MYSQL=1
 REQUIRE_PACKAGES_IBASE=1
-REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_SQLITE=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),wdosx)
@@ -1212,11 +1147,8 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),palmos)
@@ -1224,11 +1156,8 @@ ifeq ($(CPU_TARGET),m68k)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),macos)
@@ -1236,11 +1165,8 @@ ifeq ($(CPU_TARGET),powerpc)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),darwin)
@@ -1248,11 +1174,8 @@ ifeq ($(CPU_TARGET),powerpc)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
-REQUIRE_PACKAGES_GTK=1
 endif
 endif
 ifeq ($(OS_TARGET),emx)
@@ -1260,11 +1183,17 @@ ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
-REQUIRE_PACKAGES_LCL=1
 REQUIRE_PACKAGES_NETDB=1
 REQUIRE_PACKAGES_LIBASYNC=1
-REQUIRE_PACKAGES_OPENGL=1
+endif
-REQUIRE_PACKAGES_GTK=1
+endif
+ifeq ($(OS_TARGET),watcom)
+ifeq ($(CPU_TARGET),i386)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_NETDB=1
+REQUIRE_PACKAGES_LIBASYNC=1
 endif
 endif
 ifdef REQUIRE_PACKAGES_RTL
@@ -1371,6 +1300,32 @@ ifdef UNITDIR_LIBASYNC
 override COMPILER_UNITDIR+=$(UNITDIR_LIBASYNC)
 endif
 endif
+ifdef REQUIRE_PACKAGES_PTHREADS
+PACKAGEDIR_PTHREADS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_PTHREADS),)
+ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/$(OS_TARGET)),)
+UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/$(OS_TARGET)
+else
+UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PTHREADS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PTHREADS)/$(FPCMADE)
+endif
+else
+PACKAGEDIR_PTHREADS=
+UNITDIR_PTHREADS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pthreads/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_PTHREADS),)
+UNITDIR_PTHREADS:=$(firstword $(UNITDIR_PTHREADS))
+else
+UNITDIR_PTHREADS=
+endif
+endif
+ifdef UNITDIR_PTHREADS
+override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS)
+endif
+endif
 ifdef REQUIRE_PACKAGES_FCL
 PACKAGEDIR_FCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_FCL),)
@@ -1397,32 +1352,6 @@ ifdef UNITDIR_FCL
 override COMPILER_UNITDIR+=$(UNITDIR_FCL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_LCL
-PACKAGEDIR_LCL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /lcl/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_LCL),)
-ifneq ($(wildcard $(PACKAGEDIR_LCL)/$(OS_TARGET)),)
-UNITDIR_LCL=$(PACKAGEDIR_LCL)/$(OS_TARGET)
-else
-UNITDIR_LCL=$(PACKAGEDIR_LCL)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_LCL)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_LCL) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_LCL)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_LCL=
-UNITDIR_LCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /lcl/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_LCL),)
-UNITDIR_LCL:=$(firstword $(UNITDIR_LCL))
-else
-UNITDIR_LCL=
-endif
-endif
-ifdef UNITDIR_LCL
-override COMPILER_UNITDIR+=$(UNITDIR_LCL)
-endif
-endif
 ifdef REQUIRE_PACKAGES_MYSQL
 PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_MYSQL),)
@@ -1475,82 +1404,30 @@ ifdef UNITDIR_IBASE
 override COMPILER_UNITDIR+=$(UNITDIR_IBASE)
 endif
 endif
-ifdef REQUIRE_PACKAGES_X11
+ifdef REQUIRE_PACKAGES_SQLITE
-PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR))))))
+PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_X11),)
+ifneq ($(PACKAGEDIR_SQLITE),)
-ifneq ($(wildcard $(PACKAGEDIR_X11)/$(OS_TARGET)),)
+ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/$(OS_TARGET)),)
-UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
+UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/$(OS_TARGET)
 else
-UNITDIR_X11=$(PACKAGEDIR_X11)
+UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)
 endif
 ifdef CHECKDEPEND
-$(PACKAGEDIR_X11)/$(FPCMADE):
+$(PACKAGEDIR_SQLITE)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+	$(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_SQLITE)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_X11=
+PACKAGEDIR_SQLITE=
-UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
+UNITDIR_SQLITE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_X11),)
+ifneq ($(UNITDIR_SQLITE),)
-UNITDIR_X11:=$(firstword $(UNITDIR_X11))
+UNITDIR_SQLITE:=$(firstword $(UNITDIR_SQLITE))
 else
-UNITDIR_X11=
+UNITDIR_SQLITE=
 endif
 endif
-ifdef UNITDIR_X11
+ifdef UNITDIR_SQLITE
-override COMPILER_UNITDIR+=$(UNITDIR_X11)
+override COMPILER_UNITDIR+=$(UNITDIR_SQLITE)
-endif
-endif
-ifdef REQUIRE_PACKAGES_OPENGL
-PACKAGEDIR_OPENGL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /opengl/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_OPENGL),)
-ifneq ($(wildcard $(PACKAGEDIR_OPENGL)/$(OS_TARGET)),)
-UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET)
-else
-UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_OPENGL)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_OPENGL=
-UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_OPENGL),)
-UNITDIR_OPENGL:=$(firstword $(UNITDIR_OPENGL))
-else
-UNITDIR_OPENGL=
-endif
-endif
-ifdef UNITDIR_OPENGL
-override COMPILER_UNITDIR+=$(UNITDIR_OPENGL)
-endif
-endif
-ifdef REQUIRE_PACKAGES_GTK
-PACKAGEDIR_GTK:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_GTK),)
-ifneq ($(wildcard $(PACKAGEDIR_GTK)/$(OS_TARGET)),)
-UNITDIR_GTK=$(PACKAGEDIR_GTK)/$(OS_TARGET)
-else
-UNITDIR_GTK=$(PACKAGEDIR_GTK)
-endif
-ifdef CHECKDEPEND
-$(PACKAGEDIR_GTK)/$(FPCMADE):
-	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
-override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
-endif
-else
-PACKAGEDIR_GTK=
-UNITDIR_GTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_GTK),)
-UNITDIR_GTK:=$(firstword $(UNITDIR_GTK))
-else
-UNITDIR_GTK=
-endif
-endif
-ifdef UNITDIR_GTK
-override COMPILER_UNITDIR+=$(UNITDIR_GTK)
 endif
 endif
 ifndef NOCPUDEF
@@ -1562,6 +1439,14 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
+ifndef CROSSBOOTSTRAP
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
+endif
+ifneq ($(BINUTILSPREFIX),)
+override FPCOPT+=-Xr$(RLINKPATH)
+endif
+endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1699,7 +1584,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@@ -1712,10 +1597,14 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
+%$(EXEEXT): %.dpr
+	$(COMPILER) $<
+	$(EXECPPAS)
 %.res: %.rc
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
+vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
@@ -1994,16 +1883,6 @@ fpc_baseinfo:
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
-override INFORULES+=lclinfo
-.PHONY: lclinfo
-lclinfo:
-	@$(ECHO)  == LCL info ==
-	@$(ECHO)
-	@$(ECHO)  Platform............. $(LCL_PLATFORM)
-	@$(ECHO)  LCLDIR............... $(LCLDIR)
-	@$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)
-	@$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR)
-	@$(ECHO)
 .PHONY: fpc_info
 fpc_info: $(INFORULES)
 .PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2 \

components/htmllite/Makefile.fpc

@@ -9,6 +9,8 @@ version=0.2a
 
 [compiler]
 options=-gl -dHL_LAZARUS
+unittargetdir=units/$(CPU_TARGET)/$(OS_TARGET)
+unitdir=../../lcl/units/$(CPU_TARGET)/$(OS_TARGET) .
 
 [target]
 units=htmllite
@@ -16,13 +18,18 @@ implicitunits=htmllite litepars litesubs litedith litegif2 litereadthd liteun2 \
   litesbs1
 
 [clean]
-files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
+files=$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) \
+  $(COMPILER_UNITTARGETDIR)/$(wildcard *$(OEXT)) \
+  $(COMPILER_UNITTARGETDIR)/$(wildcard *$(PPUEXT)) \
+  $(COMPILER_UNITTARGETDIR)/$(wildcard *$(RSTEXT))
 
 [require]
-packages=lcl
+# Adding lcl does not work, because it adds the source path.
+#packages=lcl
+packages=fcl
 
 [default]
-lcldir=../../lcl
+#lcldir=../../lcl
 
 [rules]
 .PHONY: cleartarget all

components/htmllite/htmllite.pas

@@ -61,9 +61,14 @@ type
     procedure WMEraseBkgnd(var Message: TWMEraseBkgnd); message WM_EraseBkgnd;
     procedure WMLButtonDblClk(var Message: TWMMouse); message WM_LButtonDblClk;
     procedure DoBackground(ACanvas: TCanvas; WmErase: boolean);
+    {$IFNDEF HL_LAZARUS}
     constructor CreateIt(AOwner: TComponent; Viewer: TComponent);
+    {$ENDIF}
     property OnPaint: TNotifyEvent read FOnPaint write FOnPaint;
   public
+    {$IFDEF HL_LAZARUS}
+    constructor CreateIt(AOwner: TComponent; Viewer: TComponent);
+    {$ENDIF}
     procedure Paint; override;
     procedure CreateWnd; override;
     procedure DestroyWnd; override;

components/htmllite/lazhtmllite.lpk

@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<CONFIG>
+  <Package Version="2">
+    <Name Value="LazHTMLLite"/>
+    <Author Value="Mattias Gaertner"/>
+    <CompilerOptions>
+      <SearchPaths>
+        <UnitOutputDirectory Value="units/$(TargetCPU)/$(TargetOS)"/>
+      </SearchPaths>
+      <Other>
+        <CustomOptions Value="-dHL_LAZARUS
+"/>
+        <CompilerPath Value="$(CompPath)"/>
+      </Other>
+    </CompilerOptions>
+    <Description Value="HTMLLite"/>
+    <License Value="GPL"/>
+    <Version Minor="1" Release="1"/>
+    <Files Count="9">
+      <Item1>
+        <Filename Value="htmllite.pas"/>
+        <HasRegisterProc Value="True"/>
+        <UnitName Value="HTMLLite"/>
+      </Item1>
+      <Item2>
+        <Filename Value="litecons.inc"/>
+        <Type Value="Include"/>
+      </Item2>
+      <Item3>
+        <Filename Value="litedith.pas"/>
+        <UnitName Value="LiteDith"/>
+      </Item3>
+      <Item4>
+        <Filename Value="litepars.pas"/>
+        <UnitName Value="LitePars"/>
+      </Item4>
+      <Item5>
+        <Filename Value="litereadthd.pas"/>
+        <UnitName Value="LiteReadThd"/>
+      </Item5>
+      <Item6>
+        <Filename Value="litesbs1.pas"/>
+        <UnitName Value="LiteSbs1"/>
+      </Item6>
+      <Item7>
+        <Filename Value="litesubs.pas"/>
+        <UnitName Value="LiteSubs"/>
+      </Item7>
+      <Item8>
+        <Filename Value="liteun2.pas"/>
+        <UnitName Value="LiteUn2"/>
+      </Item8>
+      <Item9>
+        <Filename Value="litegif2.pas"/>
+        <UnitName Value="LiteGIF2"/>
+      </Item9>
+    </Files>
+    <Type Value="RunAndDesignTime"/>
+    <RequiredPkgs Count="1">
+      <Item1>
+        <PackageName Value="LCL"/>
+      </Item1>
+    </RequiredPkgs>
+    <UsageOptions>
+      <UnitPath Value="$(PkgOutDir)/"/>
+    </UsageOptions>
+    <PublishOptions>
+      <Version Value="2"/>
+      <IgnoreBinaries Value="False"/>
+    </PublishOptions>
+  </Package>
+</CONFIG>

components/htmllite/lazhtmllite.pas

@@ -0,0 +1,23 @@
+{ This file was automatically created by Lazarus. Do not edit!
+  This source is only used to compile and install
+  the package LazHTMLLite 0.1.1.
+}
+
+unit LazHTMLLite; 
+
+interface
+
+uses
+  HTMLLite, LiteDith, LitePars, LiteReadThd, LiteSbs1, LiteSubs, LiteUn2, 
+    LiteGIF2, LazarusPackageIntf; 
+
+implementation
+
+procedure Register; 
+begin
+  RegisterUnit('HTMLLite', @HTMLLite.Register); 
+end; 
+
+initialization
+  RegisterPackage('LazHTMLLite', @Register)
+end.

components/htmllite/litesbs1.pas

@@ -13,8 +13,8 @@ unit LiteSbs1;
 interface
 uses
   {$IFDEF HL_LAZARUS}
-  Classes, SysUtils, LCLType, LCLIntf, Messages, GraphType, Graphics, Controls,
+  Classes, SysUtils, LCLType, LCLIntf, GraphType, Graphics, Controls,
-  Forms, Dialogs, StdCtrls, ExtCtrls, LiteUn2, LiteSubs;
+  Forms, Dialogs, StdCtrls, LiteUn2, LiteSubs;
   {$ELSE}
   SysUtils, WinTypes, WinProcs, Messages, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, ExtCtrls, LiteUn2, LiteGif2, LiteSubs;

components/htmllite/liteun2.pas

@@ -13,8 +13,8 @@ unit LiteUn2;
 interface
 uses
   {$IFDEF HL_LAZARUS}
-  LCLIntf, LCLType, VCLGlobals, SysUtils, Messages, Classes, GraphType,
+  LCLIntf, LCLType, VCLGlobals, SysUtils, Classes, GraphType,
-  Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls;
+  Graphics, Controls, Forms, Dialogs, StdCtrls;
   {$ELSE}
   Windows, SysUtils, Messages, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, ExtCtrls;
@@ -305,7 +305,7 @@ implementation
 
 uses
   {$IFDEF HL_LAZARUS}
-  HTMLLite, LiteSubs, LiteDith, LiteGif2;
+  LiteSubs, LiteDith, LiteGif2;
   {$ELSE not HL_LAZARUS}
   {$ifdef ver100_plus}
      jpeg, LiteDith,

components/htmllite/units/i386/freebsd/README

@@ -0,0 +1,3 @@
+This is an output directory, so it is empty at start or after clean up.
+But CVS does not always create empty directories.
+This file makes sure the directory is created.

components/htmllite/units/i386/linux/README

@@ -0,0 +1,3 @@
+This is an output directory, so it is empty at start or after clean up.
+But CVS does not always create empty directories.
+This file makes sure the directory is created.

components/htmllite/units/i386/netbsd/README

@@ -0,0 +1,3 @@
+This is an output directory, so it is empty at start or after clean up.
+But CVS does not always create empty directories.
+This file makes sure the directory is created.

components/htmllite/units/i386/openbsd/README

@@ -0,0 +1,3 @@
+This is an output directory, so it is empty at start or after clean up.
+But CVS does not always create empty directories.
+This file makes sure the directory is created.

components/htmllite/units/i386/win32/README

@@ -0,0 +1,3 @@
+This is an output directory, so it is empty at start or after clean up.
+But CVS does not always create empty directories.
+This file makes sure the directory is created.