From ad0f2320d1cf13073a876c9d8fd3223c5d7b5427 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 27 Jan 2008 11:53:57 +0000 Subject: [PATCH] * os2units moved git-svn-id: trunk@10037 - --- .gitattributes | 46 +- packages/extra/os2units/Makefile.fpc | 16 - packages/extra/os2units/fpmake.pp | 17 - packages/{extra => }/os2units/Makefile | 1527 +++++++++-------- packages/os2units/Makefile.fpc | 26 + .../ftpapi => os2units/examples}/ftptest.pas | 0 .../tests => os2units/examples}/lvmtest.pas | 0 .../tests => os2units/examples}/mciapi1.pas | 0 .../tests => os2units/examples}/mciapi2.pas | 0 packages/os2units/fpmake.pp | 29 + .../os2units/mmtk => os2units}/readme.txt | 0 .../mmtk => os2units/src}/buildall.pas | 0 .../clkdll => os2units/src}/clkdll.pas | 0 .../clkdll => os2units/src}/clktest.pas | 0 .../os2units/mmtk => os2units/src}/dive.pas | 0 .../ftpapi => os2units/src}/ftpapi.pas | 0 .../hwvideo => os2units/src}/hwvideo.pas | 0 .../os2units/lvm => os2units/src}/lvm.pas | 0 .../os2units/mmtk => os2units/src}/mci.pas | 0 .../os2units/mmtk => os2units/src}/mciapi.pas | 0 .../os2units/mmtk => os2units/src}/mcidrv.pas | 0 .../os2units/mmtk => os2units/src}/mmbase.pas | 0 .../os2units/mmtk => os2units/src}/mmio.pas | 0 .../os2units/som => os2units/src}/som.pas | 0 .../os2units/mmtk => os2units/src}/sw.pas | 0 .../os2units/wpstk => os2units/src}/wpstk.pp | 0 26 files changed, 934 insertions(+), 727 deletions(-) delete mode 100644 packages/extra/os2units/Makefile.fpc delete mode 100644 packages/extra/os2units/fpmake.pp rename packages/{extra => }/os2units/Makefile (57%) create mode 100644 packages/os2units/Makefile.fpc rename packages/{extra/os2units/ftpapi => os2units/examples}/ftptest.pas (100%) rename packages/{extra/os2units/lvm/tests => os2units/examples}/lvmtest.pas (100%) rename packages/{extra/os2units/mmtk/tests => os2units/examples}/mciapi1.pas (100%) rename packages/{extra/os2units/mmtk/tests => os2units/examples}/mciapi2.pas (100%) create mode 100644 packages/os2units/fpmake.pp rename packages/{extra/os2units/mmtk => os2units}/readme.txt (100%) rename packages/{extra/os2units/mmtk => os2units/src}/buildall.pas (100%) rename packages/{extra/os2units/clkdll => os2units/src}/clkdll.pas (100%) rename packages/{extra/os2units/clkdll => os2units/src}/clktest.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/dive.pas (100%) rename packages/{extra/os2units/ftpapi => os2units/src}/ftpapi.pas (100%) rename packages/{extra/os2units/hwvideo => os2units/src}/hwvideo.pas (100%) rename packages/{extra/os2units/lvm => os2units/src}/lvm.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/mci.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/mciapi.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/mcidrv.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/mmbase.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/mmio.pas (100%) rename packages/{extra/os2units/som => os2units/src}/som.pas (100%) rename packages/{extra/os2units/mmtk => os2units/src}/sw.pas (100%) rename packages/{extra/os2units/wpstk => os2units/src}/wpstk.pp (100%) diff --git a/.gitattributes b/.gitattributes index e48b4f438c..f70d0a3b7a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1358,48 +1358,25 @@ packages/extra/libndsfpc/nds/system.inc svneol=native#text/plain packages/extra/libndsfpc/nds/timers.inc svneol=native#text/plain packages/extra/libndsfpc/nds7.pp svneol=native#text/plain packages/extra/libndsfpc/nds9.pp svneol=native#text/plain -packages/extra/os2units/Makefile svneol=native#text/plain -packages/extra/os2units/Makefile.fpc svneol=native#text/plain packages/extra/os2units/clkdll/Makefile svneol=native#text/plain packages/extra/os2units/clkdll/Makefile.fpc svneol=native#text/plain -packages/extra/os2units/clkdll/clkdll.pas svneol=native#text/plain -packages/extra/os2units/clkdll/clktest.pas svneol=native#text/plain packages/extra/os2units/clkdll/fpmake.inc svneol=native#text/plain -packages/extra/os2units/fpmake.pp svneol=native#text/plain packages/extra/os2units/ftpapi/Makefile svneol=native#text/plain packages/extra/os2units/ftpapi/Makefile.fpc svneol=native#text/plain packages/extra/os2units/ftpapi/fpmake.inc svneol=native#text/plain -packages/extra/os2units/ftpapi/ftpapi.pas svneol=native#text/plain -packages/extra/os2units/ftpapi/ftptest.pas svneol=native#text/plain packages/extra/os2units/hwvideo/Makefile svneol=native#text/plain packages/extra/os2units/hwvideo/Makefile.fpc svneol=native#text/plain packages/extra/os2units/hwvideo/fpmake.inc svneol=native#text/plain -packages/extra/os2units/hwvideo/hwvideo.pas svneol=native#text/plain packages/extra/os2units/lvm/Makefile svneol=native#text/plain packages/extra/os2units/lvm/Makefile.fpc svneol=native#text/plain packages/extra/os2units/lvm/fpmake.inc svneol=native#text/plain -packages/extra/os2units/lvm/lvm.pas svneol=native#text/plain packages/extra/os2units/lvm/tests/Makefile svneol=native#text/plain packages/extra/os2units/lvm/tests/Makefile.fpc svneol=native#text/plain -packages/extra/os2units/lvm/tests/lvmtest.pas svneol=native#text/plain packages/extra/os2units/mmtk/Makefile svneol=native#text/plain packages/extra/os2units/mmtk/Makefile.fpc svneol=native#text/plain -packages/extra/os2units/mmtk/buildall.pas svneol=native#text/plain -packages/extra/os2units/mmtk/dive.pas svneol=native#text/plain packages/extra/os2units/mmtk/fpmake.inc svneol=native#text/plain -packages/extra/os2units/mmtk/mci.pas svneol=native#text/plain -packages/extra/os2units/mmtk/mciapi.pas svneol=native#text/plain -packages/extra/os2units/mmtk/mcidrv.pas svneol=native#text/plain -packages/extra/os2units/mmtk/mmbase.pas svneol=native#text/plain -packages/extra/os2units/mmtk/mmio.pas svneol=native#text/plain -packages/extra/os2units/mmtk/readme.txt svneol=native#text/plain -packages/extra/os2units/mmtk/sw.pas svneol=native#text/plain packages/extra/os2units/mmtk/tests/Makefile svneol=native#text/plain packages/extra/os2units/mmtk/tests/Makefile.fpc svneol=native#text/plain -packages/extra/os2units/mmtk/tests/mciapi1.pas svneol=native#text/plain -packages/extra/os2units/mmtk/tests/mciapi2.pas svneol=native#text/plain -packages/extra/os2units/som/som.pas svneol=native#text/plain -packages/extra/os2units/wpstk/wpstk.pp svneol=native#text/plain packages/extra/ptc/Makefile -text packages/extra/ptc/Makefile.fpc -text packages/extra/ptc/aread.inc svneol=native#text/x-pascal @@ -3941,6 +3918,29 @@ packages/oracle/src/orl.inc svneol=native#text/plain packages/oracle/src/oro_implementation.inc svneol=native#text/plain packages/oracle/src/oro_interface.inc svneol=native#text/plain packages/oracle/src/ort.inc svneol=native#text/plain +packages/os2units/Makefile svneol=native#text/plain +packages/os2units/Makefile.fpc svneol=native#text/plain +packages/os2units/examples/ftptest.pas svneol=native#text/plain +packages/os2units/examples/lvmtest.pas svneol=native#text/plain +packages/os2units/examples/mciapi1.pas svneol=native#text/plain +packages/os2units/examples/mciapi2.pas svneol=native#text/plain +packages/os2units/fpmake.pp svneol=native#text/plain +packages/os2units/readme.txt svneol=native#text/plain +packages/os2units/src/buildall.pas svneol=native#text/plain +packages/os2units/src/clkdll.pas svneol=native#text/plain +packages/os2units/src/clktest.pas svneol=native#text/plain +packages/os2units/src/dive.pas svneol=native#text/plain +packages/os2units/src/ftpapi.pas svneol=native#text/plain +packages/os2units/src/hwvideo.pas svneol=native#text/plain +packages/os2units/src/lvm.pas svneol=native#text/plain +packages/os2units/src/mci.pas svneol=native#text/plain +packages/os2units/src/mciapi.pas svneol=native#text/plain +packages/os2units/src/mcidrv.pas svneol=native#text/plain +packages/os2units/src/mmbase.pas svneol=native#text/plain +packages/os2units/src/mmio.pas svneol=native#text/plain +packages/os2units/src/som.pas svneol=native#text/plain +packages/os2units/src/sw.pas svneol=native#text/plain +packages/os2units/src/wpstk.pp svneol=native#text/plain packages/palmunits/Makefile svneol=native#text/plain packages/palmunits/Makefile.fpc svneol=native#text/plain packages/palmunits/fpmake.pp svneol=native#text/plain diff --git a/packages/extra/os2units/Makefile.fpc b/packages/extra/os2units/Makefile.fpc deleted file mode 100644 index 3697087f1e..0000000000 --- a/packages/extra/os2units/Makefile.fpc +++ /dev/null @@ -1,16 +0,0 @@ -# -# Makefile.fpc for Free Pascal OS/2 platform units -# - -[target] -dirs=ftpapi mmtk hwvideo lvm clkdll - -[install] -fpcpackage=y -fpcsubdir=packages - -[default] -fpcdir=../../.. - -[rules] -.NOTPARALLEL: diff --git a/packages/extra/os2units/fpmake.pp b/packages/extra/os2units/fpmake.pp deleted file mode 100644 index d4b6178682..0000000000 --- a/packages/extra/os2units/fpmake.pp +++ /dev/null @@ -1,17 +0,0 @@ -{$mode objfpc}{$H+} -program fpmake; - -uses fpmkunit; - -Var - T : TTarget; - -begin - With Installer do - begin - { Base packages } - {$i fpmake.inc} - Run; - end; -end. - diff --git a/packages/extra/os2units/Makefile b/packages/os2units/Makefile similarity index 57% rename from packages/extra/os2units/Makefile rename to packages/os2units/Makefile index 806ba11cb3..04792b2140 100644 --- a/packages/extra/os2units/Makefile +++ b/packages/os2units/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26] # 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-darwin 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 @@ -98,7 +98,7 @@ endif endif export ECHO endif -override DEFAULT_FPCDIR=../../.. +override DEFAULT_FPCDIR=../.. ifndef FPC ifdef PP FPC=$(PP) @@ -240,167 +240,486 @@ ifeq ($(UNITSDIR),) UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +override PACKAGE_NAME=os2units +override PACKAGE_VERSION=1.0.0 ifeq ($(FULL_TARGET),i386-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_DIRS+=ftpapi mmtk hwvideo lvm clkdll +override TARGET_UNITS+=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk endif override INSTALL_FPCPACKAGE=y -override INSTALL_FPCSUBDIR=packages +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_INCLUDEDIR+=src +endif +ifeq ($(FULL_TARGET),i386-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-go32v2) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-win32) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-os2) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-freebsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-beos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-solaris) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-qnx) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-netware) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-openbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-wdosx) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-emx) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-watcom) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-wince) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),i386-symbian) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-amiga) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-atari) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-palmos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),m68k-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-macos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-solaris) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),sparc-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-win64) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-palmos) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-wince) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-gba) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-nds) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),arm-symbian) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +override COMPILER_SOURCEDIR+=src tests examples +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +override COMPILER_SOURCEDIR+=src tests examples +endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -597,6 +916,37 @@ endif else CROSSBINDIR= endif +ifeq ($(OS_SOURCE),linux) +ifndef GCCLIBDIR +ifeq ($(CPU_TARGET),i386) +ifneq ($(findstring x86_64,$(shell uname -a)),) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`) +endif +endif +endif +ifeq ($(CPU_TARGET),powerpc64) +ifeq ($(BINUTILSPREFIX),) +GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`) +endif +endif +endif +ifndef GCCLIBDIR +CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) +ifneq ($(CROSSGCC),) +GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`) +endif +endif +ifndef OTHERLIBDIR +OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }') +endif +endif +ifdef inUnix +ifeq ($(OS_SOURCE),netbsd) +OTHERLIBDIR+=/usr/pkg/lib +endif +export GCCLIBDIR OTHERLIB +endif BATCHEXT=.bat LOADEREXT=.as EXEEXT=.exe @@ -1148,6 +1498,192 @@ else TAROPT=vz TAREXT=.tar.gz endif +override REQUIRE_PACKAGES=rtl +ifeq ($(FULL_TARGET),i386-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-go32v2) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-win32) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-os2) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-freebsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-beos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-netbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-solaris) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-qnx) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-netware) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-openbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-wdosx) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-darwin) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-emx) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-watcom) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-netwlibc) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-wince) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),i386-symbian) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-freebsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-netbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-amiga) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-atari) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-openbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-palmos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),m68k-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-netbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-amiga) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-macos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-darwin) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-morphos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),sparc-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),sparc-netbsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),sparc-solaris) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),sparc-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),x86_64-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),x86_64-freebsd) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),x86_64-darwin) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),x86_64-win64) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),x86_64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-palmos) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-wince) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-gba) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-nds) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),arm-symbian) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc64-linux) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc64-darwin) +REQUIRE_PACKAGES_RTL=1 +endif +ifeq ($(FULL_TARGET),powerpc64-embedded) +REQUIRE_PACKAGES_RTL=1 +endif +ifdef REQUIRE_PACKAGES_RTL +PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_RTL),) +ifneq ($(wildcard $(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX)),) +UNITDIR_RTL=$(PACKAGEDIR_RTL)/units/$(TARGETSUFFIX) +else +UNITDIR_RTL=$(PACKAGEDIR_RTL) +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_RTL)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE) +endif +else +PACKAGEDIR_RTL= +UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_RTL),) +UNITDIR_RTL:=$(firstword $(UNITDIR_RTL)) +else +UNITDIR_RTL= +endif +endif +ifdef UNITDIR_RTL +override COMPILER_UNITDIR+=$(UNITDIR_RTL) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(CPU_TARGET) endif @@ -1267,6 +1803,12 @@ endif endif ifdef LINKSHARED endif +ifdef GCCLIBDIR +override FPCOPT+=-Fl$(GCCLIBDIR) +endif +ifdef OTHERLIBDIR +override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR)) +endif ifdef OPT override FPCOPT+=$(OPT) endif @@ -1301,10 +1843,249 @@ EXECPPAS:=@$(PPAS) endif endif endif +.PHONY: fpc_units +ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),) +override ALLTARGET+=fpc_units +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) +override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) +override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) +endif +fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES) ifdef TARGET_RSTS override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS)) override CLEANRSTFILES+=$(RSTFILES) endif +.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared +$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET) + @$(ECHOREDIR) Compiled > $(FPCMADE) +fpc_all: $(FPCMADE) +fpc_smart: + $(MAKE) all LINKSMART=1 CREATESMART=1 +fpc_debug: + $(MAKE) all DEBUG=1 +fpc_release: + $(MAKE) all RELEASE=1 +.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res +$(COMPILER_UNITTARGETDIR): + $(MKDIRTREE) $(COMPILER_UNITTARGETDIR) +$(COMPILER_TARGETDIR): + $(MKDIRTREE) $(COMPILER_TARGETDIR) +%$(PPUEXT): %.pp + $(COMPILER) $< + $(EXECPPAS) +%$(PPUEXT): %.pas + $(COMPILER) $< + $(EXECPPAS) +%$(EXEEXT): %.pp + $(COMPILER) $< + $(EXECPPAS) +%$(EXEEXT): %.pas + $(COMPILER) $< + $(EXECPPAS) +%$(EXEEXT): %.lpr + $(COMPILER) $< + $(EXECPPAS) +%$(EXEEXT): %.dpr + $(COMPILER) $< + $(EXECPPAS) +%.res: %.rc + windres -i $< -o $@ +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 +override INSTALLTARGET+=fpc_shared_install +ifndef SHARED_LIBVERSION +SHARED_LIBVERSION=$(FPC_VERSION) +endif +ifndef SHARED_LIBNAME +SHARED_LIBNAME=$(PACKAGE_NAME) +endif +ifndef SHARED_FULLNAME +SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSION)$(SHAREDLIBEXT) +endif +ifndef SHARED_LIBUNITS +SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS) +override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_LIBUNITS)) +endif +fpc_shared: +ifdef HASSHAREDLIB + $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1 +ifneq ($(SHARED_BUILD),n) + $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) +endif +else + @$(ECHO) Shared Libraries not supported +endif +fpc_shared_install: +ifneq ($(SHARED_BUILD),n) +ifneq ($(SHARED_LIBUNITS),) +ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),) + $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INSTALL_SHAREDDIR) +endif +endif +endif +.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall +ifdef INSTALL_UNITS +override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)) +endif +ifdef INSTALL_BUILDUNIT +override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES)) +endif +ifdef INSTALLPPUFILES +override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) +ifneq ($(UNITTARGETDIRPREFIX),) +override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES))) +override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES)))) +endif +override INSTALL_CREATEPACKAGEFPC=1 +endif +ifdef INSTALLEXEFILES +ifneq ($(TARGETDIRPREFIX),) +override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES))) +endif +endif +fpc_install: all $(INSTALLTARGET) +ifdef INSTALLEXEFILES + $(MKDIR) $(INSTALL_BINDIR) +ifdef UPXPROG + -$(UPXPROG) $(INSTALLEXEFILES) +endif + $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) +endif +ifdef INSTALL_CREATEPACKAGEFPC +ifdef FPCMAKE +ifdef PACKAGE_VERSION +ifneq ($(wildcard Makefile.fpc),) + $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc + $(MKDIR) $(INSTALL_UNITDIR) + $(INSTALL) Package.fpc $(INSTALL_UNITDIR) +endif +endif +endif +endif +ifdef INSTALLPPUFILES + $(MKDIR) $(INSTALL_UNITDIR) + $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR) +ifneq ($(INSTALLPPULINKFILES),) + $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR) +endif +ifneq ($(wildcard $(LIB_FULLNAME)),) + $(MKDIR) $(INSTALL_LIBDIR) + $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR) +ifdef inUnix + ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME) +endif +endif +endif +ifdef INSTALL_FILES + $(MKDIR) $(INSTALL_DATADIR) + $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR) +endif +fpc_sourceinstall: distclean + $(MKDIR) $(INSTALL_SOURCEDIR) + $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +ifdef HASEXAMPLES + $(MKDIR) $(INSTALL_EXAMPLEDIR) +endif +ifdef EXAMPLESOURCEFILES + $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR) +endif +ifdef TARGET_EXAMPLEDIRS + $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR) +endif +.PHONY: fpc_distinstall +fpc_distinstall: install exampleinstall +.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall +ifndef PACKDIR +ifndef inUnix +PACKDIR=$(BASEDIR)/../fpc-pack +else +PACKDIR=/tmp/fpc-pack +endif +endif +ifndef ZIPNAME +ifdef DIST_ZIPNAME +ZIPNAME=$(DIST_ZIPNAME) +else +ZIPNAME=$(PACKAGE_NAME) +endif +endif +ifndef FULLZIPNAME +FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX) +endif +ifndef ZIPTARGET +ifdef DIST_ZIPTARGET +ZIPTARGET=DIST_ZIPTARGET +else +ZIPTARGET=install +endif +endif +ifndef USEZIP +ifdef inUnix +USETAR=1 +endif +endif +ifndef inUnix +USEZIPWRAPPER=1 +endif +ifdef USEZIPWRAPPER +ZIPPATHSEP=$(PATHSEP) +ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)) +else +ZIPPATHSEP=/ +endif +ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)) +ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)) +ifdef USETAR +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT) +ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) * +else +ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT) +ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) * +endif +fpc_zipinstall: + $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1 + $(MKDIR) $(DIST_DESTDIR) + $(DEL) $(ZIPDESTFILE) +ifdef USEZIPWRAPPER +ifneq ($(ECHOREDIR),echo) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER) + $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER) +else + echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) + echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) + echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER) +endif +ifdef inUnix + /bin/sh $(ZIPWRAPPER) +else +ifdef RUNBATCH + $(RUNBATCH) (ZIPWRAPPER) +else + $(ZIPWRAPPER) +endif +endif + $(DEL) $(ZIPWRAPPER) +else + $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE) +endif + $(DELTREE) $(PACKDIR) +fpc_zipsourceinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX) +fpc_zipexampleinstall: +ifdef HASEXAMPLES + $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX) +endif +fpc_zipdistinstall: + $(MAKE) fpc_zipinstall ZIPTARGET=distinstall .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) @@ -1478,622 +2259,26 @@ endif fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIRS)) fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2 fpc_makefiles: fpc_makefile fpc_makefile_dirs -ifeq ($(FULL_TARGET),i386-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_DIRS_FTPAPI=1 -TARGET_DIRS_MMTK=1 -TARGET_DIRS_HWVIDEO=1 -TARGET_DIRS_LVM=1 -TARGET_DIRS_CLKDLL=1 -endif -ifdef TARGET_DIRS_FTPAPI -ftpapi_all: - $(MAKE) -C ftpapi all -ftpapi_debug: - $(MAKE) -C ftpapi debug -ftpapi_smart: - $(MAKE) -C ftpapi smart -ftpapi_release: - $(MAKE) -C ftpapi release -ftpapi_units: - $(MAKE) -C ftpapi units -ftpapi_examples: - $(MAKE) -C ftpapi examples -ftpapi_shared: - $(MAKE) -C ftpapi shared -ftpapi_install: - $(MAKE) -C ftpapi install -ftpapi_sourceinstall: - $(MAKE) -C ftpapi sourceinstall -ftpapi_exampleinstall: - $(MAKE) -C ftpapi exampleinstall -ftpapi_distinstall: - $(MAKE) -C ftpapi distinstall -ftpapi_zipinstall: - $(MAKE) -C ftpapi zipinstall -ftpapi_zipsourceinstall: - $(MAKE) -C ftpapi zipsourceinstall -ftpapi_zipexampleinstall: - $(MAKE) -C ftpapi zipexampleinstall -ftpapi_zipdistinstall: - $(MAKE) -C ftpapi zipdistinstall -ftpapi_clean: - $(MAKE) -C ftpapi clean -ftpapi_distclean: - $(MAKE) -C ftpapi distclean -ftpapi_cleanall: - $(MAKE) -C ftpapi cleanall -ftpapi_info: - $(MAKE) -C ftpapi info -ftpapi_makefiles: - $(MAKE) -C ftpapi makefiles -ftpapi: - $(MAKE) -C ftpapi all -.PHONY: ftpapi_all ftpapi_debug ftpapi_smart ftpapi_release ftpapi_units ftpapi_examples ftpapi_shared ftpapi_install ftpapi_sourceinstall ftpapi_exampleinstall ftpapi_distinstall ftpapi_zipinstall ftpapi_zipsourceinstall ftpapi_zipexampleinstall ftpapi_zipdistinstall ftpapi_clean ftpapi_distclean ftpapi_cleanall ftpapi_info ftpapi_makefiles ftpapi -endif -ifdef TARGET_DIRS_MMTK -mmtk_all: - $(MAKE) -C mmtk all -mmtk_debug: - $(MAKE) -C mmtk debug -mmtk_smart: - $(MAKE) -C mmtk smart -mmtk_release: - $(MAKE) -C mmtk release -mmtk_units: - $(MAKE) -C mmtk units -mmtk_examples: - $(MAKE) -C mmtk examples -mmtk_shared: - $(MAKE) -C mmtk shared -mmtk_install: - $(MAKE) -C mmtk install -mmtk_sourceinstall: - $(MAKE) -C mmtk sourceinstall -mmtk_exampleinstall: - $(MAKE) -C mmtk exampleinstall -mmtk_distinstall: - $(MAKE) -C mmtk distinstall -mmtk_zipinstall: - $(MAKE) -C mmtk zipinstall -mmtk_zipsourceinstall: - $(MAKE) -C mmtk zipsourceinstall -mmtk_zipexampleinstall: - $(MAKE) -C mmtk zipexampleinstall -mmtk_zipdistinstall: - $(MAKE) -C mmtk zipdistinstall -mmtk_clean: - $(MAKE) -C mmtk clean -mmtk_distclean: - $(MAKE) -C mmtk distclean -mmtk_cleanall: - $(MAKE) -C mmtk cleanall -mmtk_info: - $(MAKE) -C mmtk info -mmtk_makefiles: - $(MAKE) -C mmtk makefiles -mmtk: - $(MAKE) -C mmtk all -.PHONY: mmtk_all mmtk_debug mmtk_smart mmtk_release mmtk_units mmtk_examples mmtk_shared mmtk_install mmtk_sourceinstall mmtk_exampleinstall mmtk_distinstall mmtk_zipinstall mmtk_zipsourceinstall mmtk_zipexampleinstall mmtk_zipdistinstall mmtk_clean mmtk_distclean mmtk_cleanall mmtk_info mmtk_makefiles mmtk -endif -ifdef TARGET_DIRS_HWVIDEO -hwvideo_all: - $(MAKE) -C hwvideo all -hwvideo_debug: - $(MAKE) -C hwvideo debug -hwvideo_smart: - $(MAKE) -C hwvideo smart -hwvideo_release: - $(MAKE) -C hwvideo release -hwvideo_units: - $(MAKE) -C hwvideo units -hwvideo_examples: - $(MAKE) -C hwvideo examples -hwvideo_shared: - $(MAKE) -C hwvideo shared -hwvideo_install: - $(MAKE) -C hwvideo install -hwvideo_sourceinstall: - $(MAKE) -C hwvideo sourceinstall -hwvideo_exampleinstall: - $(MAKE) -C hwvideo exampleinstall -hwvideo_distinstall: - $(MAKE) -C hwvideo distinstall -hwvideo_zipinstall: - $(MAKE) -C hwvideo zipinstall -hwvideo_zipsourceinstall: - $(MAKE) -C hwvideo zipsourceinstall -hwvideo_zipexampleinstall: - $(MAKE) -C hwvideo zipexampleinstall -hwvideo_zipdistinstall: - $(MAKE) -C hwvideo zipdistinstall -hwvideo_clean: - $(MAKE) -C hwvideo clean -hwvideo_distclean: - $(MAKE) -C hwvideo distclean -hwvideo_cleanall: - $(MAKE) -C hwvideo cleanall -hwvideo_info: - $(MAKE) -C hwvideo info -hwvideo_makefiles: - $(MAKE) -C hwvideo makefiles -hwvideo: - $(MAKE) -C hwvideo all -.PHONY: hwvideo_all hwvideo_debug hwvideo_smart hwvideo_release hwvideo_units hwvideo_examples hwvideo_shared hwvideo_install hwvideo_sourceinstall hwvideo_exampleinstall hwvideo_distinstall hwvideo_zipinstall hwvideo_zipsourceinstall hwvideo_zipexampleinstall hwvideo_zipdistinstall hwvideo_clean hwvideo_distclean hwvideo_cleanall hwvideo_info hwvideo_makefiles hwvideo -endif -ifdef TARGET_DIRS_LVM -lvm_all: - $(MAKE) -C lvm all -lvm_debug: - $(MAKE) -C lvm debug -lvm_smart: - $(MAKE) -C lvm smart -lvm_release: - $(MAKE) -C lvm release -lvm_units: - $(MAKE) -C lvm units -lvm_examples: - $(MAKE) -C lvm examples -lvm_shared: - $(MAKE) -C lvm shared -lvm_install: - $(MAKE) -C lvm install -lvm_sourceinstall: - $(MAKE) -C lvm sourceinstall -lvm_exampleinstall: - $(MAKE) -C lvm exampleinstall -lvm_distinstall: - $(MAKE) -C lvm distinstall -lvm_zipinstall: - $(MAKE) -C lvm zipinstall -lvm_zipsourceinstall: - $(MAKE) -C lvm zipsourceinstall -lvm_zipexampleinstall: - $(MAKE) -C lvm zipexampleinstall -lvm_zipdistinstall: - $(MAKE) -C lvm zipdistinstall -lvm_clean: - $(MAKE) -C lvm clean -lvm_distclean: - $(MAKE) -C lvm distclean -lvm_cleanall: - $(MAKE) -C lvm cleanall -lvm_info: - $(MAKE) -C lvm info -lvm_makefiles: - $(MAKE) -C lvm makefiles -lvm: - $(MAKE) -C lvm all -.PHONY: lvm_all lvm_debug lvm_smart lvm_release lvm_units lvm_examples lvm_shared lvm_install lvm_sourceinstall lvm_exampleinstall lvm_distinstall lvm_zipinstall lvm_zipsourceinstall lvm_zipexampleinstall lvm_zipdistinstall lvm_clean lvm_distclean lvm_cleanall lvm_info lvm_makefiles lvm -endif -ifdef TARGET_DIRS_CLKDLL -clkdll_all: - $(MAKE) -C clkdll all -clkdll_debug: - $(MAKE) -C clkdll debug -clkdll_smart: - $(MAKE) -C clkdll smart -clkdll_release: - $(MAKE) -C clkdll release -clkdll_units: - $(MAKE) -C clkdll units -clkdll_examples: - $(MAKE) -C clkdll examples -clkdll_shared: - $(MAKE) -C clkdll shared -clkdll_install: - $(MAKE) -C clkdll install -clkdll_sourceinstall: - $(MAKE) -C clkdll sourceinstall -clkdll_exampleinstall: - $(MAKE) -C clkdll exampleinstall -clkdll_distinstall: - $(MAKE) -C clkdll distinstall -clkdll_zipinstall: - $(MAKE) -C clkdll zipinstall -clkdll_zipsourceinstall: - $(MAKE) -C clkdll zipsourceinstall -clkdll_zipexampleinstall: - $(MAKE) -C clkdll zipexampleinstall -clkdll_zipdistinstall: - $(MAKE) -C clkdll zipdistinstall -clkdll_clean: - $(MAKE) -C clkdll clean -clkdll_distclean: - $(MAKE) -C clkdll distclean -clkdll_cleanall: - $(MAKE) -C clkdll cleanall -clkdll_info: - $(MAKE) -C clkdll info -clkdll_makefiles: - $(MAKE) -C clkdll makefiles -clkdll: - $(MAKE) -C clkdll all -.PHONY: clkdll_all clkdll_debug clkdll_smart clkdll_release clkdll_units clkdll_examples clkdll_shared clkdll_install clkdll_sourceinstall clkdll_exampleinstall clkdll_distinstall clkdll_zipinstall clkdll_zipsourceinstall clkdll_zipexampleinstall clkdll_zipdistinstall clkdll_clean clkdll_distclean clkdll_cleanall clkdll_info clkdll_makefiles clkdll -endif -all: $(addsuffix _all,$(TARGET_DIRS)) -debug: $(addsuffix _debug,$(TARGET_DIRS)) -smart: $(addsuffix _smart,$(TARGET_DIRS)) -release: $(addsuffix _release,$(TARGET_DIRS)) -units: $(addsuffix _units,$(TARGET_DIRS)) -examples: $(addsuffix _examples,$(TARGET_DIRS)) -shared: $(addsuffix _shared,$(TARGET_DIRS)) -install: $(addsuffix _install,$(TARGET_DIRS)) -sourceinstall: $(addsuffix _sourceinstall,$(TARGET_DIRS)) -exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS)) -distinstall: $(addsuffix _distinstall,$(TARGET_DIRS)) -zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS)) -zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS)) -zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) -zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS)) -clean: $(addsuffix _clean,$(TARGET_DIRS)) -distclean: $(addsuffix _distclean,$(TARGET_DIRS)) -cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) +all: fpc_all +debug: fpc_debug +smart: fpc_smart +release: fpc_release +units: fpc_units +examples: +shared: fpc_shared +install: fpc_install +sourceinstall: fpc_sourceinstall +exampleinstall: fpc_exampleinstall +distinstall: fpc_distinstall +zipinstall: fpc_zipinstall +zipsourceinstall: fpc_zipsourceinstall +zipexampleinstall: fpc_zipexampleinstall +zipdistinstall: fpc_zipdistinstall +clean: fpc_clean +distclean: fpc_distclean +cleanall: fpc_cleanall info: fpc_info -makefiles: fpc_makefiles $(addsuffix _makefiles,$(TARGET_DIRS)) +makefiles: fpc_makefiles .PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc diff --git a/packages/os2units/Makefile.fpc b/packages/os2units/Makefile.fpc new file mode 100644 index 0000000000..b15e052c16 --- /dev/null +++ b/packages/os2units/Makefile.fpc @@ -0,0 +1,26 @@ +# +# Makefile.fpc for SDL bindings +# + +[package] +name=os2units +version=1.0.0 + +[require] +libc=y + +[target] +units=buildall clkdll clktest dive ftpapi hwvideo lvm mciapi mcidrv mci mmbase mmio som sw wpstk + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests examples + +[rules] +.NOTPARALLEL: diff --git a/packages/extra/os2units/ftpapi/ftptest.pas b/packages/os2units/examples/ftptest.pas similarity index 100% rename from packages/extra/os2units/ftpapi/ftptest.pas rename to packages/os2units/examples/ftptest.pas diff --git a/packages/extra/os2units/lvm/tests/lvmtest.pas b/packages/os2units/examples/lvmtest.pas similarity index 100% rename from packages/extra/os2units/lvm/tests/lvmtest.pas rename to packages/os2units/examples/lvmtest.pas diff --git a/packages/extra/os2units/mmtk/tests/mciapi1.pas b/packages/os2units/examples/mciapi1.pas similarity index 100% rename from packages/extra/os2units/mmtk/tests/mciapi1.pas rename to packages/os2units/examples/mciapi1.pas diff --git a/packages/extra/os2units/mmtk/tests/mciapi2.pas b/packages/os2units/examples/mciapi2.pas similarity index 100% rename from packages/extra/os2units/mmtk/tests/mciapi2.pas rename to packages/os2units/examples/mciapi2.pas diff --git a/packages/os2units/fpmake.pp b/packages/os2units/fpmake.pp new file mode 100644 index 0000000000..d996698b7c --- /dev/null +++ b/packages/os2units/fpmake.pp @@ -0,0 +1,29 @@ +{$ifndef ALLPACKAGES} +{$mode objfpc}{$H+} +program fpmake; + +uses fpmkunit; + +Var + P : TPackage; + T : TTarget; +begin + With Installer do + begin +{$endif ALLPACKAGES} + + P:=AddPackage('os2units'); +{$ifdef ALLPACKAGES} + P.Directory:='os2units'; +{$endif ALLPACKAGES} + P.Version:='2.0.0'; + P.SourcePath.Add('src'); +// P.Dependencies.Add('x11'); + + // not compilable defunct for now + +{$ifndef ALLPACKAGES} + Run; + end; +end. +{$endif ALLPACKAGES} diff --git a/packages/extra/os2units/mmtk/readme.txt b/packages/os2units/readme.txt similarity index 100% rename from packages/extra/os2units/mmtk/readme.txt rename to packages/os2units/readme.txt diff --git a/packages/extra/os2units/mmtk/buildall.pas b/packages/os2units/src/buildall.pas similarity index 100% rename from packages/extra/os2units/mmtk/buildall.pas rename to packages/os2units/src/buildall.pas diff --git a/packages/extra/os2units/clkdll/clkdll.pas b/packages/os2units/src/clkdll.pas similarity index 100% rename from packages/extra/os2units/clkdll/clkdll.pas rename to packages/os2units/src/clkdll.pas diff --git a/packages/extra/os2units/clkdll/clktest.pas b/packages/os2units/src/clktest.pas similarity index 100% rename from packages/extra/os2units/clkdll/clktest.pas rename to packages/os2units/src/clktest.pas diff --git a/packages/extra/os2units/mmtk/dive.pas b/packages/os2units/src/dive.pas similarity index 100% rename from packages/extra/os2units/mmtk/dive.pas rename to packages/os2units/src/dive.pas diff --git a/packages/extra/os2units/ftpapi/ftpapi.pas b/packages/os2units/src/ftpapi.pas similarity index 100% rename from packages/extra/os2units/ftpapi/ftpapi.pas rename to packages/os2units/src/ftpapi.pas diff --git a/packages/extra/os2units/hwvideo/hwvideo.pas b/packages/os2units/src/hwvideo.pas similarity index 100% rename from packages/extra/os2units/hwvideo/hwvideo.pas rename to packages/os2units/src/hwvideo.pas diff --git a/packages/extra/os2units/lvm/lvm.pas b/packages/os2units/src/lvm.pas similarity index 100% rename from packages/extra/os2units/lvm/lvm.pas rename to packages/os2units/src/lvm.pas diff --git a/packages/extra/os2units/mmtk/mci.pas b/packages/os2units/src/mci.pas similarity index 100% rename from packages/extra/os2units/mmtk/mci.pas rename to packages/os2units/src/mci.pas diff --git a/packages/extra/os2units/mmtk/mciapi.pas b/packages/os2units/src/mciapi.pas similarity index 100% rename from packages/extra/os2units/mmtk/mciapi.pas rename to packages/os2units/src/mciapi.pas diff --git a/packages/extra/os2units/mmtk/mcidrv.pas b/packages/os2units/src/mcidrv.pas similarity index 100% rename from packages/extra/os2units/mmtk/mcidrv.pas rename to packages/os2units/src/mcidrv.pas diff --git a/packages/extra/os2units/mmtk/mmbase.pas b/packages/os2units/src/mmbase.pas similarity index 100% rename from packages/extra/os2units/mmtk/mmbase.pas rename to packages/os2units/src/mmbase.pas diff --git a/packages/extra/os2units/mmtk/mmio.pas b/packages/os2units/src/mmio.pas similarity index 100% rename from packages/extra/os2units/mmtk/mmio.pas rename to packages/os2units/src/mmio.pas diff --git a/packages/extra/os2units/som/som.pas b/packages/os2units/src/som.pas similarity index 100% rename from packages/extra/os2units/som/som.pas rename to packages/os2units/src/som.pas diff --git a/packages/extra/os2units/mmtk/sw.pas b/packages/os2units/src/sw.pas similarity index 100% rename from packages/extra/os2units/mmtk/sw.pas rename to packages/os2units/src/sw.pas diff --git a/packages/extra/os2units/wpstk/wpstk.pp b/packages/os2units/src/wpstk.pp similarity index 100% rename from packages/extra/os2units/wpstk/wpstk.pp rename to packages/os2units/src/wpstk.pp