diff --git a/.gitattributes b/.gitattributes index ecbb0228ae..ddfed5938f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -785,10 +785,12 @@ packages/Makefile svneol=native#text/plain packages/Makefile.fpc svneol=native#text/plain packages/a52/Makefile svneol=native#text/plain packages/a52/Makefile.fpc svneol=native#text/plain +packages/a52/Makefile.fpc.fpcmake svneol=native#text/plain packages/a52/fpmake.pp svneol=native#text/plain packages/a52/src/a52.pas svneol=native#text/plain packages/amunits/Makefile svneol=native#text/plain packages/amunits/Makefile.fpc svneol=native#text/plain +packages/amunits/Makefile.fpc.fpcmake svneol=native#text/plain packages/amunits/README.txt svneol=native#text/plain packages/amunits/examples/asltest.pas svneol=native#text/plain packages/amunits/examples/bezier.pas svneol=native#text/plain @@ -943,6 +945,7 @@ packages/aspell/LICENSE svneol=native#text/plain packages/aspell/LICENSE.ADDON svneol=native#text/plain packages/aspell/Makefile svneol=native#text/plain packages/aspell/Makefile.fpc svneol=native#text/plain +packages/aspell/Makefile.fpc.fpcmake svneol=native#text/plain packages/aspell/examples/example.pas svneol=native#text/plain packages/aspell/fpmake.pp svneol=native#text/plain packages/aspell/src/aspell.pp svneol=native#text/plain @@ -951,11 +954,13 @@ packages/aspell/src/aspelltypes.inc svneol=native#text/plain packages/aspell/src/spellcheck.pp svneol=native#text/plain packages/bfd/Makefile svneol=native#text/plain packages/bfd/Makefile.fpc svneol=native#text/plain +packages/bfd/Makefile.fpc.fpcmake svneol=native#text/plain packages/bfd/fpmake.pp svneol=native#text/plain packages/bfd/src/bfd.pas svneol=native#text/plain packages/bzip2/LICENSE svneol=native#text/plain packages/bzip2/Makefile svneol=native#text/plain packages/bzip2/Makefile.fpc svneol=native#text/plain +packages/bzip2/Makefile.fpc.fpcmake svneol=native#text/plain packages/bzip2/examples/pasbzip.pas svneol=native#text/plain packages/bzip2/fpmake.pp svneol=native#text/plain packages/bzip2/src/bzip2.pas svneol=native#text/plain @@ -965,6 +970,7 @@ packages/bzip2/src/bzip2si386.inc svneol=native#text/plain packages/bzip2/src/bzip2stream.pp svneol=native#text/plain packages/cairo/Makefile svneol=native#text/plain packages/cairo/Makefile.fpc svneol=native#text/plain +packages/cairo/Makefile.fpc.fpcmake svneol=native#text/plain packages/cairo/fpmake.pp svneol=native#text/plain packages/cairo/src/cairo.pp svneol=native#text/plain packages/cairo/src/cairoft.pp svneol=native#text/plain @@ -972,6 +978,7 @@ packages/cairo/src/cairowin32.pp svneol=native#text/plain packages/cairo/src/cairoxlib.pp svneol=native#text/plain packages/cdrom/Makefile svneol=native#text/plain packages/cdrom/Makefile.fpc svneol=native#text/plain +packages/cdrom/Makefile.fpc.fpcmake svneol=native#text/plain packages/cdrom/README.txt svneol=native#text/plain packages/cdrom/examples/Makefile svneol=native#text/plain packages/cdrom/examples/Makefile.fpc svneol=native#text/plain @@ -991,6 +998,7 @@ packages/cdrom/src/wincd.pp svneol=native#text/plain packages/cdrom/src/wnaspi32.pp svneol=native#text/plain packages/chm/Makefile svneol=native#text/plain packages/chm/Makefile.fpc svneol=native#text/plain +packages/chm/Makefile.fpc.fpcmake svneol=native#text/plain packages/chm/fpmake.pp svneol=native#text/plain packages/chm/src/chmbase.pas svneol=native#text/plain packages/chm/src/chmcmd.lpi svneol=native#text/plain @@ -1606,6 +1614,7 @@ packages/cocoaint/utils/uikit-skel/src/quartzcore/QuartzCore.inc svneol=native#t packages/cocoaint/utils/uikit-skel/src/uikit/UIKit.inc svneol=native#text/plain packages/dbus/Makefile svneol=native#text/plain packages/dbus/Makefile.fpc svneol=native#text/plain +packages/dbus/Makefile.fpc.fpcmake svneol=native#text/plain packages/dbus/examples/Makefile svneol=native#text/plain packages/dbus/examples/Makefile.fpc svneol=native#text/plain packages/dbus/examples/busexample.pp svneol=native#text/plain @@ -1630,6 +1639,7 @@ packages/dbus/src/dbus.pas svneol=native#text/plain packages/dbus/src/dbus_arch_deps.inc svneol=native#text/plain packages/dts/Makefile svneol=native#text/plain packages/dts/Makefile.fpc svneol=native#text/plain +packages/dts/Makefile.fpc.fpcmake svneol=native#text/plain packages/dts/fpmake.pp svneol=native#text/plain packages/dts/src/dts.pas svneol=native#text/plain packages/fastcgi/Makefile svneol=native#text/plain @@ -1792,6 +1802,7 @@ packages/fcl-base/src/wtex.pp svneol=native#text/plain packages/fcl-base/texts/fptemplate.txt svneol=native#text/plain packages/fcl-db/Makefile svneol=native#text/plain packages/fcl-db/Makefile.fpc svneol=native#text/plain +packages/fcl-db/Makefile.fpc.fpcmake svneol=native#text/plain packages/fcl-db/fpmake.pp svneol=native#text/plain packages/fcl-db/src/Dataset.txt svneol=native#text/plain packages/fcl-db/src/README.txt svneol=native#text/plain @@ -2337,6 +2348,7 @@ packages/fcl-res/xml/versiontypes.xml svneol=native#text/plain packages/fcl-res/xml/winpeimagereader.xml svneol=native#text/plain packages/fcl-stl/Makefile svneol=native#text/plain packages/fcl-stl/Makefile.fpc svneol=native#text/plain +packages/fcl-stl/Makefile.fpc.fpcmake svneol=native#text/plain packages/fcl-stl/doc/arrayutils.tex svneol=native#text/plain packages/fcl-stl/doc/deque.tex svneol=native#text/plain packages/fcl-stl/doc/dequeexample.pp svneol=native#text/plain @@ -2691,6 +2703,7 @@ packages/fcl-web/tests/testcgiapp.lpi svneol=native#text/plain packages/fcl-web/tests/testcgiapp.pp svneol=native#text/plain packages/fcl-xml/Makefile svneol=native#text/plain packages/fcl-xml/Makefile.fpc svneol=native#text/plain +packages/fcl-xml/Makefile.fpc.fpcmake svneol=native#text/plain packages/fcl-xml/fpmake.pp svneol=native#text/plain packages/fcl-xml/src/README.txt svneol=native#text/plain packages/fcl-xml/src/dom.pp svneol=native#text/plain @@ -2731,6 +2744,7 @@ packages/fcl-xml/tests/xmlts.pp svneol=native#text/plain packages/fcl-xml/tests/xpathts.pp svneol=native#text/plain packages/fftw/Makefile svneol=native#text/plain packages/fftw/Makefile.fpc svneol=native#text/plain +packages/fftw/Makefile.fpc.fpcmake svneol=native#text/plain packages/fftw/examples/example.pas svneol=native#text/plain packages/fftw/fpmake.pp svneol=native#text/plain packages/fftw/readme.txt svneol=native#text/plain @@ -2784,6 +2798,7 @@ packages/fppkg/src/pkgrepos.pp svneol=native#text/plain packages/fppkg/src/pkgwget.pp svneol=native#text/plain packages/fuse/Makefile svneol=native#text/plain packages/fuse/Makefile.fpc svneol=native#text/plain +packages/fuse/Makefile.fpc.fpcmake svneol=native#text/plain packages/fuse/fpmake_disabled.pp svneol=native#text/plain packages/fuse/src/fuse.pas svneol=native#text/plain packages/fuse/tests/fusetest.pp svneol=native#text/plain @@ -5919,6 +5934,7 @@ packages/sdl/LGPL.addon svneol=native#text/plain packages/sdl/MPL-1.1 svneol=native#text/plain packages/sdl/Makefile svneol=native#text/plain packages/sdl/Makefile.fpc svneol=native#text/plain +packages/sdl/Makefile.fpc.fpcmake svneol=native#text/plain packages/sdl/README.txt svneol=native#text/plain packages/sdl/fpmake.pp svneol=native#text/plain packages/sdl/src/jedi-sdl.inc svneol=native#text/plain @@ -5942,6 +5958,7 @@ packages/sdl/src/sdlutils.pas svneol=native#text/plain packages/sdl/src/smpeg.pas svneol=native#text/plain packages/sndfile/Makefile svneol=native#text/plain packages/sndfile/Makefile.fpc svneol=native#text/plain +packages/sndfile/Makefile.fpc.fpcmake svneol=native#text/plain packages/sndfile/README.txt svneol=native#text/plain packages/sndfile/examples/sfplay.pp svneol=native#text/plain packages/sndfile/fpmake_disabled.pp svneol=native#text/plain @@ -5949,6 +5966,7 @@ packages/sndfile/scripts/testc.c svneol=native#text/plain packages/sndfile/src/sndfile.pp svneol=native#text/plain packages/sqlite/Makefile svneol=native#text/plain packages/sqlite/Makefile.fpc svneol=native#text/plain +packages/sqlite/Makefile.fpc.fpcmake svneol=native#text/plain packages/sqlite/fpmake.pp svneol=native#text/plain packages/sqlite/src/sqlite.pp svneol=native#text/plain packages/sqlite/src/sqlite3.inc svneol=native#text/plain @@ -5961,6 +5979,7 @@ packages/sqlite/tests/testapiv3x.README svneol=native#text/plain packages/sqlite/tests/testapiv3x.pp svneol=native#text/plain packages/svgalib/Makefile svneol=native#text/plain packages/svgalib/Makefile.fpc svneol=native#text/plain +packages/svgalib/Makefile.fpc.fpcmake svneol=native#text/plain packages/svgalib/README.txt svneol=native#text/plain packages/svgalib/examples/Makefile svneol=native#text/plain packages/svgalib/examples/Makefile.fpc svneol=native#text/plain @@ -5972,6 +5991,7 @@ packages/svgalib/src/vgamouse.h svneol=native#text/plain packages/svgalib/src/vgamouse.pp svneol=native#text/plain packages/symbolic/Makefile svneol=native#text/plain packages/symbolic/Makefile.fpc svneol=native#text/plain +packages/symbolic/Makefile.fpc.fpcmake svneol=native#text/plain packages/symbolic/doc/optimization.txt svneol=native#text/plain packages/symbolic/doc/symbolic.txt svneol=native#text/plain packages/symbolic/examples/Makefile svneol=native#text/plain @@ -5988,6 +6008,7 @@ packages/symbolic/src/symbolic.pas svneol=native#text/plain packages/symbolic/src/teval.inc svneol=native#text/plain packages/syslog/Makefile svneol=native#text/plain packages/syslog/Makefile.fpc svneol=native#text/plain +packages/syslog/Makefile.fpc.fpcmake svneol=native#text/plain packages/syslog/examples/Makefile svneol=native#text/plain packages/syslog/examples/Makefile.fpc svneol=native#text/plain packages/syslog/examples/testlog.pp svneol=native#text/plain @@ -5995,6 +6016,7 @@ packages/syslog/fpmake.pp svneol=native#text/plain packages/syslog/src/systemlog.pp svneol=native#text/plain packages/tcl/Makefile svneol=native#text/plain packages/tcl/Makefile.fpc svneol=native#text/plain +packages/tcl/Makefile.fpc.fpcmake svneol=native#text/plain packages/tcl/fpmake.pp svneol=native#text/plain packages/tcl/src/tcl80.pp svneol=native#text/plain packages/tcl/tests/tcl_demo.pp svneol=native#text/plain diff --git a/packages/Makefile b/packages/Makefile index 3a6a9608a4..c9f7aeb6fb 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/05] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -9530,11 +9530,11 @@ fppkg_smart: fcl-base_smart fcl-xml_smart fcl-process_smart paszlib_smart fppkg_release: fcl-base_release fcl-xml_release fcl-process_release paszlib_release fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared paszlib_shared endif -fcl-xml_all: fcl-base_all -fcl-xml_debug: fcl-base_debug -fcl-xml_smart: fcl-base_smart -fcl-xml_release: fcl-base_release -fcl-xml_shared: fcl-base_shared +fcl-xml_all: fcl-base_all fpmkunit_all +fcl-xml_debug: fcl-base_debug fpmkunit_debug +fcl-xml_smart: fcl-base_smart fpmkunit_smart +fcl-xml_release: fcl-base_release fpmkunit_release +fcl-xml_shared: fcl-base_shared fpmkunit_shared fcl-json_all: fcl-base_all fcl-json_debug: fcl-base_debug fcl-json_smart: fcl-base_smart @@ -9599,24 +9599,24 @@ fcl-async_smart: fpmkunit_smart fcl-async_release: fpmkunit_release fcl-async_shared: fpmkunit_shared ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos haiku),) -fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all fcl-json_all -fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug fcl-json_debug -fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart fcl-json_smart -fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release pxlib_release fcl-json_release -fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared pxlib_shared fcl-json_shared +fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all fcl-json_all fpmkunit_all +fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug fcl-json_debug fpmkunit_debug +fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart fcl-json_smart fpmkunit_smart +fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release pxlib_release fcl-json_release fpmkunit_release +fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared pxlib_shared fcl-json_shared fpmkunit_shared else ifneq ($(findstring $(OS_TARGET),win64 wince solaris darwin iphonesim),) -fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all fcl-json_all -fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug fcl-json_debug -fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart fcl-json_smart -fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release fcl-json_release -fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared fcl-json_shared +fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all fcl-json_all fpmkunit_all +fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug fcl-json_debug fpmkunit_debug +fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart fcl-json_smart fpmkunit_smart +fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release fcl-json_release fpmkunit_release +fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared fcl-json_shared fpmkunit_shared else -fcl-db_all: fcl-xml_all fcl-base_all fcl-json_all -fcl-db_debug: fcl-xml_debug fcl-base_debug fcl-json_debug -fcl-db_smart: fcl-xml_smart fcl-base_smart fcl-json_smart -fcl-db_release: fcl-xml_release fcl-base_release fcl-json_release -fcl-db_shared: fcl-xml_shared fcl-base_shared fcl-json_shared +fcl-db_all: fcl-xml_all fcl-base_all fcl-json_all fpmkunit_all +fcl-db_debug: fcl-xml_debug fcl-base_debug fcl-json_debug fpmkunit_debug +fcl-db_smart: fcl-xml_smart fcl-base_smart fcl-json_smart fpmkunit_smart +fcl-db_release: fcl-xml_release fcl-base_release fcl-json_release fpmkunit_release +fcl-db_shared: fcl-xml_shared fcl-base_shared fcl-json_shared fpmkunit_shared endif endif fcl_all: fcl-base_all fcl-xml_all fcl-fpcunit_all fcl-db_all fcl-web_all fcl-registry_all fcl-passrc_all fcl-image_all fcl-net_all fcl-json_all fcl-res_all @@ -9630,23 +9630,23 @@ libpng_smart: zlib_smart fpmkunit_smart libpng_release: zlib_release fpmkunit_release libpng_shared: zlib_shared fpmkunit_shared ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),) -cairo_all: x11_all fcl-image_all -cairo_debug: x11_debug fcl-image_debug -cairo_smart: x11_smart fcl-image_smart -cairo_release: x11_release fcl-image_release -cairo_shared: x11_shared fcl-image_shared +cairo_all: x11_all fcl-image_all fpmkunit_all +cairo_debug: x11_debug fcl-image_debug fpmkunit_debug +cairo_smart: x11_smart fcl-image_smart fpmkunit_smart +cairo_release: x11_release fcl-image_release fpmkunit_release +cairo_shared: x11_shared fcl-image_shared fpmkunit_shared else -cairo_all: fcl-image_all -cairo_debug: fcl-image_debug -cairo_smart: fcl-image_smart -cairo_release: fcl-image_release -cairo_shared: fcl-image_shared +cairo_all: fcl-image_all fpmkunit_all +cairo_debug: fcl-image_debug fpmkunit_debug +cairo_smart: fcl-image_smart fpmkunit_smart +cairo_release: fcl-image_release fpmkunit_release +cairo_shared: fcl-image_shared fpmkunit_shared endif -chm_all: fcl-xml_all -chm_shared: fcl-xml_shared -chm_smart: fcl-xml_smart -chm_debug: fcl-xml_debug -chm_release: fcl-xml_release +chm_all: fcl-xml_all fpmkunit_all +chm_shared: fcl-xml_shared fpmkunit_shared +chm_smart: fcl-xml_smart fpmkunit_smart +chm_debug: fcl-xml_debug fpmkunit_debug +chm_release: fcl-xml_release fpmkunit_release fpgtk_all: fcl-base_all gtk1_all fpgtk_shared: fcl-base_shared gtk1_shared fpgtk_smart: fcl-base_smart gtk1_smart @@ -9712,11 +9712,11 @@ paszlib_smart: hash_smart paszlib_debug: hash_debug paszlib_release: hash_release ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),) -sdl_all: pthreads_all x11_all -sdl_shared: pthreads_shared x11_shared -sdl_smart: pthreads_smart x11_smart -sdl_debug: pthreads_debug x11_debug -sdl_release: pthreads_release x11_release +sdl_all: pthreads_all x11_all fpmkunit_all +sdl_shared: pthreads_shared x11_shared fpmkunit_shared +sdl_smart: pthreads_smart x11_smart fpmkunit_smart +sdl_debug: pthreads_debug x11_debug fpmkunit_debug +sdl_release: pthreads_release x11_release_release opengl_all: x11_all opengl_shared: x11_shared opengl_smart: x11_smart @@ -9727,12 +9727,18 @@ ptc_shared: x11_shared ptc_smart: x11_smart ptc_debug: x11_debug ptc_release: x11_release +else +sdl_all: fpmkunit_all +sdl_shared: fpmkunit_shared +sdl_smart: fpmkunit_smart +sdl_debug: fpmkunit_debug +sdl_release: fpmkunit_release endif -tcl_all: fcl-base_all -tcl_shared: fcl-base_shared -tcl_smart: fcl-base_smart -tcl_debug: fcl-base_debug -tcl_release: fcl-base_release +tcl_all: fcl-base_all fpmkunit_all +tcl_shared: fcl-base_shared fpmkunit_shared +tcl_smart: fcl-base_smart fpmkunit_smart +tcl_debug: fcl-base_debug fpmkunit_debug +tcl_release: fcl-base_release fpmkunit_release unixutil_all: libc_all fcl-base_all unixutil_shared: libc_shared fcl-base_shared unixutil_smart: libc_smart fcl-base_smart @@ -9810,3 +9816,73 @@ liblua_shared: fpmkunit_shared liblua_smart: fpmkunit_smart liblua_debug: fpmkunit_debug liblua_release: fpmkunit_release +liba52_all: fpmkunit_all +liba52_shared: fpmkunit_shared +liba52_smart: fpmkunit_smart +liba52_debug: fpmkunit_debug +liba52_release: fpmkunit_release +amunits_all: fpmkunit_all +amunits_shared: fpmkunit_shared +amunits_smart: fpmkunit_smart +amunits_debug: fpmkunit_debug +amunits_release: fpmkunit_release +aspell_all: fpmkunit_all +aspell_shared: fpmkunit_shared +aspell_smart: fpmkunit_smart +aspell_debug: fpmkunit_debug +aspell_release: fpmkunit_release +bfd_all: fpmkunit_all +bfd_shared: fpmkunit_shared +bfd_smart: fpmkunit_smart +bfd_debug: fpmkunit_debug +bfd_release: fpmkunit_release +bzip2_all: fpmkunit_all +bzip2_shared: fpmkunit_shared +bzip2_smart: fpmkunit_smart +bzip2_debug: fpmkunit_debug +bzip2_release: fpmkunit_release +cdrom_all: fpmkunit_all +cdrom_shared: fpmkunit_shared +cdrom_smart: fpmkunit_smart +cdrom_debug: fpmkunit_debug +cdrom_release: fpmkunit_release +dbus_all: fpmkunit_all +dbus_shared: fpmkunit_shared +dbus_smart: fpmkunit_smart +dbus_debug: fpmkunit_debug +dbus_release: fpmkunit_release +dts_all: fpmkunit_all +dts_shared: fpmkunit_shared +dts_smart: fpmkunit_smart +dts_debug: fpmkunit_debug +dts_release: fpmkunit_release +fcl-stl_all: fpmkunit_all +fcl-stl_shared: fpmkunit_shared +fcl-stl_smart: fpmkunit_smart +fcl-stl_debug: fpmkunit_debug +fcl-stl_release: fpmkunit_release +fftw_all: fpmkunit_all +fftw_shared: fpmkunit_shared +fftw_smart: fpmkunit_smart +fftw_debug: fpmkunit_debug +fftw_release: fpmkunit_release +sqlite_all: fpmkunit_all +sqlite_shared: fpmkunit_shared +sqlite_smart: fpmkunit_smart +sqlite_debug: fpmkunit_debug +sqlite_release: fpmkunit_release +svgalib_all: fpmkunit_all +svgalib_shared: fpmkunit_shared +svgalib_smart: fpmkunit_smart +svgalib_debug: fpmkunit_debug +svgalib_release: fpmkunit_release +symbolic_all: fpmkunit_all +symbolic_shared: fpmkunit_shared +symbolic_smart: fpmkunit_smart +symbolic_debug: fpmkunit_debug +symbolic_release: fpmkunit_release +syslog_all: fpmkunit_all +syslog_shared: fpmkunit_shared +syslog_smart: fpmkunit_smart +syslog_debug: fpmkunit_debug +syslog_release: fpmkunit_release diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc index 98fe4464f2..e0e036e19d 100644 --- a/packages/Makefile.fpc +++ b/packages/Makefile.fpc @@ -142,11 +142,11 @@ fppkg_release: fcl-base_release fcl-xml_release fcl-process_release paszlib_rele fppkg_shared: fcl-base_shared fcl-xml_shared fcl-process_shared paszlib_shared endif -fcl-xml_all: fcl-base_all -fcl-xml_debug: fcl-base_debug -fcl-xml_smart: fcl-base_smart -fcl-xml_release: fcl-base_release -fcl-xml_shared: fcl-base_shared +fcl-xml_all: fcl-base_all fpmkunit_all +fcl-xml_debug: fcl-base_debug fpmkunit_debug +fcl-xml_smart: fcl-base_smart fpmkunit_smart +fcl-xml_release: fcl-base_release fpmkunit_release +fcl-xml_shared: fcl-base_shared fpmkunit_shared fcl-json_all: fcl-base_all fcl-json_debug: fcl-base_debug @@ -223,24 +223,24 @@ fcl-async_release: fpmkunit_release fcl-async_shared: fpmkunit_shared ifneq ($(findstring $(OS_TARGET),linux freebsd openbsd netbsd win32 beos haiku),) -fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all fcl-json_all -fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug fcl-json_debug -fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart fcl-json_smart -fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release pxlib_release fcl-json_release -fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared pxlib_shared fcl-json_shared +fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all pxlib_all fcl-json_all fpmkunit_all +fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug pxlib_debug fcl-json_debug fpmkunit_debug +fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart pxlib_smart fcl-json_smart fpmkunit_smart +fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release pxlib_release fcl-json_release fpmkunit_release +fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared pxlib_shared fcl-json_shared fpmkunit_shared else ifneq ($(findstring $(OS_TARGET),win64 wince solaris darwin iphonesim),) -fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all fcl-json_all -fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug fcl-json_debug -fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart fcl-json_smart -fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release fcl-json_release -fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared fcl-json_shared +fcl-db_all: fcl-xml_all fcl-base_all mysql_all ibase_all oracle_all odbc_all postgres_all sqlite_all fcl-json_all fpmkunit_all +fcl-db_debug: fcl-xml_debug fcl-base_debug mysql_debug ibase_debug oracle_debug odbc_debug postgres_debug sqlite_debug fcl-json_debug fpmkunit_debug +fcl-db_smart: fcl-xml_smart fcl-base_smart mysql_smart ibase_smart oracle_smart odbc_smart postgres_smart sqlite_smart fcl-json_smart fpmkunit_smart +fcl-db_release: fcl-xml_release fcl-base_release mysql_release ibase_release oracle_release odbc_release postgres_release sqlite_release fcl-json_release fpmkunit_release +fcl-db_shared: fcl-xml_shared fcl-base_shared mysql_shared ibase_shared oracle_shared odbc_shared postgres_shared sqlite_shared fcl-json_shared fpmkunit_shared else -fcl-db_all: fcl-xml_all fcl-base_all fcl-json_all -fcl-db_debug: fcl-xml_debug fcl-base_debug fcl-json_debug -fcl-db_smart: fcl-xml_smart fcl-base_smart fcl-json_smart -fcl-db_release: fcl-xml_release fcl-base_release fcl-json_release -fcl-db_shared: fcl-xml_shared fcl-base_shared fcl-json_shared +fcl-db_all: fcl-xml_all fcl-base_all fcl-json_all fpmkunit_all +fcl-db_debug: fcl-xml_debug fcl-base_debug fcl-json_debug fpmkunit_debug +fcl-db_smart: fcl-xml_smart fcl-base_smart fcl-json_smart fpmkunit_smart +fcl-db_release: fcl-xml_release fcl-base_release fcl-json_release fpmkunit_release +fcl-db_shared: fcl-xml_shared fcl-base_shared fcl-json_shared fpmkunit_shared endif endif @@ -257,24 +257,24 @@ libpng_release: zlib_release fpmkunit_release libpng_shared: zlib_shared fpmkunit_shared ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),) -cairo_all: x11_all fcl-image_all -cairo_debug: x11_debug fcl-image_debug -cairo_smart: x11_smart fcl-image_smart -cairo_release: x11_release fcl-image_release -cairo_shared: x11_shared fcl-image_shared +cairo_all: x11_all fcl-image_all fpmkunit_all +cairo_debug: x11_debug fcl-image_debug fpmkunit_debug +cairo_smart: x11_smart fcl-image_smart fpmkunit_smart +cairo_release: x11_release fcl-image_release fpmkunit_release +cairo_shared: x11_shared fcl-image_shared fpmkunit_shared else -cairo_all: fcl-image_all -cairo_debug: fcl-image_debug -cairo_smart: fcl-image_smart -cairo_release: fcl-image_release -cairo_shared: fcl-image_shared +cairo_all: fcl-image_all fpmkunit_all +cairo_debug: fcl-image_debug fpmkunit_debug +cairo_smart: fcl-image_smart fpmkunit_smart +cairo_release: fcl-image_release fpmkunit_release +cairo_shared: fcl-image_shared fpmkunit_shared endif -chm_all: fcl-xml_all -chm_shared: fcl-xml_shared -chm_smart: fcl-xml_smart -chm_debug: fcl-xml_debug -chm_release: fcl-xml_release +chm_all: fcl-xml_all fpmkunit_all +chm_shared: fcl-xml_shared fpmkunit_shared +chm_smart: fcl-xml_smart fpmkunit_smart +chm_debug: fcl-xml_debug fpmkunit_debug +chm_release: fcl-xml_release fpmkunit_release fpgtk_all: fcl-base_all gtk1_all fpgtk_shared: fcl-base_shared gtk1_shared @@ -351,11 +351,11 @@ paszlib_debug: hash_debug paszlib_release: hash_release ifneq ($(findstring $(OS_TARGET),linux darwin iphonesim freebsd openbsd netbsd solaris),) -sdl_all: pthreads_all x11_all -sdl_shared: pthreads_shared x11_shared -sdl_smart: pthreads_smart x11_smart -sdl_debug: pthreads_debug x11_debug -sdl_release: pthreads_release x11_release +sdl_all: pthreads_all x11_all fpmkunit_all +sdl_shared: pthreads_shared x11_shared fpmkunit_shared +sdl_smart: pthreads_smart x11_smart fpmkunit_smart +sdl_debug: pthreads_debug x11_debug fpmkunit_debug +sdl_release: pthreads_release x11_release_release opengl_all: x11_all opengl_shared: x11_shared @@ -368,13 +368,19 @@ ptc_shared: x11_shared ptc_smart: x11_smart ptc_debug: x11_debug ptc_release: x11_release +else +sdl_all: fpmkunit_all +sdl_shared: fpmkunit_shared +sdl_smart: fpmkunit_smart +sdl_debug: fpmkunit_debug +sdl_release: fpmkunit_release endif -tcl_all: fcl-base_all -tcl_shared: fcl-base_shared -tcl_smart: fcl-base_smart -tcl_debug: fcl-base_debug -tcl_release: fcl-base_release +tcl_all: fcl-base_all fpmkunit_all +tcl_shared: fcl-base_shared fpmkunit_shared +tcl_smart: fcl-base_smart fpmkunit_smart +tcl_debug: fcl-base_debug fpmkunit_debug +tcl_release: fcl-base_release fpmkunit_release unixutil_all: libc_all fcl-base_all unixutil_shared: libc_shared fcl-base_shared @@ -469,3 +475,88 @@ liblua_smart: fpmkunit_smart liblua_debug: fpmkunit_debug liblua_release: fpmkunit_release +liba52_all: fpmkunit_all +liba52_shared: fpmkunit_shared +liba52_smart: fpmkunit_smart +liba52_debug: fpmkunit_debug +liba52_release: fpmkunit_release + +amunits_all: fpmkunit_all +amunits_shared: fpmkunit_shared +amunits_smart: fpmkunit_smart +amunits_debug: fpmkunit_debug +amunits_release: fpmkunit_release + +aspell_all: fpmkunit_all +aspell_shared: fpmkunit_shared +aspell_smart: fpmkunit_smart +aspell_debug: fpmkunit_debug +aspell_release: fpmkunit_release + +bfd_all: fpmkunit_all +bfd_shared: fpmkunit_shared +bfd_smart: fpmkunit_smart +bfd_debug: fpmkunit_debug +bfd_release: fpmkunit_release + +bzip2_all: fpmkunit_all +bzip2_shared: fpmkunit_shared +bzip2_smart: fpmkunit_smart +bzip2_debug: fpmkunit_debug +bzip2_release: fpmkunit_release + +cdrom_all: fpmkunit_all +cdrom_shared: fpmkunit_shared +cdrom_smart: fpmkunit_smart +cdrom_debug: fpmkunit_debug +cdrom_release: fpmkunit_release + +dbus_all: fpmkunit_all +dbus_shared: fpmkunit_shared +dbus_smart: fpmkunit_smart +dbus_debug: fpmkunit_debug +dbus_release: fpmkunit_release + +dts_all: fpmkunit_all +dts_shared: fpmkunit_shared +dts_smart: fpmkunit_smart +dts_debug: fpmkunit_debug +dts_release: fpmkunit_release + +fcl-stl_all: fpmkunit_all +fcl-stl_shared: fpmkunit_shared +fcl-stl_smart: fpmkunit_smart +fcl-stl_debug: fpmkunit_debug +fcl-stl_release: fpmkunit_release + +fftw_all: fpmkunit_all +fftw_shared: fpmkunit_shared +fftw_smart: fpmkunit_smart +fftw_debug: fpmkunit_debug +fftw_release: fpmkunit_release + +sqlite_all: fpmkunit_all +sqlite_shared: fpmkunit_shared +sqlite_smart: fpmkunit_smart +sqlite_debug: fpmkunit_debug +sqlite_release: fpmkunit_release + +svgalib_all: fpmkunit_all +svgalib_shared: fpmkunit_shared +svgalib_smart: fpmkunit_smart +svgalib_debug: fpmkunit_debug +svgalib_release: fpmkunit_release + +symbolic_all: fpmkunit_all +symbolic_shared: fpmkunit_shared +symbolic_smart: fpmkunit_smart +symbolic_debug: fpmkunit_debug +symbolic_release: fpmkunit_release + +syslog_all: fpmkunit_all +syslog_shared: fpmkunit_shared +syslog_smart: fpmkunit_smart +syslog_debug: fpmkunit_debug +syslog_release: fpmkunit_release + + diff --git a/packages/a52/Makefile b/packages/a52/Makefile index ddc12f0dd9..07f9a461d1 100644 --- a/packages/a52/Makefile +++ b/packages/a52/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=a52 override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=a52 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=a52 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=a52 +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1474,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1718,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1857,93 +1687,10 @@ 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)) @@ -1967,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2228,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2285,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/a52/Makefile.fpc b/packages/a52/Makefile.fpc index 100b8afb25..8227412922 100644 --- a/packages/a52/Makefile.fpc +++ b/packages/a52/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for A52DEC bindings +# Makefile.fpc for running fpmake # [package] name=a52 version=2.7.1 -[target] -units=a52 - [require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/a52/Makefile.fpc.fpcmake b/packages/a52/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..100b8afb25 --- /dev/null +++ b/packages/a52/Makefile.fpc.fpcmake @@ -0,0 +1,25 @@ +# +# Makefile.fpc for A52DEC bindings +# + +[package] +name=a52 +version=2.7.1 + +[target] +units=a52 + +[require] + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[rules] +.NOTPARALLEL: diff --git a/packages/amunits/Makefile b/packages/amunits/Makefile index 2dbdbfeaad..798faf4c3e 100644 --- a/packages/amunits/Makefile +++ b/packages/amunits/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=amunits override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl doublebuffer intuition graphics amigalib nonvolatile iffparse hardware expansion diskfont conunit amigados configvars keyboard bootblock icon cd realtime rexx translator scsidisk lowlevel configregs prefs parallel gadtools prtgfx romboot_base trackdisk expansionbase amigaguide amigaprinter bullet clipboard keymap utility timer workbench colorwheel prtbase console locale tapedeck serial gameport gradientslider input audio datatypes asl commodities hardblocks layers inputevent identify gtlayout tritonmacros render mui picasso96api guigfx preferences xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib mysticview ahi lucyplay ahi_sub +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src src/otherlibs src/utilunits src/coreunits tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1474,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1718,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1857,93 +1687,10 @@ 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)) @@ -1967,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2228,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2285,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/amunits/Makefile.fpc b/packages/amunits/Makefile.fpc index c276da741e..8a9ad6432c 100644 --- a/packages/amunits/Makefile.fpc +++ b/packages/amunits/Makefile.fpc @@ -1,28 +1,13 @@ # -# Makefile.fpc for Free Pascal Amiga units Bindings +# Makefile.fpc for running fpmake # [package] name=amunits version=2.7.1 -[target] -units= msgbox amigautils wbargs vartags pastoc tagsarray systemvartags \ - deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl \ - doublebuffer intuition graphics amigalib nonvolatile iffparse hardware \ - expansion diskfont conunit amigados configvars keyboard bootblock icon \ - cd realtime rexx translator scsidisk lowlevel configregs prefs parallel \ - gadtools prtgfx romboot_base trackdisk expansionbase amigaguide \ - amigaprinter bullet clipboard keymap utility timer workbench colorwheel \ - prtbase console locale tapedeck serial gameport gradientslider input \ - audio datatypes asl commodities hardblocks layers inputevent identify \ - gtlayout tritonmacros render mui picasso96api guigfx preferences \ - xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib \ - mysticview ahi lucyplay ahi_sub - -[compiler] -includedir=src -sourcedir=src src/otherlibs src/utilunits src/coreunits tests +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -30,5 +15,62 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/amunits/Makefile.fpc.fpcmake b/packages/amunits/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..c276da741e --- /dev/null +++ b/packages/amunits/Makefile.fpc.fpcmake @@ -0,0 +1,34 @@ +# +# Makefile.fpc for Free Pascal Amiga units Bindings +# + +[package] +name=amunits +version=2.7.1 + +[target] +units= msgbox amigautils wbargs vartags pastoc tagsarray systemvartags \ + deadkeys consoleio pcq longarray linklist hisoft timerutils easyasl \ + doublebuffer intuition graphics amigalib nonvolatile iffparse hardware \ + expansion diskfont conunit amigados configvars keyboard bootblock icon \ + cd realtime rexx translator scsidisk lowlevel configregs prefs parallel \ + gadtools prtgfx romboot_base trackdisk expansionbase amigaguide \ + amigaprinter bullet clipboard keymap utility timer workbench colorwheel \ + prtbase console locale tapedeck serial gameport gradientslider input \ + audio datatypes asl commodities hardblocks layers inputevent identify \ + gtlayout tritonmacros render mui picasso96api guigfx preferences \ + xadmaster cybergraphics ptreplay reqtools amarquee ttengine triton zlib \ + mysticview ahi lucyplay ahi_sub + +[compiler] +includedir=src +sourcedir=src src/otherlibs src/utilunits src/coreunits tests + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: diff --git a/packages/aspell/Makefile b/packages/aspell/Makefile index db48f0267a..1930b134c7 100644 --- a/packages/aspell/Makefile +++ b/packages/aspell/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=aspell override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=aspell aspelldyn spellcheck -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=aspell aspelldyn spellcheck +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1474,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1718,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1857,93 +1687,10 @@ 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)) @@ -1967,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2228,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2285,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/aspell/Makefile.fpc b/packages/aspell/Makefile.fpc index 2fc1613232..5fe39ae68e 100644 --- a/packages/aspell/Makefile.fpc +++ b/packages/aspell/Makefile.fpc @@ -1,13 +1,13 @@ # -# Makefile.fpc for pcap bindings +# Makefile.fpc for running fpmake # [package] name=aspell version=2.7.1 -[target] -units=aspell aspelldyn spellcheck +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -15,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/aspell/Makefile.fpc.fpcmake b/packages/aspell/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..2fc1613232 --- /dev/null +++ b/packages/aspell/Makefile.fpc.fpcmake @@ -0,0 +1,23 @@ +# +# Makefile.fpc for pcap bindings +# + +[package] +name=aspell +version=2.7.1 + +[target] +units=aspell aspelldyn spellcheck + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[rules] +.NOTPARALLEL: diff --git a/packages/bfd/Makefile b/packages/bfd/Makefile index b8b11a43fe..2b22bad7e7 100644 --- a/packages/bfd/Makefile +++ b/packages/bfd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,576 +294,15 @@ endif endif override PACKAGE_NAME=bfd override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=bfd +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=bfd -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=bfd +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1448,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1476,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1704,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1720,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1859,93 +1687,10 @@ 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)) @@ -1969,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2230,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2287,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/bfd/Makefile.fpc b/packages/bfd/Makefile.fpc index ba5e2724af..d79379d49e 100644 --- a/packages/bfd/Makefile.fpc +++ b/packages/bfd/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for BFD library +# Makefile.fpc for running fpmake # [package] name=bfd version=2.7.1 -[target] -units=bfd -examples= - [require] -package=rtl +packages=rtl fpmkunit [install] fpcpackage=y @@ -19,13 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests - - -[shared] -build=n +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/bfd/Makefile.fpc.fpcmake b/packages/bfd/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..ba5e2724af --- /dev/null +++ b/packages/bfd/Makefile.fpc.fpcmake @@ -0,0 +1,31 @@ +# +# Makefile.fpc for BFD library +# + +[package] +name=bfd +version=2.7.1 + +[target] +units=bfd +examples= + +[require] +package=rtl + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + + +[shared] +build=n + +[rules] +.NOTPARALLEL: diff --git a/packages/bzip2/Makefile b/packages/bzip2/Makefile index dabff3068f..2d177de8ea 100644 --- a/packages/bzip2/Makefile +++ b/packages/bzip2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,576 +294,15 @@ endif endif override PACKAGE_NAME=bzip2 override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=bzip2comn bzip2 bzip2stream +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1448,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1476,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1704,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1720,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1859,93 +1687,10 @@ 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)) @@ -1969,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2230,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2287,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/bzip2/Makefile.fpc b/packages/bzip2/Makefile.fpc index beabdeb094..5fa5cc1e12 100644 --- a/packages/bzip2/Makefile.fpc +++ b/packages/bzip2/Makefile.fpc @@ -1,16 +1,13 @@ # -# Makefile.fpc for BZip2 library +# Makefile.fpc for running fpmake # [package] name=bzip2 version=2.7.1 -[target] -units=bzip2comn bzip2 bzip2stream - [require] -package=rtl +packages=rtl fpmkunit [install] fpcpackage=y @@ -18,13 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests - - -[shared] -build=n +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/bzip2/Makefile.fpc.fpcmake b/packages/bzip2/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..beabdeb094 --- /dev/null +++ b/packages/bzip2/Makefile.fpc.fpcmake @@ -0,0 +1,30 @@ +# +# Makefile.fpc for BZip2 library +# + +[package] +name=bzip2 +version=2.7.1 + +[target] +units=bzip2comn bzip2 bzip2stream + +[require] +package=rtl + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + + +[shared] +build=n + +[rules] +.NOTPARALLEL: diff --git a/packages/cairo/Makefile b/packages/cairo/Makefile index b8fe2a7cd2..824d755ab1 100644 --- a/packages/cairo/Makefile +++ b/packages/cairo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=cairo override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=cairo cairoft cairowin32 -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=cairo cairoft -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=cairo cairoft cairoxlib +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1058,37 +499,6 @@ 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 @@ -1477,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1505,15 +896,13 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-image +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1521,7 +910,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1529,7 +917,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1537,7 +924,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1545,8 +931,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1554,8 +938,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1563,8 +945,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1572,8 +952,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1581,8 +959,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1590,7 +966,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1598,7 +973,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1606,8 +980,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1615,7 +987,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1623,8 +994,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1632,7 +1001,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1640,7 +1008,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1648,7 +1015,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1656,7 +1022,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1664,7 +1029,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1672,7 +1036,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1680,7 +1043,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1688,8 +1050,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1697,8 +1057,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1706,8 +1064,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1715,8 +1071,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1724,7 +1078,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1732,7 +1085,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1740,8 +1092,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1749,7 +1099,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1757,7 +1106,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1765,8 +1113,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1774,8 +1120,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1783,7 +1127,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1791,7 +1134,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1799,8 +1141,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1808,7 +1148,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1816,7 +1155,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1824,7 +1162,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1832,8 +1169,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1841,8 +1176,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1850,8 +1183,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1859,7 +1190,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1867,8 +1197,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1876,8 +1204,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1885,8 +1211,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1894,8 +1218,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1903,7 +1225,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1911,7 +1232,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1919,8 +1239,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1928,7 +1246,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1936,8 +1253,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -1945,7 +1260,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -1953,7 +1267,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -1961,7 +1274,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1969,7 +1281,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1977,7 +1288,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1985,8 +1295,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1994,8 +1302,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2003,7 +1309,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2011,7 +1316,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2019,8 +1323,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2028,7 +1330,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2036,8 +1337,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-IMAGE=1 -REQUIRE_PACKAGES_X11=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2229,82 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-IMAGE -PACKAGEDIR_FCL-IMAGE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-IMAGE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-IMAGE=$(PACKAGEDIR_FCL-IMAGE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-IMAGE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-IMAGE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-IMAGE= -UNITDIR_FCL-IMAGE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-image/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-IMAGE),) -UNITDIR_FCL-IMAGE:=$(firstword $(UNITDIR_FCL-IMAGE)) -else -UNITDIR_FCL-IMAGE= -endif -endif -ifdef UNITDIR_FCL-IMAGE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-IMAGE) -endif -ifdef UNITDIR_FPMAKE_FCL-IMAGE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-IMAGE) -endif -endif -ifdef REQUIRE_PACKAGES_X11 -PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_X11),) -ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)),) -UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) -else -UNITDIR_X11=$(PACKAGEDIR_X11) -endif -ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_X11)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE) -endif -else -PACKAGEDIR_X11= -UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_X11),) -UNITDIR_X11:=$(firstword $(UNITDIR_X11)) -else -UNITDIR_X11= -endif -endif -ifdef UNITDIR_X11 -override COMPILER_UNITDIR+=$(UNITDIR_X11) -endif -ifdef UNITDIR_FPMAKE_X11 -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2321,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2426,12 +1653,6 @@ 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 @@ -2466,93 +1687,10 @@ 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)) @@ -2576,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2837,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2894,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/cairo/Makefile.fpc b/packages/cairo/Makefile.fpc index 3128103f95..c4c8e17b1d 100644 --- a/packages/cairo/Makefile.fpc +++ b/packages/cairo/Makefile.fpc @@ -1,35 +1,13 @@ # -# Makefile.fpc for cairo +# Makefile.fpc for running fpmake # -[require] -packages=fcl-image -#packages_win32= -packages_beos=x11 -packages_haiku=x11 -packages_linux=x11 -packages_freebsd=x11 -packages_netbsd=x11 -packages_openbsd=x11 -packages_solaris=x11 -packages_darwin=x11 -packages_iphonesim=x11 [package] name=cairo version=2.7.1 -[target] -units=cairo cairoft -units_win32=cairowin32 -units_beos=cairoxlib -units_haiku=cairoxlib -units_linux=cairoxlib -units_freebsd=cairoxlib -units_netbsd=cairoxlib -units_openbsd=cairoxlib -units_solaris=cairoxlib -units_darwin=cairoxlib -units_iphonesim=cairoxlib +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -37,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/cairo/Makefile.fpc.fpcmake b/packages/cairo/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..3128103f95 --- /dev/null +++ b/packages/cairo/Makefile.fpc.fpcmake @@ -0,0 +1,45 @@ +# +# Makefile.fpc for cairo +# +[require] +packages=fcl-image +#packages_win32= +packages_beos=x11 +packages_haiku=x11 +packages_linux=x11 +packages_freebsd=x11 +packages_netbsd=x11 +packages_openbsd=x11 +packages_solaris=x11 +packages_darwin=x11 +packages_iphonesim=x11 + +[package] +name=cairo +version=2.7.1 + +[target] +units=cairo cairoft +units_win32=cairowin32 +units_beos=cairoxlib +units_haiku=cairoxlib +units_linux=cairoxlib +units_freebsd=cairoxlib +units_netbsd=cairoxlib +units_openbsd=cairoxlib +units_solaris=cairoxlib +units_darwin=cairoxlib +units_iphonesim=cairoxlib + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[rules] +.NOTPARALLEL: diff --git a/packages/cdrom/Makefile b/packages/cdrom/Makefile index 382f81b3bb..d9e29d2082 100644 --- a/packages/cdrom/Makefile +++ b/packages/cdrom/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,793 +294,15 @@ endif endif override PACKAGE_NAME=cdrom override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=cdrom discid fpcddb +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=cdrom discid fpcddb -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_IMPLICITUNITS+=scsidefs wnaspi32 cdromioctl wincd -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_IMPLICITUNITS+=major lincd -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLEDIRS+=examples +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1665,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1693,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1921,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1937,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2076,113 +1687,10 @@ 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_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.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)) @@ -2206,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2467,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2524,262 +2028,59 @@ 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_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifdef TARGET_EXAMPLEDIRS_EXAMPLES -examples_all: - $(MAKE) -C examples all -examples_debug: - $(MAKE) -C examples debug -examples_smart: - $(MAKE) -C examples smart -examples_release: - $(MAKE) -C examples release -examples_units: - $(MAKE) -C examples units -examples_examples: - $(MAKE) -C examples examples -examples_shared: - $(MAKE) -C examples shared -examples_install: - $(MAKE) -C examples install -examples_sourceinstall: - $(MAKE) -C examples sourceinstall -examples_exampleinstall: - $(MAKE) -C examples exampleinstall -examples_distinstall: - $(MAKE) -C examples distinstall -examples_zipinstall: - $(MAKE) -C examples zipinstall -examples_zipsourceinstall: - $(MAKE) -C examples zipsourceinstall -examples_zipexampleinstall: - $(MAKE) -C examples zipexampleinstall -examples_zipdistinstall: - $(MAKE) -C examples zipdistinstall -examples_clean: - $(MAKE) -C examples clean -examples_distclean: - $(MAKE) -C examples distclean -examples_cleanall: - $(MAKE) -C examples cleanall -examples_info: - $(MAKE) -C examples info -examples_makefiles: - $(MAKE) -C examples makefiles +units: examples: - $(MAKE) -C examples all -.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples -endif -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: fpc_examples -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall -clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS)) -distclean: fpc_distclean -cleanall: fpc_cleanall +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/cdrom/Makefile.fpc b/packages/cdrom/Makefile.fpc index 9adbb088fb..3a12e54a71 100644 --- a/packages/cdrom/Makefile.fpc +++ b/packages/cdrom/Makefile.fpc @@ -1,26 +1,76 @@ # -# Makefile.fpc for cdrom +# Makefile.fpc for running fpmake # [package] name=cdrom version=2.7.1 -[target] -units=cdrom discid fpcddb -implicitunits_win32=scsidefs wnaspi32 cdromioctl wincd -implicitunits_linux=major lincd -exampledirs=examples +[require] +packages=rtl fpmkunit [install] fpcpackage=y -[compiler] -includedir=src -sourcedir=src tests - [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/cdrom/Makefile.fpc.fpcmake b/packages/cdrom/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..9adbb088fb --- /dev/null +++ b/packages/cdrom/Makefile.fpc.fpcmake @@ -0,0 +1,26 @@ +# +# Makefile.fpc for cdrom +# + +[package] +name=cdrom +version=2.7.1 + +[target] +units=cdrom discid fpcddb +implicitunits_win32=scsidefs wnaspi32 cdromioctl wincd +implicitunits_linux=major lincd +exampledirs=examples + +[install] +fpcpackage=y + +[compiler] +includedir=src +sourcedir=src tests + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: diff --git a/packages/chm/Makefile b/packages/chm/Makefile index 030e8c2071..804dd92059 100644 --- a/packages/chm/Makefile +++ b/packages/chm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,763 +294,15 @@ endif endif override PACKAGE_NAME=chm override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_PROGRAMS+=chmcmd chmls +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_PROGRAMS+=chmcmd chmls -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1247,37 +499,6 @@ 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 @@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1694,16 +896,13 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl rtl fcl-xml +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1711,8 +910,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1720,8 +917,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1729,8 +924,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1738,9 +931,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1748,9 +938,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1758,9 +945,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1768,8 +952,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1777,8 +959,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1786,8 +966,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1795,8 +973,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1804,8 +980,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1813,8 +987,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1822,9 +994,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1832,8 +1001,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1841,8 +1008,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1850,8 +1015,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1859,8 +1022,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1868,8 +1029,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1877,8 +1036,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1886,8 +1043,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1895,9 +1050,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1905,9 +1057,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1915,9 +1064,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1925,8 +1071,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1934,8 +1078,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1943,8 +1085,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1952,8 +1092,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1961,8 +1099,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1970,8 +1106,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1979,9 +1113,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1989,8 +1120,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1998,8 +1127,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -2007,8 +1134,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2016,9 +1141,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -2026,8 +1148,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2035,8 +1155,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2044,8 +1162,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2053,9 +1169,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2063,8 +1176,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2072,8 +1183,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2081,8 +1190,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2090,9 +1197,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2100,9 +1204,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2110,8 +1211,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2119,9 +1218,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2129,8 +1225,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2138,8 +1232,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2147,9 +1239,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2157,8 +1246,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2166,9 +1253,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2176,8 +1260,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2185,8 +1267,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2194,8 +1274,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2203,8 +1281,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2212,8 +1288,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2221,9 +1295,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2231,9 +1302,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2241,8 +1309,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2250,8 +1316,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2259,9 +1323,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2269,8 +1330,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2278,9 +1337,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2472,120 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif -ifdef REQUIRE_PACKAGES_ICONVENC -PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ICONVENC),) -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)),) -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) -else -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ICONVENC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ICONVENC)/$(FPCMADE) -endif -else -PACKAGEDIR_ICONVENC= -UNITDIR_ICONVENC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ICONVENC),) -UNITDIR_ICONVENC:=$(firstword $(UNITDIR_ICONVENC)) -else -UNITDIR_ICONVENC= -endif -endif -ifdef UNITDIR_ICONVENC -override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) -endif -ifdef UNITDIR_FPMAKE_ICONVENC -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-XML -PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-XML),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-XML)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-XML)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-XML= -UNITDIR_FCL-XML:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-XML),) -UNITDIR_FCL-XML:=$(firstword $(UNITDIR_FCL-XML)) -else -UNITDIR_FCL-XML= -endif -endif -ifdef UNITDIR_FCL-XML -override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) -endif -ifdef UNITDIR_FPMAKE_FCL-XML -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2602,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2707,12 +1653,6 @@ 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 @@ -2747,112 +1687,10 @@ 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) -.PHONY: fpc_exes -ifndef CROSSINSTALL -ifneq ($(TARGET_PROGRAMS),) -override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) -override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) -override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS)) -override ALLTARGET+=fpc_exes -override INSTALLEXEFILES+=$(EXEFILES) -override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES) -override CLEANEXEDBGFILES+=$(EXEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS)) -endif -endif -endif -fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES) 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)) @@ -2876,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -3137,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -3194,30 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: -cdmcmd$(EXEEXT): chmcmd.lpr -chmls$(EXEEXT): chmls.lpr +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/chm/Makefile.fpc b/packages/chm/Makefile.fpc index 83f9f2034c..3c5cc3bfbc 100644 --- a/packages/chm/Makefile.fpc +++ b/packages/chm/Makefile.fpc @@ -1,20 +1,13 @@ # -# Makefile.fpc for chm library +# Makefile.fpc for running fpmake # [package] name=chm version=2.7.1 -[target] -units=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes \ - chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer \ - chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader -programs=chmcmd chmls -examples= - [require] -packages=rtl fcl-xml +packages=rtl fpmkunit [install] fpcpackage=y @@ -22,15 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: -cdmcmd$(EXEEXT): chmcmd.lpr - -chmls$(EXEEXT): chmls.lpr - +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/chm/Makefile.fpc.fpcmake b/packages/chm/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..83f9f2034c --- /dev/null +++ b/packages/chm/Makefile.fpc.fpcmake @@ -0,0 +1,36 @@ +# +# Makefile.fpc for chm library +# + +[package] +name=chm +version=2.7.1 + +[target] +units=fasthtmlparser htmlutil paslzx paslzxcomp paslznonslide chmbase chmtypes \ + chmspecialfiles chmsitemap chmwriter chmfilewriter chmreader htmlindexer \ + chmfiftimain lzxcompressthread itolitlstypes itsftransform itolitlsreader +programs=chmcmd chmls +examples= + +[require] +packages=rtl fcl-xml + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[rules] +.NOTPARALLEL: + +cdmcmd$(EXEEXT): chmcmd.lpr + +chmls$(EXEEXT): chmls.lpr + + diff --git a/packages/dbus/Makefile b/packages/dbus/Makefile index 77c614a03d..91da60b3ae 100644 --- a/packages/dbus/Makefile +++ b/packages/dbus/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,763 +294,15 @@ endif endif override PACKAGE_NAME=dbus override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=dbus +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=dbus -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLEDIRS+=examples +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -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-haiku) -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),i386-nativent) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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 -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1247,37 +499,6 @@ 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 @@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1694,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1922,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1938,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2043,12 +1653,6 @@ 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 @@ -2083,113 +1687,10 @@ 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_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.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)) @@ -2213,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2474,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2531,262 +2028,59 @@ 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_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifdef TARGET_EXAMPLEDIRS_EXAMPLES -examples_all: - $(MAKE) -C examples all -examples_debug: - $(MAKE) -C examples debug -examples_smart: - $(MAKE) -C examples smart -examples_release: - $(MAKE) -C examples release -examples_units: - $(MAKE) -C examples units -examples_examples: - $(MAKE) -C examples examples -examples_shared: - $(MAKE) -C examples shared -examples_install: - $(MAKE) -C examples install -examples_sourceinstall: - $(MAKE) -C examples sourceinstall -examples_exampleinstall: - $(MAKE) -C examples exampleinstall -examples_distinstall: - $(MAKE) -C examples distinstall -examples_zipinstall: - $(MAKE) -C examples zipinstall -examples_zipsourceinstall: - $(MAKE) -C examples zipsourceinstall -examples_zipexampleinstall: - $(MAKE) -C examples zipexampleinstall -examples_zipdistinstall: - $(MAKE) -C examples zipdistinstall -examples_clean: - $(MAKE) -C examples clean -examples_distclean: - $(MAKE) -C examples distclean -examples_cleanall: - $(MAKE) -C examples cleanall -examples_info: - $(MAKE) -C examples info -examples_makefiles: - $(MAKE) -C examples makefiles +units: examples: - $(MAKE) -C examples all -.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples -endif -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: fpc_examples -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall -clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS)) -distclean: fpc_distclean -cleanall: fpc_cleanall +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/dbus/Makefile.fpc b/packages/dbus/Makefile.fpc index 078a2b7ed3..d7e7f9f595 100644 --- a/packages/dbus/Makefile.fpc +++ b/packages/dbus/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for dbus unit +# Makefile.fpc for running fpmake # [package] name=dbus version=2.7.1 -[target] -units=dbus -exampledirs=examples - [require] -libc=y +packages=rtl fpmkunit [install] fpcpackage=y @@ -19,10 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests examples +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] - .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/dbus/Makefile.fpc.fpcmake b/packages/dbus/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..078a2b7ed3 --- /dev/null +++ b/packages/dbus/Makefile.fpc.fpcmake @@ -0,0 +1,28 @@ +# +# Makefile.fpc for dbus unit +# + +[package] +name=dbus +version=2.7.1 + +[target] +units=dbus +exampledirs=examples + +[require] +libc=y + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests examples + +[rules] + +.NOTPARALLEL: diff --git a/packages/dts/Makefile b/packages/dts/Makefile index 15421907e2..e0279a7469 100644 --- a/packages/dts/Makefile +++ b/packages/dts/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=dts override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=dts +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=dts -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=dts +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1474,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1718,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1857,93 +1687,10 @@ 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)) @@ -1967,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2228,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2285,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/dts/Makefile.fpc b/packages/dts/Makefile.fpc index fdaef22119..6c2be43766 100644 --- a/packages/dts/Makefile.fpc +++ b/packages/dts/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for A52DEC bindings +# Makefile.fpc for running fpmake # [package] name=dts version=2.7.1 -[target] -units=dts - [require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/dts/Makefile.fpc.fpcmake b/packages/dts/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..fdaef22119 --- /dev/null +++ b/packages/dts/Makefile.fpc.fpcmake @@ -0,0 +1,25 @@ +# +# Makefile.fpc for A52DEC bindings +# + +[package] +name=dts +version=2.7.1 + +[target] +units=dts + +[require] + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[rules] +.NOTPARALLEL: diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile index c4b33b7803..ac69667cc8 100644 --- a/packages/fcl-db/Makefile +++ b/packages/fcl-db/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/11/22] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -153,12 +153,6 @@ ifdef OS_TARGET_DEFAULT OS_TARGET=$(OS_TARGET_DEFAULT) endif endif -ifneq ($(words $(FPC_COMPILERINFO)),5) -FPC_COMPILERINFO+=$(shell $(FPC) -iSP) -FPC_COMPILERINFO+=$(shell $(FPC) -iTP) -FPC_COMPILERINFO+=$(shell $(FPC) -iSO) -FPC_COMPILERINFO+=$(shell $(FPC) -iTO) -endif ifndef CPU_SOURCE CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO)) endif @@ -300,385 +294,15 @@ endif endif override PACKAGE_NAME=fcl-db override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/paradox src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/sql src/json src/dbase src/sqlite src/paradox src/export src/datadict src/codegen +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -875,37 +499,6 @@ 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 @@ -1294,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:=1 -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1322,24 +896,13 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=fcl-base fcl-xml fcl-json +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1347,9 +910,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1357,16 +917,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1374,9 +924,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1384,17 +931,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1402,17 +938,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1420,12 +945,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1433,16 +952,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1450,10 +959,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1461,9 +966,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1471,9 +973,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1481,16 +980,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1498,9 +987,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1508,16 +994,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1525,9 +1001,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1535,9 +1008,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1545,9 +1015,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1555,15 +1022,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1571,9 +1029,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1581,9 +1036,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1591,9 +1043,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1601,16 +1050,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1618,17 +1057,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1636,17 +1064,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1654,16 +1071,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1671,9 +1078,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1681,9 +1085,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1691,16 +1092,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1708,9 +1099,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1718,9 +1106,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1728,17 +1113,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1746,16 +1120,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1763,9 +1127,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1773,9 +1134,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1783,16 +1141,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1800,9 +1148,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1810,9 +1155,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1820,9 +1162,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1830,17 +1169,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1848,16 +1176,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1865,10 +1183,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1876,9 +1190,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -1886,17 +1197,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1904,17 +1204,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1922,10 +1211,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1933,16 +1218,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -1950,13 +1225,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1964,9 +1232,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -1974,17 +1239,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1992,9 +1246,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2002,16 +1253,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2019,15 +1260,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2035,9 +1267,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2045,9 +1274,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2055,9 +1281,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2065,9 +1288,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2075,17 +1295,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2093,16 +1302,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2110,9 +1309,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2120,9 +1316,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2130,17 +1323,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2148,9 +1330,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2158,17 +1337,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 -REQUIRE_PACKAGES_FCL-XML=1 -REQUIRE_PACKAGES_FCL-JSON=1 -REQUIRE_PACKAGES_IBASE=1 -REQUIRE_PACKAGES_POSTGRES=1 -REQUIRE_PACKAGES_MYSQL=1 -REQUIRE_PACKAGES_ODBC=1 -REQUIRE_PACKAGES_ORACLE=1 -REQUIRE_PACKAGES_SQLITE=1 -REQUIRE_PACKAGES_PXLIB=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2360,424 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif -ifdef REQUIRE_PACKAGES_ICONVENC -PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ICONVENC),) -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)),) -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) -else -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ICONVENC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ICONVENC)/$(FPCMADE) -endif -else -PACKAGEDIR_ICONVENC= -UNITDIR_ICONVENC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ICONVENC),) -UNITDIR_ICONVENC:=$(firstword $(UNITDIR_ICONVENC)) -else -UNITDIR_ICONVENC= -endif -endif -ifdef UNITDIR_ICONVENC -override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) -endif -ifdef UNITDIR_FPMAKE_ICONVENC -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-XML -PACKAGEDIR_FCL-XML:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-XML),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-XML=$(PACKAGEDIR_FCL-XML) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-XML=$(PACKAGEDIR_FCL-XML) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-XML)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-XML) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-XML)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-XML= -UNITDIR_FCL-XML:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-xml/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-XML),) -UNITDIR_FCL-XML:=$(firstword $(UNITDIR_FCL-XML)) -else -UNITDIR_FCL-XML= -endif -endif -ifdef UNITDIR_FCL-XML -override COMPILER_UNITDIR+=$(UNITDIR_FCL-XML) -endif -ifdef UNITDIR_FPMAKE_FCL-XML -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-XML) -endif -endif -ifdef REQUIRE_PACKAGES_FCL-JSON -PACKAGEDIR_FCL-JSON:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-json/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-JSON),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-JSON)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-JSON=$(PACKAGEDIR_FCL-JSON)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-JSON=$(PACKAGEDIR_FCL-JSON) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-JSON)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-JSON=$(PACKAGEDIR_FCL-JSON)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-JSON)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-JSON=$(PACKAGEDIR_FCL-JSON)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-JSON=$(PACKAGEDIR_FCL-JSON) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-JSON)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-JSON) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-JSON)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-JSON= -UNITDIR_FCL-JSON:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-json/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-JSON),) -UNITDIR_FCL-JSON:=$(firstword $(UNITDIR_FCL-JSON)) -else -UNITDIR_FCL-JSON= -endif -endif -ifdef UNITDIR_FCL-JSON -override COMPILER_UNITDIR+=$(UNITDIR_FCL-JSON) -endif -ifdef UNITDIR_FPMAKE_FCL-JSON -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-JSON) -endif -endif -ifdef REQUIRE_PACKAGES_IBASE -PACKAGEDIR_IBASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /ibase/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_IBASE),) -ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX)),) -UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/units/$(TARGETSUFFIX) -else -UNITDIR_IBASE=$(PACKAGEDIR_IBASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_IBASE=$(PACKAGEDIR_IBASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_IBASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE) -endif -else -PACKAGEDIR_IBASE= -UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_IBASE),) -UNITDIR_IBASE:=$(firstword $(UNITDIR_IBASE)) -else -UNITDIR_IBASE= -endif -endif -ifdef UNITDIR_IBASE -override COMPILER_UNITDIR+=$(UNITDIR_IBASE) -endif -ifdef UNITDIR_FPMAKE_IBASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_IBASE) -endif -endif -ifdef REQUIRE_PACKAGES_POSTGRES -PACKAGEDIR_POSTGRES:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /postgres/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_POSTGRES),) -ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX)),) -UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(TARGETSUFFIX) -else -UNITDIR_POSTGRES=$(PACKAGEDIR_POSTGRES) -endif -ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_POSTGRES=$(PACKAGEDIR_POSTGRES) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_POSTGRES)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_POSTGRES) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_POSTGRES)/$(FPCMADE) -endif -else -PACKAGEDIR_POSTGRES= -UNITDIR_POSTGRES:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /postgres/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_POSTGRES),) -UNITDIR_POSTGRES:=$(firstword $(UNITDIR_POSTGRES)) -else -UNITDIR_POSTGRES= -endif -endif -ifdef UNITDIR_POSTGRES -override COMPILER_UNITDIR+=$(UNITDIR_POSTGRES) -endif -ifdef UNITDIR_FPMAKE_POSTGRES -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_POSTGRES) -endif -endif -ifdef REQUIRE_PACKAGES_MYSQL -PACKAGEDIR_MYSQL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /mysql/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_MYSQL),) -ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX)),) -UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(TARGETSUFFIX) -else -UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL) -endif -ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_MYSQL=$(PACKAGEDIR_MYSQL) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_MYSQL)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE) -endif -else -PACKAGEDIR_MYSQL= -UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_MYSQL),) -UNITDIR_MYSQL:=$(firstword $(UNITDIR_MYSQL)) -else -UNITDIR_MYSQL= -endif -endif -ifdef UNITDIR_MYSQL -override COMPILER_UNITDIR+=$(UNITDIR_MYSQL) -endif -ifdef UNITDIR_FPMAKE_MYSQL -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_MYSQL) -endif -endif -ifdef REQUIRE_PACKAGES_ODBC -PACKAGEDIR_ODBC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /odbc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ODBC),) -ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX)),) -UNITDIR_ODBC=$(PACKAGEDIR_ODBC)/units/$(TARGETSUFFIX) -else -UNITDIR_ODBC=$(PACKAGEDIR_ODBC) -endif -ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_ODBC=$(PACKAGEDIR_ODBC) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ODBC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ODBC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ODBC)/$(FPCMADE) -endif -else -PACKAGEDIR_ODBC= -UNITDIR_ODBC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /odbc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ODBC),) -UNITDIR_ODBC:=$(firstword $(UNITDIR_ODBC)) -else -UNITDIR_ODBC= -endif -endif -ifdef UNITDIR_ODBC -override COMPILER_UNITDIR+=$(UNITDIR_ODBC) -endif -ifdef UNITDIR_FPMAKE_ODBC -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ODBC) -endif -endif -ifdef REQUIRE_PACKAGES_ORACLE -PACKAGEDIR_ORACLE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /oracle/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ORACLE),) -ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX)),) -UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(TARGETSUFFIX) -else -UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE) -endif -ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_ORACLE=$(PACKAGEDIR_ORACLE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ORACLE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE) -endif -else -PACKAGEDIR_ORACLE= -UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ORACLE),) -UNITDIR_ORACLE:=$(firstword $(UNITDIR_ORACLE)) -else -UNITDIR_ORACLE= -endif -endif -ifdef UNITDIR_ORACLE -override COMPILER_UNITDIR+=$(UNITDIR_ORACLE) -endif -ifdef UNITDIR_FPMAKE_ORACLE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ORACLE) -endif -endif -ifdef REQUIRE_PACKAGES_SQLITE -PACKAGEDIR_SQLITE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_SQLITE),) -ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX)),) -UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(TARGETSUFFIX) -else -UNITDIR_SQLITE=$(PACKAGEDIR_SQLITE) -endif -ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_SQLITE=$(PACKAGEDIR_SQLITE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_SQLITE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_SQLITE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_SQLITE)/$(FPCMADE) -endif -else -PACKAGEDIR_SQLITE= -UNITDIR_SQLITE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /sqlite/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_SQLITE),) -UNITDIR_SQLITE:=$(firstword $(UNITDIR_SQLITE)) -else -UNITDIR_SQLITE= -endif -endif -ifdef UNITDIR_SQLITE -override COMPILER_UNITDIR+=$(UNITDIR_SQLITE) -endif -ifdef UNITDIR_FPMAKE_SQLITE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_SQLITE) -endif -endif -ifdef REQUIRE_PACKAGES_PXLIB -PACKAGEDIR_PXLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_PXLIB),) -ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX)),) -UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(TARGETSUFFIX) -else -UNITDIR_PXLIB=$(PACKAGEDIR_PXLIB) -endif -ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_PXLIB=$(PACKAGEDIR_PXLIB) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_PXLIB)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_PXLIB) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_PXLIB)/$(FPCMADE) -endif -else -PACKAGEDIR_PXLIB= -UNITDIR_PXLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /pxlib/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_PXLIB),) -UNITDIR_PXLIB:=$(firstword $(UNITDIR_PXLIB)) -else -UNITDIR_PXLIB= -endif -endif -ifdef UNITDIR_PXLIB -override COMPILER_UNITDIR+=$(UNITDIR_PXLIB) -endif -ifdef UNITDIR_FPMAKE_PXLIB -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PXLIB) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2794,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2899,12 +1653,6 @@ 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 @@ -2966,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -3227,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -3284,1247 +2028,59 @@ 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_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_DIRS_SRC/SDF=1 -TARGET_DIRS_SRC/MEMDS=1 -TARGET_DIRS_SRC/SQLDB=1 -TARGET_DIRS_SRC/BASE=1 -TARGET_DIRS_SRC/SQL=1 -TARGET_DIRS_SRC/JSON=1 -TARGET_DIRS_SRC/DBASE=1 -TARGET_DIRS_SRC/SQLITE=1 -TARGET_DIRS_SRC/PARADOX=1 -TARGET_DIRS_SRC/EXPORT=1 -TARGET_DIRS_SRC/DATADICT=1 -TARGET_DIRS_SRC/CODEGEN=1 -endif -ifdef TARGET_DIRS_SRC/SDF -src/sdf_all: - $(MAKE) -C src/sdf all -src/sdf_debug: - $(MAKE) -C src/sdf debug -src/sdf_smart: - $(MAKE) -C src/sdf smart -src/sdf_release: - $(MAKE) -C src/sdf release -src/sdf_units: - $(MAKE) -C src/sdf units -src/sdf_examples: - $(MAKE) -C src/sdf examples -src/sdf_shared: - $(MAKE) -C src/sdf shared -src/sdf_install: - $(MAKE) -C src/sdf install -src/sdf_sourceinstall: - $(MAKE) -C src/sdf sourceinstall -src/sdf_exampleinstall: - $(MAKE) -C src/sdf exampleinstall -src/sdf_distinstall: - $(MAKE) -C src/sdf distinstall -src/sdf_zipinstall: - $(MAKE) -C src/sdf zipinstall -src/sdf_zipsourceinstall: - $(MAKE) -C src/sdf zipsourceinstall -src/sdf_zipexampleinstall: - $(MAKE) -C src/sdf zipexampleinstall -src/sdf_zipdistinstall: - $(MAKE) -C src/sdf zipdistinstall -src/sdf_clean: - $(MAKE) -C src/sdf clean -src/sdf_distclean: - $(MAKE) -C src/sdf distclean -src/sdf_cleanall: - $(MAKE) -C src/sdf cleanall -src/sdf_info: - $(MAKE) -C src/sdf info -src/sdf_makefiles: - $(MAKE) -C src/sdf makefiles -src/sdf: - $(MAKE) -C src/sdf all -.PHONY: src/sdf_all src/sdf_debug src/sdf_smart src/sdf_release src/sdf_units src/sdf_examples src/sdf_shared src/sdf_install src/sdf_sourceinstall src/sdf_exampleinstall src/sdf_distinstall src/sdf_zipinstall src/sdf_zipsourceinstall src/sdf_zipexampleinstall src/sdf_zipdistinstall src/sdf_clean src/sdf_distclean src/sdf_cleanall src/sdf_info src/sdf_makefiles src/sdf -endif -ifdef TARGET_DIRS_SRC/MEMDS -src/memds_all: - $(MAKE) -C src/memds all -src/memds_debug: - $(MAKE) -C src/memds debug -src/memds_smart: - $(MAKE) -C src/memds smart -src/memds_release: - $(MAKE) -C src/memds release -src/memds_units: - $(MAKE) -C src/memds units -src/memds_examples: - $(MAKE) -C src/memds examples -src/memds_shared: - $(MAKE) -C src/memds shared -src/memds_install: - $(MAKE) -C src/memds install -src/memds_sourceinstall: - $(MAKE) -C src/memds sourceinstall -src/memds_exampleinstall: - $(MAKE) -C src/memds exampleinstall -src/memds_distinstall: - $(MAKE) -C src/memds distinstall -src/memds_zipinstall: - $(MAKE) -C src/memds zipinstall -src/memds_zipsourceinstall: - $(MAKE) -C src/memds zipsourceinstall -src/memds_zipexampleinstall: - $(MAKE) -C src/memds zipexampleinstall -src/memds_zipdistinstall: - $(MAKE) -C src/memds zipdistinstall -src/memds_clean: - $(MAKE) -C src/memds clean -src/memds_distclean: - $(MAKE) -C src/memds distclean -src/memds_cleanall: - $(MAKE) -C src/memds cleanall -src/memds_info: - $(MAKE) -C src/memds info -src/memds_makefiles: - $(MAKE) -C src/memds makefiles -src/memds: - $(MAKE) -C src/memds all -.PHONY: src/memds_all src/memds_debug src/memds_smart src/memds_release src/memds_units src/memds_examples src/memds_shared src/memds_install src/memds_sourceinstall src/memds_exampleinstall src/memds_distinstall src/memds_zipinstall src/memds_zipsourceinstall src/memds_zipexampleinstall src/memds_zipdistinstall src/memds_clean src/memds_distclean src/memds_cleanall src/memds_info src/memds_makefiles src/memds -endif -ifdef TARGET_DIRS_SRC/SQLDB -src/sqldb_all: - $(MAKE) -C src/sqldb all -src/sqldb_debug: - $(MAKE) -C src/sqldb debug -src/sqldb_smart: - $(MAKE) -C src/sqldb smart -src/sqldb_release: - $(MAKE) -C src/sqldb release -src/sqldb_units: - $(MAKE) -C src/sqldb units -src/sqldb_examples: - $(MAKE) -C src/sqldb examples -src/sqldb_shared: - $(MAKE) -C src/sqldb shared -src/sqldb_install: - $(MAKE) -C src/sqldb install -src/sqldb_sourceinstall: - $(MAKE) -C src/sqldb sourceinstall -src/sqldb_exampleinstall: - $(MAKE) -C src/sqldb exampleinstall -src/sqldb_distinstall: - $(MAKE) -C src/sqldb distinstall -src/sqldb_zipinstall: - $(MAKE) -C src/sqldb zipinstall -src/sqldb_zipsourceinstall: - $(MAKE) -C src/sqldb zipsourceinstall -src/sqldb_zipexampleinstall: - $(MAKE) -C src/sqldb zipexampleinstall -src/sqldb_zipdistinstall: - $(MAKE) -C src/sqldb zipdistinstall -src/sqldb_clean: - $(MAKE) -C src/sqldb clean -src/sqldb_distclean: - $(MAKE) -C src/sqldb distclean -src/sqldb_cleanall: - $(MAKE) -C src/sqldb cleanall -src/sqldb_info: - $(MAKE) -C src/sqldb info -src/sqldb_makefiles: - $(MAKE) -C src/sqldb makefiles -src/sqldb: - $(MAKE) -C src/sqldb all -.PHONY: src/sqldb_all src/sqldb_debug src/sqldb_smart src/sqldb_release src/sqldb_units src/sqldb_examples src/sqldb_shared src/sqldb_install src/sqldb_sourceinstall src/sqldb_exampleinstall src/sqldb_distinstall src/sqldb_zipinstall src/sqldb_zipsourceinstall src/sqldb_zipexampleinstall src/sqldb_zipdistinstall src/sqldb_clean src/sqldb_distclean src/sqldb_cleanall src/sqldb_info src/sqldb_makefiles src/sqldb -endif -ifdef TARGET_DIRS_SRC/BASE -src/base_all: - $(MAKE) -C src/base all -src/base_debug: - $(MAKE) -C src/base debug -src/base_smart: - $(MAKE) -C src/base smart -src/base_release: - $(MAKE) -C src/base release -src/base_units: - $(MAKE) -C src/base units -src/base_examples: - $(MAKE) -C src/base examples -src/base_shared: - $(MAKE) -C src/base shared -src/base_install: - $(MAKE) -C src/base install -src/base_sourceinstall: - $(MAKE) -C src/base sourceinstall -src/base_exampleinstall: - $(MAKE) -C src/base exampleinstall -src/base_distinstall: - $(MAKE) -C src/base distinstall -src/base_zipinstall: - $(MAKE) -C src/base zipinstall -src/base_zipsourceinstall: - $(MAKE) -C src/base zipsourceinstall -src/base_zipexampleinstall: - $(MAKE) -C src/base zipexampleinstall -src/base_zipdistinstall: - $(MAKE) -C src/base zipdistinstall -src/base_clean: - $(MAKE) -C src/base clean -src/base_distclean: - $(MAKE) -C src/base distclean -src/base_cleanall: - $(MAKE) -C src/base cleanall -src/base_info: - $(MAKE) -C src/base info -src/base_makefiles: - $(MAKE) -C src/base makefiles -src/base: - $(MAKE) -C src/base all -.PHONY: src/base_all src/base_debug src/base_smart src/base_release src/base_units src/base_examples src/base_shared src/base_install src/base_sourceinstall src/base_exampleinstall src/base_distinstall src/base_zipinstall src/base_zipsourceinstall src/base_zipexampleinstall src/base_zipdistinstall src/base_clean src/base_distclean src/base_cleanall src/base_info src/base_makefiles src/base -endif -ifdef TARGET_DIRS_SRC/SQL -src/sql_all: - $(MAKE) -C src/sql all -src/sql_debug: - $(MAKE) -C src/sql debug -src/sql_smart: - $(MAKE) -C src/sql smart -src/sql_release: - $(MAKE) -C src/sql release -src/sql_units: - $(MAKE) -C src/sql units -src/sql_examples: - $(MAKE) -C src/sql examples -src/sql_shared: - $(MAKE) -C src/sql shared -src/sql_install: - $(MAKE) -C src/sql install -src/sql_sourceinstall: - $(MAKE) -C src/sql sourceinstall -src/sql_exampleinstall: - $(MAKE) -C src/sql exampleinstall -src/sql_distinstall: - $(MAKE) -C src/sql distinstall -src/sql_zipinstall: - $(MAKE) -C src/sql zipinstall -src/sql_zipsourceinstall: - $(MAKE) -C src/sql zipsourceinstall -src/sql_zipexampleinstall: - $(MAKE) -C src/sql zipexampleinstall -src/sql_zipdistinstall: - $(MAKE) -C src/sql zipdistinstall -src/sql_clean: - $(MAKE) -C src/sql clean -src/sql_distclean: - $(MAKE) -C src/sql distclean -src/sql_cleanall: - $(MAKE) -C src/sql cleanall -src/sql_info: - $(MAKE) -C src/sql info -src/sql_makefiles: - $(MAKE) -C src/sql makefiles -src/sql: - $(MAKE) -C src/sql all -.PHONY: src/sql_all src/sql_debug src/sql_smart src/sql_release src/sql_units src/sql_examples src/sql_shared src/sql_install src/sql_sourceinstall src/sql_exampleinstall src/sql_distinstall src/sql_zipinstall src/sql_zipsourceinstall src/sql_zipexampleinstall src/sql_zipdistinstall src/sql_clean src/sql_distclean src/sql_cleanall src/sql_info src/sql_makefiles src/sql -endif -ifdef TARGET_DIRS_SRC/JSON -src/json_all: - $(MAKE) -C src/json all -src/json_debug: - $(MAKE) -C src/json debug -src/json_smart: - $(MAKE) -C src/json smart -src/json_release: - $(MAKE) -C src/json release -src/json_units: - $(MAKE) -C src/json units -src/json_examples: - $(MAKE) -C src/json examples -src/json_shared: - $(MAKE) -C src/json shared -src/json_install: - $(MAKE) -C src/json install -src/json_sourceinstall: - $(MAKE) -C src/json sourceinstall -src/json_exampleinstall: - $(MAKE) -C src/json exampleinstall -src/json_distinstall: - $(MAKE) -C src/json distinstall -src/json_zipinstall: - $(MAKE) -C src/json zipinstall -src/json_zipsourceinstall: - $(MAKE) -C src/json zipsourceinstall -src/json_zipexampleinstall: - $(MAKE) -C src/json zipexampleinstall -src/json_zipdistinstall: - $(MAKE) -C src/json zipdistinstall -src/json_clean: - $(MAKE) -C src/json clean -src/json_distclean: - $(MAKE) -C src/json distclean -src/json_cleanall: - $(MAKE) -C src/json cleanall -src/json_info: - $(MAKE) -C src/json info -src/json_makefiles: - $(MAKE) -C src/json makefiles -src/json: - $(MAKE) -C src/json all -.PHONY: src/json_all src/json_debug src/json_smart src/json_release src/json_units src/json_examples src/json_shared src/json_install src/json_sourceinstall src/json_exampleinstall src/json_distinstall src/json_zipinstall src/json_zipsourceinstall src/json_zipexampleinstall src/json_zipdistinstall src/json_clean src/json_distclean src/json_cleanall src/json_info src/json_makefiles src/json -endif -ifdef TARGET_DIRS_SRC/DBASE -src/dbase_all: - $(MAKE) -C src/dbase all -src/dbase_debug: - $(MAKE) -C src/dbase debug -src/dbase_smart: - $(MAKE) -C src/dbase smart -src/dbase_release: - $(MAKE) -C src/dbase release -src/dbase_units: - $(MAKE) -C src/dbase units -src/dbase_examples: - $(MAKE) -C src/dbase examples -src/dbase_shared: - $(MAKE) -C src/dbase shared -src/dbase_install: - $(MAKE) -C src/dbase install -src/dbase_sourceinstall: - $(MAKE) -C src/dbase sourceinstall -src/dbase_exampleinstall: - $(MAKE) -C src/dbase exampleinstall -src/dbase_distinstall: - $(MAKE) -C src/dbase distinstall -src/dbase_zipinstall: - $(MAKE) -C src/dbase zipinstall -src/dbase_zipsourceinstall: - $(MAKE) -C src/dbase zipsourceinstall -src/dbase_zipexampleinstall: - $(MAKE) -C src/dbase zipexampleinstall -src/dbase_zipdistinstall: - $(MAKE) -C src/dbase zipdistinstall -src/dbase_clean: - $(MAKE) -C src/dbase clean -src/dbase_distclean: - $(MAKE) -C src/dbase distclean -src/dbase_cleanall: - $(MAKE) -C src/dbase cleanall -src/dbase_info: - $(MAKE) -C src/dbase info -src/dbase_makefiles: - $(MAKE) -C src/dbase makefiles -src/dbase: - $(MAKE) -C src/dbase all -.PHONY: src/dbase_all src/dbase_debug src/dbase_smart src/dbase_release src/dbase_units src/dbase_examples src/dbase_shared src/dbase_install src/dbase_sourceinstall src/dbase_exampleinstall src/dbase_distinstall src/dbase_zipinstall src/dbase_zipsourceinstall src/dbase_zipexampleinstall src/dbase_zipdistinstall src/dbase_clean src/dbase_distclean src/dbase_cleanall src/dbase_info src/dbase_makefiles src/dbase -endif -ifdef TARGET_DIRS_SRC/SQLITE -src/sqlite_all: - $(MAKE) -C src/sqlite all -src/sqlite_debug: - $(MAKE) -C src/sqlite debug -src/sqlite_smart: - $(MAKE) -C src/sqlite smart -src/sqlite_release: - $(MAKE) -C src/sqlite release -src/sqlite_units: - $(MAKE) -C src/sqlite units -src/sqlite_examples: - $(MAKE) -C src/sqlite examples -src/sqlite_shared: - $(MAKE) -C src/sqlite shared -src/sqlite_install: - $(MAKE) -C src/sqlite install -src/sqlite_sourceinstall: - $(MAKE) -C src/sqlite sourceinstall -src/sqlite_exampleinstall: - $(MAKE) -C src/sqlite exampleinstall -src/sqlite_distinstall: - $(MAKE) -C src/sqlite distinstall -src/sqlite_zipinstall: - $(MAKE) -C src/sqlite zipinstall -src/sqlite_zipsourceinstall: - $(MAKE) -C src/sqlite zipsourceinstall -src/sqlite_zipexampleinstall: - $(MAKE) -C src/sqlite zipexampleinstall -src/sqlite_zipdistinstall: - $(MAKE) -C src/sqlite zipdistinstall -src/sqlite_clean: - $(MAKE) -C src/sqlite clean -src/sqlite_distclean: - $(MAKE) -C src/sqlite distclean -src/sqlite_cleanall: - $(MAKE) -C src/sqlite cleanall -src/sqlite_info: - $(MAKE) -C src/sqlite info -src/sqlite_makefiles: - $(MAKE) -C src/sqlite makefiles -src/sqlite: - $(MAKE) -C src/sqlite all -.PHONY: src/sqlite_all src/sqlite_debug src/sqlite_smart src/sqlite_release src/sqlite_units src/sqlite_examples src/sqlite_shared src/sqlite_install src/sqlite_sourceinstall src/sqlite_exampleinstall src/sqlite_distinstall src/sqlite_zipinstall src/sqlite_zipsourceinstall src/sqlite_zipexampleinstall src/sqlite_zipdistinstall src/sqlite_clean src/sqlite_distclean src/sqlite_cleanall src/sqlite_info src/sqlite_makefiles src/sqlite -endif -ifdef TARGET_DIRS_SRC/PARADOX -src/paradox_all: - $(MAKE) -C src/paradox all -src/paradox_debug: - $(MAKE) -C src/paradox debug -src/paradox_smart: - $(MAKE) -C src/paradox smart -src/paradox_release: - $(MAKE) -C src/paradox release -src/paradox_units: - $(MAKE) -C src/paradox units -src/paradox_examples: - $(MAKE) -C src/paradox examples -src/paradox_shared: - $(MAKE) -C src/paradox shared -src/paradox_install: - $(MAKE) -C src/paradox install -src/paradox_sourceinstall: - $(MAKE) -C src/paradox sourceinstall -src/paradox_exampleinstall: - $(MAKE) -C src/paradox exampleinstall -src/paradox_distinstall: - $(MAKE) -C src/paradox distinstall -src/paradox_zipinstall: - $(MAKE) -C src/paradox zipinstall -src/paradox_zipsourceinstall: - $(MAKE) -C src/paradox zipsourceinstall -src/paradox_zipexampleinstall: - $(MAKE) -C src/paradox zipexampleinstall -src/paradox_zipdistinstall: - $(MAKE) -C src/paradox zipdistinstall -src/paradox_clean: - $(MAKE) -C src/paradox clean -src/paradox_distclean: - $(MAKE) -C src/paradox distclean -src/paradox_cleanall: - $(MAKE) -C src/paradox cleanall -src/paradox_info: - $(MAKE) -C src/paradox info -src/paradox_makefiles: - $(MAKE) -C src/paradox makefiles -src/paradox: - $(MAKE) -C src/paradox all -.PHONY: src/paradox_all src/paradox_debug src/paradox_smart src/paradox_release src/paradox_units src/paradox_examples src/paradox_shared src/paradox_install src/paradox_sourceinstall src/paradox_exampleinstall src/paradox_distinstall src/paradox_zipinstall src/paradox_zipsourceinstall src/paradox_zipexampleinstall src/paradox_zipdistinstall src/paradox_clean src/paradox_distclean src/paradox_cleanall src/paradox_info src/paradox_makefiles src/paradox -endif -ifdef TARGET_DIRS_SRC/EXPORT -src/export_all: - $(MAKE) -C src/export all -src/export_debug: - $(MAKE) -C src/export debug -src/export_smart: - $(MAKE) -C src/export smart -src/export_release: - $(MAKE) -C src/export release -src/export_units: - $(MAKE) -C src/export units -src/export_examples: - $(MAKE) -C src/export examples -src/export_shared: - $(MAKE) -C src/export shared -src/export_install: - $(MAKE) -C src/export install -src/export_sourceinstall: - $(MAKE) -C src/export sourceinstall -src/export_exampleinstall: - $(MAKE) -C src/export exampleinstall -src/export_distinstall: - $(MAKE) -C src/export distinstall -src/export_zipinstall: - $(MAKE) -C src/export zipinstall -src/export_zipsourceinstall: - $(MAKE) -C src/export zipsourceinstall -src/export_zipexampleinstall: - $(MAKE) -C src/export zipexampleinstall -src/export_zipdistinstall: - $(MAKE) -C src/export zipdistinstall -src/export_clean: - $(MAKE) -C src/export clean -src/export_distclean: - $(MAKE) -C src/export distclean -src/export_cleanall: - $(MAKE) -C src/export cleanall -src/export_info: - $(MAKE) -C src/export info -src/export_makefiles: - $(MAKE) -C src/export makefiles -src/export: - $(MAKE) -C src/export all -.PHONY: src/export_all src/export_debug src/export_smart src/export_release src/export_units src/export_examples src/export_shared src/export_install src/export_sourceinstall src/export_exampleinstall src/export_distinstall src/export_zipinstall src/export_zipsourceinstall src/export_zipexampleinstall src/export_zipdistinstall src/export_clean src/export_distclean src/export_cleanall src/export_info src/export_makefiles src/export -endif -ifdef TARGET_DIRS_SRC/DATADICT -src/datadict_all: - $(MAKE) -C src/datadict all -src/datadict_debug: - $(MAKE) -C src/datadict debug -src/datadict_smart: - $(MAKE) -C src/datadict smart -src/datadict_release: - $(MAKE) -C src/datadict release -src/datadict_units: - $(MAKE) -C src/datadict units -src/datadict_examples: - $(MAKE) -C src/datadict examples -src/datadict_shared: - $(MAKE) -C src/datadict shared -src/datadict_install: - $(MAKE) -C src/datadict install -src/datadict_sourceinstall: - $(MAKE) -C src/datadict sourceinstall -src/datadict_exampleinstall: - $(MAKE) -C src/datadict exampleinstall -src/datadict_distinstall: - $(MAKE) -C src/datadict distinstall -src/datadict_zipinstall: - $(MAKE) -C src/datadict zipinstall -src/datadict_zipsourceinstall: - $(MAKE) -C src/datadict zipsourceinstall -src/datadict_zipexampleinstall: - $(MAKE) -C src/datadict zipexampleinstall -src/datadict_zipdistinstall: - $(MAKE) -C src/datadict zipdistinstall -src/datadict_clean: - $(MAKE) -C src/datadict clean -src/datadict_distclean: - $(MAKE) -C src/datadict distclean -src/datadict_cleanall: - $(MAKE) -C src/datadict cleanall -src/datadict_info: - $(MAKE) -C src/datadict info -src/datadict_makefiles: - $(MAKE) -C src/datadict makefiles -src/datadict: - $(MAKE) -C src/datadict all -.PHONY: src/datadict_all src/datadict_debug src/datadict_smart src/datadict_release src/datadict_units src/datadict_examples src/datadict_shared src/datadict_install src/datadict_sourceinstall src/datadict_exampleinstall src/datadict_distinstall src/datadict_zipinstall src/datadict_zipsourceinstall src/datadict_zipexampleinstall src/datadict_zipdistinstall src/datadict_clean src/datadict_distclean src/datadict_cleanall src/datadict_info src/datadict_makefiles src/datadict -endif -ifdef TARGET_DIRS_SRC/CODEGEN -src/codegen_all: - $(MAKE) -C src/codegen all -src/codegen_debug: - $(MAKE) -C src/codegen debug -src/codegen_smart: - $(MAKE) -C src/codegen smart -src/codegen_release: - $(MAKE) -C src/codegen release -src/codegen_units: - $(MAKE) -C src/codegen units -src/codegen_examples: - $(MAKE) -C src/codegen examples -src/codegen_shared: - $(MAKE) -C src/codegen shared -src/codegen_install: - $(MAKE) -C src/codegen install -src/codegen_sourceinstall: - $(MAKE) -C src/codegen sourceinstall -src/codegen_exampleinstall: - $(MAKE) -C src/codegen exampleinstall -src/codegen_distinstall: - $(MAKE) -C src/codegen distinstall -src/codegen_zipinstall: - $(MAKE) -C src/codegen zipinstall -src/codegen_zipsourceinstall: - $(MAKE) -C src/codegen zipsourceinstall -src/codegen_zipexampleinstall: - $(MAKE) -C src/codegen zipexampleinstall -src/codegen_zipdistinstall: - $(MAKE) -C src/codegen zipdistinstall -src/codegen_clean: - $(MAKE) -C src/codegen clean -src/codegen_distclean: - $(MAKE) -C src/codegen distclean -src/codegen_cleanall: - $(MAKE) -C src/codegen cleanall -src/codegen_info: - $(MAKE) -C src/codegen info -src/codegen_makefiles: - $(MAKE) -C src/codegen makefiles -src/codegen: - $(MAKE) -C src/codegen all -.PHONY: src/codegen_all src/codegen_debug src/codegen_smart src/codegen_release src/codegen_units src/codegen_examples src/codegen_shared src/codegen_install src/codegen_sourceinstall src/codegen_exampleinstall src/codegen_distinstall src/codegen_zipinstall src/codegen_zipsourceinstall src/codegen_zipexampleinstall src/codegen_zipdistinstall src/codegen_clean src/codegen_distclean src/codegen_cleanall src/codegen_info src/codegen_makefiles src/codegen -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: fpc_install $(addsuffix _install,$(TARGET_DIRS)) +units: +examples: +shared: sourceinstall: fpc_sourceinstall -exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS)) -distinstall: fpc_distinstall +exampleinstall: fpc_exampleinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall -zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) +zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif -distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean -clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean -cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall .NOTPARALLEL: -src/export_all: src/base_all src/dbase_all -src/export_debug: src/base_debug src/dbase_debug -src/export_smart: src/base_smart src/dbase_smart -src/export_release: src/base_release src/dbase_release -src/export_shared: src/base_shared src/dbase_shared -src/sdf_all: src/base_all -src/sdf_debug: src/base_debug -src/sdf_smart: src/base_smart -src/sdf_release: src/base_release -src/sdf_shared: src/base_shared -src/dbase_all: src/base_all -src/dbase_debug: src/base_debug -src/dbase_smart: src/base_smart -src/dbase_release: src/base_release -src/dbase_shared: src/base_shared -src/json_all: src/base_all -src/json_debug: src/base_debug -src/json_smart: src/base_smart -src/json_release: src/base_release -src/json_shared: src/base_shared +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/fcl-db/Makefile.fpc b/packages/fcl-db/Makefile.fpc index 976679b5ca..0db65b3a0f 100644 --- a/packages/fcl-db/Makefile.fpc +++ b/packages/fcl-db/Makefile.fpc @@ -1,31 +1,13 @@ # -# Makefile.fpc for TDataSet for FCL +# Makefile.fpc for running fpmake # [package] name=fcl-db version=2.7.1 -[target] -dirs=src/sdf src/memds src/sqldb src/base src/sql src/json -dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -dirs_haiku=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen -dirs_darwin=src/dbase src/sqlite src/export src/datadict src/codegen -dirs_iphonesim=src/dbase src/sqlite -dirs_solaris=src/dbase src/sqlite -dirs_netbsd=src/dbase src/sqlite src/paradox -dirs_openbsd=src/dbase src/sqlite src/paradox -dirs_win32=src/dbase src/paradox src/sqlite src/export src/datadict src/codegen -dirs_win64=src/dbase src/export src/datadict src/codegen -dirs_wince=src/dbase src/sqlite src/export src/datadict src/codegen - [require] -packages=fcl-base fcl-xml fcl-json - -[compiler] -options=-S2h +packages=rtl fpmkunit [install] fpcpackage=y @@ -33,34 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[rules] -distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean -clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean -cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) +[rules] .NOTPARALLEL: -src/export_all: src/base_all src/dbase_all -src/export_debug: src/base_debug src/dbase_debug -src/export_smart: src/base_smart src/dbase_smart -src/export_release: src/base_release src/dbase_release -src/export_shared: src/base_shared src/dbase_shared - -src/sdf_all: src/base_all -src/sdf_debug: src/base_debug -src/sdf_smart: src/base_smart -src/sdf_release: src/base_release -src/sdf_shared: src/base_shared - -src/dbase_all: src/base_all -src/dbase_debug: src/base_debug -src/dbase_smart: src/base_smart -src/dbase_release: src/base_release -src/dbase_shared: src/base_shared - -src/json_all: src/base_all -src/json_debug: src/base_debug -src/json_smart: src/base_smart -src/json_release: src/base_release -src/json_shared: src/base_shared +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/fcl-db/Makefile.fpc.fpcmake b/packages/fcl-db/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..976679b5ca --- /dev/null +++ b/packages/fcl-db/Makefile.fpc.fpcmake @@ -0,0 +1,66 @@ +# +# Makefile.fpc for TDataSet for FCL +# + +[package] +name=fcl-db +version=2.7.1 + +[target] +dirs=src/sdf src/memds src/sqldb src/base src/sql src/json +dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen +dirs_haiku=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen +dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen +dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen +dirs_darwin=src/dbase src/sqlite src/export src/datadict src/codegen +dirs_iphonesim=src/dbase src/sqlite +dirs_solaris=src/dbase src/sqlite +dirs_netbsd=src/dbase src/sqlite src/paradox +dirs_openbsd=src/dbase src/sqlite src/paradox +dirs_win32=src/dbase src/paradox src/sqlite src/export src/datadict src/codegen +dirs_win64=src/dbase src/export src/datadict src/codegen +dirs_wince=src/dbase src/sqlite src/export src/datadict src/codegen + +[require] +packages=fcl-base fcl-xml fcl-json + +[compiler] +options=-S2h + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean +clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean +cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall + +.NOTPARALLEL: + +src/export_all: src/base_all src/dbase_all +src/export_debug: src/base_debug src/dbase_debug +src/export_smart: src/base_smart src/dbase_smart +src/export_release: src/base_release src/dbase_release +src/export_shared: src/base_shared src/dbase_shared + +src/sdf_all: src/base_all +src/sdf_debug: src/base_debug +src/sdf_smart: src/base_smart +src/sdf_release: src/base_release +src/sdf_shared: src/base_shared + +src/dbase_all: src/base_all +src/dbase_debug: src/base_debug +src/dbase_smart: src/base_smart +src/dbase_release: src/base_release +src/dbase_shared: src/base_shared + +src/json_all: src/base_all +src/json_debug: src/base_debug +src/json_smart: src/base_smart +src/json_release: src/base_release +src/json_shared: src/base_shared + diff --git a/packages/fcl-stl/Makefile b/packages/fcl-stl/Makefile index 1f25052f9b..a0dbd884fa 100644 --- a/packages/fcl-stl/Makefile +++ b/packages/fcl-stl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=fcl-stl override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1446,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1474,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1702,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1718,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1857,93 +1687,10 @@ 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)) @@ -1967,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2228,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2285,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/fcl-stl/Makefile.fpc b/packages/fcl-stl/Makefile.fpc index d882f81929..f2ccba93de 100644 --- a/packages/fcl-stl/Makefile.fpc +++ b/packages/fcl-stl/Makefile.fpc @@ -1,13 +1,13 @@ # -# Makefile.fpc for Free Component Library +# Makefile.fpc for running fpmake # [package] name=fcl-stl version=2.7.1 -[target] -units=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap +[require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -15,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -options=-S2h -sourcedir=src +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/fcl-stl/Makefile.fpc.fpcmake b/packages/fcl-stl/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..d882f81929 --- /dev/null +++ b/packages/fcl-stl/Makefile.fpc.fpcmake @@ -0,0 +1,23 @@ +# +# Makefile.fpc for Free Component Library +# + +[package] +name=fcl-stl +version=2.7.1 + +[target] +units=garrayutils gdeque gmap gpriorityqueue gqueue gset gstack gutil gvector ghashset ghashmap + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +options=-S2h +sourcedir=src + +[rules] +.NOTPARALLEL: diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile index 0f97f3bd3a..76068bc6ca 100644 --- a/packages/fcl-xml/Makefile +++ b/packages/fcl-xml/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,763 +294,15 @@ endif endif override PACKAGE_NAME=fcl-xml override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv_windows -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv_windows -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel xmliconv -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=sax xpath htmlwriter xmlconf +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_OPTIONS+=-S2h -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1247,37 +499,6 @@ 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 @@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1694,15 +896,13 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1710,7 +910,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1718,7 +917,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1726,7 +924,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1734,8 +931,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1743,8 +938,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1752,8 +945,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1761,7 +952,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1769,7 +959,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1777,7 +966,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1785,7 +973,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1793,7 +980,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1801,7 +987,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1809,8 +994,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1818,7 +1001,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1826,7 +1008,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1834,7 +1015,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1842,7 +1022,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1850,7 +1029,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1858,7 +1036,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1866,7 +1043,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1874,8 +1050,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1883,8 +1057,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1892,8 +1064,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1901,7 +1071,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1909,7 +1078,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1917,7 +1085,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1925,7 +1092,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1933,7 +1099,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1941,7 +1106,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1949,8 +1113,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1958,7 +1120,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1966,7 +1127,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1974,7 +1134,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1982,8 +1141,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1991,7 +1148,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1999,7 +1155,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -2007,7 +1162,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2015,8 +1169,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2024,7 +1176,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2032,7 +1183,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2040,7 +1190,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2048,8 +1197,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2057,8 +1204,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2066,7 +1211,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2074,8 +1218,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2083,7 +1225,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2091,7 +1232,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2099,8 +1239,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2108,7 +1246,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2116,8 +1253,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2125,7 +1260,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2133,7 +1267,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2141,7 +1274,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2149,7 +1281,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2157,7 +1288,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2165,8 +1295,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2174,8 +1302,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2183,7 +1309,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2191,7 +1316,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2199,8 +1323,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2208,7 +1330,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2216,8 +1337,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 -REQUIRE_PACKAGES_ICONVENC=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2409,82 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif -ifdef REQUIRE_PACKAGES_ICONVENC -PACKAGEDIR_ICONVENC:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_ICONVENC),) -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX)),) -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(TARGETSUFFIX) -else -UNITDIR_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_ICONVENC=$(PACKAGEDIR_ICONVENC) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_ICONVENC)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_ICONVENC) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_ICONVENC)/$(FPCMADE) -endif -else -PACKAGEDIR_ICONVENC= -UNITDIR_ICONVENC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /iconvenc/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_ICONVENC),) -UNITDIR_ICONVENC:=$(firstword $(UNITDIR_ICONVENC)) -else -UNITDIR_ICONVENC= -endif -endif -ifdef UNITDIR_ICONVENC -override COMPILER_UNITDIR+=$(UNITDIR_ICONVENC) -endif -ifdef UNITDIR_FPMAKE_ICONVENC -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_ICONVENC) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2501,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2606,12 +1653,6 @@ 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 @@ -2646,93 +1687,10 @@ 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)) @@ -2756,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -3017,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -3074,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/fcl-xml/Makefile.fpc b/packages/fcl-xml/Makefile.fpc index c90f83661c..f4ad0e2d8f 100644 --- a/packages/fcl-xml/Makefile.fpc +++ b/packages/fcl-xml/Makefile.fpc @@ -1,33 +1,13 @@ # -# Makefile.fpc for XML for FCL +# Makefile.fpc for running fpmake # [package] name=fcl-xml version=2.7.1 -[target] -units=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel -units_linux=xmliconv -units_freebsd=xmliconv -units_darwin=xmliconv -units_iphonesim=xmliconv -units_win64=xmliconv_windows -units_win32=xmliconv_windows -rsts=sax xpath htmlwriter xmlconf - [require] -packages=fcl-base -packages_beos=iconvenc -packages_haiku=iconvenc -packages_linux=iconvenc -packages_darwin=iconvenc -packages_iphonesim=iconvenc -packages_freebsd=iconvenc - -[compiler] -options=-S2h -sourcedir=src +packages=rtl fpmkunit [install] fpcpackage=y @@ -35,5 +15,62 @@ fpcpackage=y [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/fcl-xml/Makefile.fpc.fpcmake b/packages/fcl-xml/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..c90f83661c --- /dev/null +++ b/packages/fcl-xml/Makefile.fpc.fpcmake @@ -0,0 +1,39 @@ +# +# Makefile.fpc for XML for FCL +# + +[package] +name=fcl-xml +version=2.7.1 + +[target] +units=htmldefs sax xmlutils dom sax_html dom_html xmlcfg xmlread xmlstreaming xmlwrite xhtml htmwrite xpath htmlelements htmlwriter xmlconf sax_xml dtdmodel +units_linux=xmliconv +units_freebsd=xmliconv +units_darwin=xmliconv +units_iphonesim=xmliconv +units_win64=xmliconv_windows +units_win32=xmliconv_windows +rsts=sax xpath htmlwriter xmlconf + +[require] +packages=fcl-base +packages_beos=iconvenc +packages_haiku=iconvenc +packages_linux=iconvenc +packages_darwin=iconvenc +packages_iphonesim=iconvenc +packages_freebsd=iconvenc + +[compiler] +options=-S2h +sourcedir=src + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: diff --git a/packages/fftw/Makefile b/packages/fftw/Makefile index 64997a36fc..0a018c170e 100644 --- a/packages/fftw/Makefile +++ b/packages/fftw/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,576 +294,15 @@ endif endif override PACKAGE_NAME=fftw override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=fftw_s +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fftw_s -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=fftw_s +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1448,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1476,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1704,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1720,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1859,93 +1687,10 @@ 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)) @@ -1969,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2230,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2287,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/fftw/Makefile.fpc b/packages/fftw/Makefile.fpc index e9d28d6a3d..35c2d69671 100644 --- a/packages/fftw/Makefile.fpc +++ b/packages/fftw/Makefile.fpc @@ -1,19 +1,13 @@ # -# Makefile.fpc for Forms Bindings +# Makefile.fpc for running fpmake # [package] name=fftw version=2.7.1 -[target] -units=fftw_s -programs= -exampledirs= - [require] -packages= -libc= +packages=rtl fpmkunit [install] fpcpackage=y @@ -21,12 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests - -[shared] -build=n +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/fftw/Makefile.fpc.fpcmake b/packages/fftw/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..e9d28d6a3d --- /dev/null +++ b/packages/fftw/Makefile.fpc.fpcmake @@ -0,0 +1,32 @@ +# +# Makefile.fpc for Forms Bindings +# + +[package] +name=fftw +version=2.7.1 + +[target] +units=fftw_s +programs= +exampledirs= + +[require] +packages= +libc= + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[shared] +build=n + +[rules] +.NOTPARALLEL: diff --git a/packages/fuse/Makefile b/packages/fuse/Makefile index 89fb67bbb7..4a19f5a1bf 100644 --- a/packages/fuse/Makefile +++ b/packages/fuse/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -153,12 +153,6 @@ ifdef OS_TARGET_DEFAULT OS_TARGET=$(OS_TARGET_DEFAULT) endif endif -ifneq ($(words $(FPC_COMPILERINFO)),5) -FPC_COMPILERINFO+=$(shell $(FPC) -iSP) -FPC_COMPILERINFO+=$(shell $(FPC) -iTP) -FPC_COMPILERINFO+=$(shell $(FPC) -iSO) -FPC_COMPILERINFO+=$(shell $(FPC) -iTO) -endif ifndef CPU_SOURCE CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO)) endif @@ -184,11 +178,21 @@ else ARCH=$(CPU_TARGET) endif endif +ifeq ($(FULL_TARGET),arm-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) else +ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),) +TARGETSUFFIX=$(OS_TARGET) +else TARGETSUFFIX=$(FULL_TARGET) +endif SOURCESUFFIX=$(FULL_SOURCE) endif ifneq ($(FULL_TARGET),$(FULL_SOURCE)) @@ -290,574 +294,15 @@ endif endif override PACKAGE_NAME=fuse override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=fuse +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=fuse -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=fuse +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1068,7 +513,7 @@ SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rst -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) +EXEDBGEXT=.dbg ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -1190,6 +635,7 @@ BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn +EXEDBGEXT=.dSYM endif ifeq ($(OS_TARGET),gba) EXEEXT=.gba @@ -1209,161 +655,6 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif -else -ifeq ($(OS_TARGET),go32v1) -PPUEXT=.pp1 -OEXT=.o1 -ASMEXT=.s1 -SMARTEXT=.sl1 -STATICLIBEXT=.a1 -SHAREDLIBEXT=.so1 -STATICLIBPREFIX= -SHORTSUFFIX=v1 -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),go32v2) -STATICLIBPREFIX= -SHORTSUFFIX=dos -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),watcom) -STATICLIBPREFIX= -SHORTSUFFIX=wat -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),linux) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -ifeq ($(OS_TARGET),freebsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=fbs -endif -ifeq ($(OS_TARGET),netbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=nbs -endif -ifeq ($(OS_TARGET),openbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=obs -endif -ifeq ($(OS_TARGET),win32) -PPUEXT=.ppw -OEXT=.ow -ASMEXT=.sw -SMARTEXT=.slw -STATICLIBEXT=.aw -SHAREDLIBEXT=.dll -SHORTSUFFIX=w32 -endif -ifeq ($(OS_TARGET),os2) -BATCHEXT=.cmd -PPUEXT=.ppo -ASMEXT=.so2 -OEXT=.oo2 -AOUTEXT=.out -SMARTEXT=.sl2 -STATICLIBPREFIX= -STATICLIBEXT=.ao2 -SHAREDLIBEXT=.dll -SHORTSUFFIX=os2 -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),amiga) -EXEEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.library -SHORTSUFFIX=amg -endif -ifeq ($(OS_TARGET),atari) -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT=.ttp -SHORTSUFFIX=ata -endif -ifeq ($(OS_TARGET),beos) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=be -endif -ifeq ($(OS_TARGET),solaris) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=sun -endif -ifeq ($(OS_TARGET),qnx) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=qnx -endif -ifeq ($(OS_TARGET),netware) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nw -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),netwlibc) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nwl -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),macos) -BATCHEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -DEBUGSYMEXT=.xcoff -SHORTSUFFIX=mac -IMPORTLIBPREFIX=imp -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1553,15 +844,6 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc -ifneq ($(findstring 1.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),win32) -ifeq ($(CROSSBINDIR),) -ASNAME=asw -LDNAME=ldw -ARNAME=arw -endif -endif -endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -1605,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:=1 -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1633,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1861,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1872,6 +1539,7 @@ override FPCOPT+=-P$(ARCH) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) +override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -1881,6 +1549,11 @@ ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1972,7 +1645,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifneq ($(findstring $(OS_TARGET),linux solaris),) +ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2014,93 +1687,10 @@ 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)) @@ -2124,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2260,9 +1847,11 @@ fpc_zipdistinstall: .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) +override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) @@ -2279,6 +1868,9 @@ fpc_clean: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef CLEANEXEDBGFILES + -$(DELTREE) $(CLEANEXEDBGFILES) +endif ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) endif @@ -2380,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2437,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/fuse/Makefile.fpc b/packages/fuse/Makefile.fpc index 9c3f3d146b..dd1442e50b 100644 --- a/packages/fuse/Makefile.fpc +++ b/packages/fuse/Makefile.fpc @@ -1,25 +1,76 @@ # -# Makefile.fpc for FUSE bindings +# Makefile.fpc for running fpmake # [package] name=fuse version=2.7.1 -[target] -units=fuse - [require] +packages=rtl fpmkunit [install] fpcpackage=y -[compiler] -includedir=src -sourcedir=src - [default] fpcdir=../.. +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) + [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/fuse/Makefile.fpc.fpcmake b/packages/fuse/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..9c3f3d146b --- /dev/null +++ b/packages/fuse/Makefile.fpc.fpcmake @@ -0,0 +1,25 @@ +# +# Makefile.fpc for FUSE bindings +# + +[package] +name=fuse +version=2.7.1 + +[target] +units=fuse + +[require] + +[install] +fpcpackage=y + +[compiler] +includedir=src +sourcedir=src + +[default] +fpcdir=../.. + +[rules] +.NOTPARALLEL: diff --git a/packages/sdl/Makefile b/packages/sdl/Makefile index 0d0b842769..50391d2604 100644 --- a/packages/sdl/Makefile +++ b/packages/sdl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,574 +294,15 @@ endif endif override PACKAGE_NAME=sdl override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger sdlutils -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1058,37 +499,6 @@ 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 @@ -1477,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1505,321 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl pthreads x11 +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 -REQUIRE_PACKAGES_PTHREADS=1 -REQUIRE_PACKAGES_X11=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1859,80 +1376,156 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) 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)/units/$(TARGETSUFFIX)),) -UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(TARGETSUFFIX) +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) else -UNITDIR_PTHREADS=$(PACKAGEDIR_PTHREADS) +UNITDIR_HASH=$(PACKAGEDIR_HASH) endif -ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS)/units/$(SOURCESUFFIX) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) else -ifneq ($(wildcard $(PACKAGEDIR_PTHREADS)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS)/units_bs/$(SOURCESUFFIX) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) else -UNITDIR_FPMAKE_PTHREADS=$(PACKAGEDIR_PTHREADS) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) endif endif ifdef CHECKDEPEND -$(PACKAGEDIR_PTHREADS)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_PTHREADS) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_PTHREADS)/$(FPCMADE) +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(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)) +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) else -UNITDIR_PTHREADS= +UNITDIR_HASH= endif endif -ifdef UNITDIR_PTHREADS -override COMPILER_UNITDIR+=$(UNITDIR_PTHREADS) +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) endif -ifdef UNITDIR_FPMAKE_PTHREADS -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PTHREADS) +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) endif endif -ifdef REQUIRE_PACKAGES_X11 -PACKAGEDIR_X11:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /x11/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_X11),) -ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(TARGETSUFFIX)),) -UNITDIR_X11=$(PACKAGEDIR_X11)/units/$(TARGETSUFFIX) +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) else -UNITDIR_X11=$(PACKAGEDIR_X11) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) endif -ifneq ($(wildcard $(PACKAGEDIR_X11)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units/$(SOURCESUFFIX) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) else -ifneq ($(wildcard $(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11)/units_bs/$(SOURCESUFFIX) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) else -UNITDIR_FPMAKE_X11=$(PACKAGEDIR_X11) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) endif endif ifdef CHECKDEPEND -$(PACKAGEDIR_X11)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE) +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) endif else -PACKAGEDIR_X11= -UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_X11),) -UNITDIR_X11:=$(firstword $(UNITDIR_X11)) +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) else -UNITDIR_X11= +UNITDIR_PASZLIB= endif endif -ifdef UNITDIR_X11 -override COMPILER_UNITDIR+=$(UNITDIR_X11) +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) endif -ifdef UNITDIR_FPMAKE_X11 -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_X11) +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif ifndef NOCPUDEF @@ -1951,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2056,12 +1653,6 @@ 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 @@ -2096,93 +1687,10 @@ 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)) @@ -2206,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2467,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2524,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/sdl/Makefile.fpc b/packages/sdl/Makefile.fpc index ae4605b278..dc034a181e 100644 --- a/packages/sdl/Makefile.fpc +++ b/packages/sdl/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for SDL bindings +# Makefile.fpc for running fpmake # [package] @@ -7,18 +7,7 @@ name=sdl version=2.7.1 [require] -libc=y -packages=pthreads x11 - -[target] -units=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger -units_i386_linux=sdlutils -units_powerpc_linux=sdlutils -units_i386_freebsd=sdlutils -units_win32=sdlutils -units_powerpc_darwin=sdlutils -units_i386_darwin=sdlutils -units_i386_iphonesim=sdlutils +packages=rtl fpmkunit [install] fpcpackage=y @@ -26,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/sdl/Makefile.fpc.fpcmake b/packages/sdl/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..ae4605b278 --- /dev/null +++ b/packages/sdl/Makefile.fpc.fpcmake @@ -0,0 +1,34 @@ +# +# Makefile.fpc for SDL bindings +# + +[package] +name=sdl +version=2.7.1 + +[require] +libc=y +packages=pthreads x11 + +[target] +units=sdl sdl_image sdl_mixer sdl_mixer_nosmpeg sdl_ttf sdl_gfx sdl_net smpeg logger +units_i386_linux=sdlutils +units_powerpc_linux=sdlutils +units_i386_freebsd=sdlutils +units_win32=sdlutils +units_powerpc_darwin=sdlutils +units_i386_darwin=sdlutils +units_i386_iphonesim=sdlutils + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[rules] +.NOTPARALLEL: diff --git a/packages/sndfile/Makefile b/packages/sndfile/Makefile index 9cf95fa41a..e9e4bc4c3b 100644 --- a/packages/sndfile/Makefile +++ b/packages/sndfile/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/08/03] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -153,12 +153,6 @@ ifdef OS_TARGET_DEFAULT OS_TARGET=$(OS_TARGET_DEFAULT) endif endif -ifneq ($(words $(FPC_COMPILERINFO)),5) -FPC_COMPILERINFO+=$(shell $(FPC) -iSP) -FPC_COMPILERINFO+=$(shell $(FPC) -iTP) -FPC_COMPILERINFO+=$(shell $(FPC) -iSO) -FPC_COMPILERINFO+=$(shell $(FPC) -iTO) -endif ifndef CPU_SOURCE CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO)) endif @@ -184,11 +178,21 @@ else ARCH=$(CPU_TARGET) endif endif +ifeq ($(FULL_TARGET),arm-embedded) +ifeq ($(SUBARCH),) +$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined) +endif +override FPCOPT+=-Cp$(SUBARCH) +endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) TARGETSUFFIX=$(OS_TARGET) SOURCESUFFIX=$(OS_SOURCE) else +ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),) +TARGETSUFFIX=$(OS_TARGET) +else TARGETSUFFIX=$(FULL_TARGET) +endif SOURCESUFFIX=$(FULL_SOURCE) endif ifneq ($(FULL_TARGET),$(FULL_SOURCE)) @@ -290,952 +294,15 @@ endif endif override PACKAGE_NAME=sndfile override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=sndfile +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=sndfile -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_RSTS+=sfplay -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=sfplay -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLES+=sfplay +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -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-haiku) -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),i386-nativent) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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 -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1432,37 +499,6 @@ 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 @@ -1477,7 +513,7 @@ SHAREDLIBPREFIX=libfp STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rst -ifeq ($(findstring 1.0.,$(FPC_VERSION)),) +EXEDBGEXT=.dbg ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -1599,6 +635,7 @@ BATCHEXT=.sh EXEEXT= HASSHAREDLIB=1 SHORTSUFFIX=dwn +EXEDBGEXT=.dSYM endif ifeq ($(OS_TARGET),gba) EXEEXT=.gba @@ -1618,161 +655,6 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif -else -ifeq ($(OS_TARGET),go32v1) -PPUEXT=.pp1 -OEXT=.o1 -ASMEXT=.s1 -SMARTEXT=.sl1 -STATICLIBEXT=.a1 -SHAREDLIBEXT=.so1 -STATICLIBPREFIX= -SHORTSUFFIX=v1 -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),go32v2) -STATICLIBPREFIX= -SHORTSUFFIX=dos -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),watcom) -STATICLIBPREFIX= -SHORTSUFFIX=wat -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),linux) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=lnx -endif -ifeq ($(OS_TARGET),freebsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=fbs -endif -ifeq ($(OS_TARGET),netbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=nbs -endif -ifeq ($(OS_TARGET),openbsd) -BATCHEXT=.sh -EXEEXT= -HASSHAREDLIB=1 -SHORTSUFFIX=obs -endif -ifeq ($(OS_TARGET),win32) -PPUEXT=.ppw -OEXT=.ow -ASMEXT=.sw -SMARTEXT=.slw -STATICLIBEXT=.aw -SHAREDLIBEXT=.dll -SHORTSUFFIX=w32 -endif -ifeq ($(OS_TARGET),os2) -BATCHEXT=.cmd -PPUEXT=.ppo -ASMEXT=.so2 -OEXT=.oo2 -AOUTEXT=.out -SMARTEXT=.sl2 -STATICLIBPREFIX= -STATICLIBEXT=.ao2 -SHAREDLIBEXT=.dll -SHORTSUFFIX=os2 -ECHO=echo -IMPORTLIBPREFIX= -endif -ifeq ($(OS_TARGET),amiga) -EXEEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.library -SHORTSUFFIX=amg -endif -ifeq ($(OS_TARGET),atari) -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT=.ttp -SHORTSUFFIX=ata -endif -ifeq ($(OS_TARGET),beos) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=be -endif -ifeq ($(OS_TARGET),solaris) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=sun -endif -ifeq ($(OS_TARGET),qnx) -BATCHEXT=.sh -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -SHORTSUFFIX=qnx -endif -ifeq ($(OS_TARGET),netware) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nw -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),netwlibc) -STATICLIBPREFIX= -PPUEXT=.ppu -OEXT=.o -ASMEXT=.s -SMARTEXT=.sl -STATICLIBEXT=.a -SHAREDLIBEXT=.nlm -EXEEXT=.nlm -SHORTSUFFIX=nwl -IMPORTLIBPREFIX=imp -endif -ifeq ($(OS_TARGET),macos) -BATCHEXT= -PPUEXT=.ppu -ASMEXT=.s -OEXT=.o -SMARTEXT=.sl -STATICLIBEXT=.a -EXEEXT= -DEBUGSYMEXT=.xcoff -SHORTSUFFIX=mac -IMPORTLIBPREFIX=imp -endif -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1962,15 +844,6 @@ ASNAME=$(BINUTILSPREFIX)as LDNAME=$(BINUTILSPREFIX)ld ARNAME=$(BINUTILSPREFIX)ar RCNAME=$(BINUTILSPREFIX)rc -ifneq ($(findstring 1.0.,$(FPC_VERSION)),) -ifeq ($(OS_TARGET),win32) -ifeq ($(CROSSBINDIR),) -ASNAME=asw -LDNAME=ldw -ARNAME=arw -endif -endif -endif ifndef ASPROG ifdef CROSSBINDIR ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT) @@ -2014,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:=1 -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -2042,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2270,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2281,6 +1539,7 @@ override FPCOPT+=-P$(ARCH) endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) +override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -2290,6 +1549,11 @@ ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2381,7 +1645,7 @@ override FPCOPT+=-Aas endif endif ifeq ($(findstring 2.0.,$(FPC_VERSION)),) -ifneq ($(findstring $(OS_TARGET),linux solaris),) +ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris),) ifeq ($(CPU_TARGET),x86_64) override FPCOPT+=-Cg endif @@ -2389,12 +1653,6 @@ 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 @@ -2429,111 +1687,10 @@ 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_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.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)) @@ -2557,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2693,9 +1847,11 @@ fpc_zipdistinstall: .PHONY: fpc_clean fpc_cleanall fpc_distclean ifdef EXEFILES override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES)) +override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS)) @@ -2712,6 +1868,9 @@ fpc_clean: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef CLEANEXEDBGFILES + -$(DELTREE) $(CLEANEXEDBGFILES) +endif ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) endif @@ -2813,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2870,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: fpc_examples -shared: fpc_shared -install: fpc_install +units: +examples: +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/sndfile/Makefile.fpc b/packages/sndfile/Makefile.fpc index f63c1b4c7c..ea32dc437c 100644 --- a/packages/sndfile/Makefile.fpc +++ b/packages/sndfile/Makefile.fpc @@ -1,18 +1,13 @@ # -# Makefile.fpc for MySql bindings +# Makefile.fpc for running fpmake # [package] name=sndfile version=2.7.1 -[target] -units=sndfile -examples=sfplay -rsts=sfplay - [require] -libc=y +packages=rtl fpmkunit [install] fpcpackage=y @@ -20,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests examples +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/sndfile/Makefile.fpc.fpcmake b/packages/sndfile/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..f63c1b4c7c --- /dev/null +++ b/packages/sndfile/Makefile.fpc.fpcmake @@ -0,0 +1,28 @@ +# +# Makefile.fpc for MySql bindings +# + +[package] +name=sndfile +version=2.7.1 + +[target] +units=sndfile +examples=sfplay +rsts=sfplay + +[require] +libc=y + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests examples + +[rules] +.NOTPARALLEL: diff --git a/packages/sqlite/Makefile b/packages/sqlite/Makefile index 930e5c5f05..40dfe82b06 100644 --- a/packages/sqlite/Makefile +++ b/packages/sqlite/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,576 +294,15 @@ endif endif override PACKAGE_NAME=sqlite override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -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-haiku) -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),i386-nativent) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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 -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests examples -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1448,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1476,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1704,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1720,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1859,93 +1687,10 @@ 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)) @@ -1969,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2230,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2287,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/sqlite/Makefile.fpc b/packages/sqlite/Makefile.fpc index 3d7d58c86c..f606a5ff86 100644 --- a/packages/sqlite/Makefile.fpc +++ b/packages/sqlite/Makefile.fpc @@ -1,15 +1,13 @@ # -# Makefile.fpc for sqlite implementation +# Makefile.fpc for running fpmake # [package] name=sqlite version=2.7.1 -[target] -units=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db - [require] +packages=rtl fpmkunit [install] fpcpackage=y @@ -17,13 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests examples - -[shared] -build=n +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/sqlite/Makefile.fpc.fpcmake b/packages/sqlite/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..3d7d58c86c --- /dev/null +++ b/packages/sqlite/Makefile.fpc.fpcmake @@ -0,0 +1,29 @@ +# +# Makefile.fpc for sqlite implementation +# + +[package] +name=sqlite +version=2.7.1 + +[target] +units=sqlite sqlite3 sqlite3dyn sqlitedb sqlite3db + +[require] + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests examples + +[shared] +build=n + +[rules] +.NOTPARALLEL: + diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index 8cfc0dad57..ff9fcd8b0d 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,763 +294,15 @@ endif endif override PACKAGE_NAME=svgalib override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=svgalib vgamouse +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=svgalib vgamouse -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLEDIRS+=examples +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1247,37 +499,6 @@ 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 @@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1694,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1922,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1938,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2043,12 +1653,6 @@ 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 @@ -2083,113 +1687,10 @@ 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_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.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)) @@ -2213,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2474,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2531,262 +2028,59 @@ 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_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifdef TARGET_EXAMPLEDIRS_EXAMPLES -examples_all: - $(MAKE) -C examples all -examples_debug: - $(MAKE) -C examples debug -examples_smart: - $(MAKE) -C examples smart -examples_release: - $(MAKE) -C examples release -examples_units: - $(MAKE) -C examples units -examples_examples: - $(MAKE) -C examples examples -examples_shared: - $(MAKE) -C examples shared -examples_install: - $(MAKE) -C examples install -examples_sourceinstall: - $(MAKE) -C examples sourceinstall -examples_exampleinstall: - $(MAKE) -C examples exampleinstall -examples_distinstall: - $(MAKE) -C examples distinstall -examples_zipinstall: - $(MAKE) -C examples zipinstall -examples_zipsourceinstall: - $(MAKE) -C examples zipsourceinstall -examples_zipexampleinstall: - $(MAKE) -C examples zipexampleinstall -examples_zipdistinstall: - $(MAKE) -C examples zipdistinstall -examples_clean: - $(MAKE) -C examples clean -examples_distclean: - $(MAKE) -C examples distclean -examples_cleanall: - $(MAKE) -C examples cleanall -examples_info: - $(MAKE) -C examples info -examples_makefiles: - $(MAKE) -C examples makefiles +units: examples: - $(MAKE) -C examples all -.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples -endif -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: fpc_examples -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall -clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS)) -distclean: fpc_distclean -cleanall: fpc_cleanall +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/svgalib/Makefile.fpc b/packages/svgalib/Makefile.fpc index 479e74d2e9..a43c4bf1ad 100644 --- a/packages/svgalib/Makefile.fpc +++ b/packages/svgalib/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for SVGALib Bindings +# Makefile.fpc for running fpmake # [package] name=svgalib version=2.7.1 -[target] -units=svgalib vgamouse -exampledirs=examples - [require] -libc=y +packages=rtl fpmkunit [install] fpcpackage=y @@ -19,10 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src - +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/svgalib/Makefile.fpc.fpcmake b/packages/svgalib/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..479e74d2e9 --- /dev/null +++ b/packages/svgalib/Makefile.fpc.fpcmake @@ -0,0 +1,28 @@ +# +# Makefile.fpc for SVGALib Bindings +# + +[package] +name=svgalib +version=2.7.1 + +[target] +units=svgalib vgamouse +exampledirs=examples + +[require] +libc=y + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src + + +[rules] +.NOTPARALLEL: diff --git a/packages/symbolic/Makefile b/packages/symbolic/Makefile index 67552bdb24..9fa2be8620 100644 --- a/packages/symbolic/Makefile +++ b/packages/symbolic/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,577 +294,15 @@ endif endif override PACKAGE_NAME=symbolic override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=symbolic +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=symbolic -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=symbolic +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) 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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1061,37 +499,6 @@ 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 @@ -1480,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1508,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1736,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1752,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -1857,12 +1653,6 @@ 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 @@ -1897,93 +1687,10 @@ 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)) @@ -2007,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2268,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2325,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units +units: examples: -shared: fpc_shared -install: fpc_install +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/symbolic/Makefile.fpc b/packages/symbolic/Makefile.fpc index 317415bbe0..14487b574b 100644 --- a/packages/symbolic/Makefile.fpc +++ b/packages/symbolic/Makefile.fpc @@ -1,30 +1,76 @@ # -# Makefile.fpc for Free Pascal ImLib 1.x Packages +# Makefile.fpc for running fpmake # [package] name=symbolic version=2.7.1 -[target] -units=symbolic - [require] -libc=y - -[compiler] -includedir=src -sourcedir=src tests +packages=rtl fpmkunit [install] fpcpackage=y -fpcsubdir=packages [default] fpcdir=../.. -[shared] -build=n +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/symbolic/Makefile.fpc.fpcmake b/packages/symbolic/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..317415bbe0 --- /dev/null +++ b/packages/symbolic/Makefile.fpc.fpcmake @@ -0,0 +1,30 @@ +# +# Makefile.fpc for Free Pascal ImLib 1.x Packages +# + +[package] +name=symbolic +version=2.7.1 + +[target] +units=symbolic + +[require] +libc=y + +[compiler] +includedir=src +sourcedir=src tests + +[install] +fpcpackage=y +fpcsubdir=packages + +[default] +fpcdir=../.. + +[shared] +build=n + +[rules] +.NOTPARALLEL: diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index 1d5ccdc966..7e47a5c61a 100644 --- a/packages/syslog/Makefile +++ b/packages/syslog/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,763 +294,15 @@ endif endif override PACKAGE_NAME=syslog override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=systemlog +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=systemlog -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLEDIRS+=examples -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLEDIRS+=examples +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1247,37 +499,6 @@ 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 @@ -1666,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1694,195 +896,447 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_FPMKUNIT=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -1922,6 +1376,158 @@ ifdef UNITDIR_FPMAKE_RTL override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_RTL) endif endif +ifdef REQUIRE_PACKAGES_HASH +PACKAGEDIR_HASH:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /hash/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_HASH),) +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX)),) +UNITDIR_HASH=$(PACKAGEDIR_HASH)/units/$(TARGETSUFFIX) +else +UNITDIR_HASH=$(PACKAGEDIR_HASH) +endif +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_HASH=$(PACKAGEDIR_HASH) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_HASH)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_HASH) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_HASH)/$(FPCMADE) +endif +else +PACKAGEDIR_HASH= +UNITDIR_HASH:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /hash/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_HASH),) +UNITDIR_HASH:=$(firstword $(UNITDIR_HASH)) +else +UNITDIR_HASH= +endif +endif +ifdef UNITDIR_HASH +override COMPILER_UNITDIR+=$(UNITDIR_HASH) +endif +ifdef UNITDIR_FPMAKE_HASH +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_HASH) +endif +endif +ifdef REQUIRE_PACKAGES_PASZLIB +PACKAGEDIR_PASZLIB:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_PASZLIB),) +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX)),) +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(TARGETSUFFIX) +else +UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_PASZLIB=$(PACKAGEDIR_PASZLIB) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_PASZLIB)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE) +endif +else +PACKAGEDIR_PASZLIB= +UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_PASZLIB),) +UNITDIR_PASZLIB:=$(firstword $(UNITDIR_PASZLIB)) +else +UNITDIR_PASZLIB= +endif +endif +ifdef UNITDIR_PASZLIB +override COMPILER_UNITDIR+=$(UNITDIR_PASZLIB) +endif +ifdef UNITDIR_FPMAKE_PASZLIB +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_PASZLIB) +endif +endif +ifdef REQUIRE_PACKAGES_FCL-PROCESS +PACKAGEDIR_FCL-PROCESS:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FCL-PROCESS),) +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX)),) +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(TARGETSUFFIX) +else +UNITDIR_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FCL-PROCESS=$(PACKAGEDIR_FCL-PROCESS) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FCL-PROCESS) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-PROCESS)/$(FPCMADE) +endif +else +PACKAGEDIR_FCL-PROCESS= +UNITDIR_FCL-PROCESS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-process/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FCL-PROCESS),) +UNITDIR_FCL-PROCESS:=$(firstword $(UNITDIR_FCL-PROCESS)) +else +UNITDIR_FCL-PROCESS= +endif +endif +ifdef UNITDIR_FCL-PROCESS +override COMPILER_UNITDIR+=$(UNITDIR_FCL-PROCESS) +endif +ifdef UNITDIR_FPMAKE_FCL-PROCESS +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-PROCESS) +endif +endif +ifdef REQUIRE_PACKAGES_FPMKUNIT +PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))) +ifneq ($(PACKAGEDIR_FPMKUNIT),) +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX)),) +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(TARGETSUFFIX) +else +UNITDIR_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units/$(SOURCESUFFIX) +else +ifneq ($(wildcard $(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX)),) +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX) +else +UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT) +endif +endif +ifdef CHECKDEPEND +$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE): + $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) $(FPCMADE) +override ALLDEPENDENCIES+=$(PACKAGEDIR_FPMKUNIT)/$(FPCMADE) +endif +else +PACKAGEDIR_FPMKUNIT= +UNITDIR_FPMKUNIT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fpmkunit/Package.fpc,$(UNITSDIR))))) +ifneq ($(UNITDIR_FPMKUNIT),) +UNITDIR_FPMKUNIT:=$(firstword $(UNITDIR_FPMKUNIT)) +else +UNITDIR_FPMKUNIT= +endif +endif +ifdef UNITDIR_FPMKUNIT +override COMPILER_UNITDIR+=$(UNITDIR_FPMKUNIT) +endif +ifdef UNITDIR_FPMAKE_FPMKUNIT +override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) +endif +endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -1938,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2043,12 +1653,6 @@ 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 @@ -2083,113 +1687,10 @@ 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_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.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)) @@ -2213,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2474,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -2531,262 +2028,59 @@ 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_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-go32v2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-win32) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-os2) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-beos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-haiku) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-qnx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netware) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-emx) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-watcom) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-nativent) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-atari) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-palmos) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-wince) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-gba) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-nds) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),arm-symbian) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),avr-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -TARGET_EXAMPLEDIRS_EXAMPLES=1 -endif -ifdef TARGET_EXAMPLEDIRS_EXAMPLES -examples_all: - $(MAKE) -C examples all -examples_debug: - $(MAKE) -C examples debug -examples_smart: - $(MAKE) -C examples smart -examples_release: - $(MAKE) -C examples release -examples_units: - $(MAKE) -C examples units -examples_examples: - $(MAKE) -C examples examples -examples_shared: - $(MAKE) -C examples shared -examples_install: - $(MAKE) -C examples install -examples_sourceinstall: - $(MAKE) -C examples sourceinstall -examples_exampleinstall: - $(MAKE) -C examples exampleinstall -examples_distinstall: - $(MAKE) -C examples distinstall -examples_zipinstall: - $(MAKE) -C examples zipinstall -examples_zipsourceinstall: - $(MAKE) -C examples zipsourceinstall -examples_zipexampleinstall: - $(MAKE) -C examples zipexampleinstall -examples_zipdistinstall: - $(MAKE) -C examples zipdistinstall -examples_clean: - $(MAKE) -C examples clean -examples_distclean: - $(MAKE) -C examples distclean -examples_cleanall: - $(MAKE) -C examples cleanall -examples_info: - $(MAKE) -C examples info -examples_makefiles: - $(MAKE) -C examples makefiles +units: examples: - $(MAKE) -C examples all -.PHONY: examples_all examples_debug examples_smart examples_release examples_units examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples_makefiles examples -endif -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: fpc_examples -shared: fpc_shared -install: fpc_install +shared: sourceinstall: fpc_sourceinstall exampleinstall: fpc_exampleinstall -distinstall: fpc_distinstall zipinstall: fpc_zipinstall zipsourceinstall: fpc_zipsourceinstall zipexampleinstall: fpc_zipexampleinstall zipdistinstall: fpc_zipdistinstall -clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS)) -distclean: fpc_distclean -cleanall: fpc_cleanall +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/syslog/Makefile.fpc b/packages/syslog/Makefile.fpc index fbfa3695e6..c332a6b4ee 100644 --- a/packages/syslog/Makefile.fpc +++ b/packages/syslog/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for SysLog Units +# Makefile.fpc for running fpmake # [package] name=syslog version=2.7.1 -[target] -units=systemlog -exampledirs=examples - [require] -libc=y +packages=rtl fpmkunit [install] fpcpackage=y @@ -19,9 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/syslog/Makefile.fpc.fpcmake b/packages/syslog/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..fbfa3695e6 --- /dev/null +++ b/packages/syslog/Makefile.fpc.fpcmake @@ -0,0 +1,27 @@ +# +# Makefile.fpc for SysLog Units +# + +[package] +name=syslog +version=2.7.1 + +[target] +units=systemlog +exampledirs=examples + +[require] +libc=y + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src + +[rules] +.NOTPARALLEL: diff --git a/packages/tcl/Makefile b/packages/tcl/Makefile index f5f486029e..55c9bd66fc 100644 --- a/packages/tcl/Makefile +++ b/packages/tcl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/12/04] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/01/04] # default: all MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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 i386-nativent i386-iphonesim 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 powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux @@ -294,765 +294,15 @@ endif endif override PACKAGE_NAME=tcl override PACKAGE_VERSION=2.7.1 -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=tcl80 +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=tcl80 -endif -ifeq ($(FULL_TARGET),i386-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-win32) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-os2) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-beos) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-qnx) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-netware) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-emx) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-wince) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-wince) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-gba) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-nds) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_EXAMPLES+=tcl_demo -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_EXAMPLES+=tcl_demo +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) override INSTALL_FPCPACKAGE=y -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-haiku) -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),i386-nativent) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -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),powerpc-wii) -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-solaris) -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-darwin) -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),avr-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_INCLUDEDIR+=src -endif -ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-haiku) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-nativent) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),i386-iphonesim) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),m68k-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc-wii) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),sparc-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-solaris) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),x86_64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-nds) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),arm-symbian) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-darwin) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),powerpc64-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),avr-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-linux) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),armeb-embedded) -override COMPILER_SOURCEDIR+=src tests -endif -ifeq ($(FULL_TARGET),mipsel-linux) -override COMPILER_SOURCEDIR+=src tests -endif -override SHARED_BUILD=n -override SHARED_BUILD=n ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -1249,37 +499,6 @@ 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 @@ -1668,25 +887,6 @@ DATESTR:=$(shell $(DATE) +%Y%m%d) else DATESTR= endif -ifndef UPXPROG -ifeq ($(OS_TARGET),go32v2) -UPXPROG:=1 -endif -ifeq ($(OS_TARGET),win32) -UPXPROG:= -endif -ifdef UPXPROG -UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)))) -ifeq ($(UPXPROG),) -UPXPROG= -else -UPXPROG:=$(firstword $(UPXPROG)) -endif -else -UPXPROG= -endif -endif -export UPXPROG ZIPOPT=-9 ZIPEXT=.zip ifeq ($(USETAR),bz2) @@ -1696,14 +896,13 @@ else TAROPT=vz TAREXT=.tar.gz endif -override REQUIRE_PACKAGES=rtl fcl-base +override REQUIRE_PACKAGES=rtl fpmkunit ifeq ($(FULL_TARGET),i386-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-go32v2) REQUIRE_PACKAGES_RTL=1 @@ -1711,7 +910,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-win32) REQUIRE_PACKAGES_RTL=1 @@ -1719,7 +917,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-os2) REQUIRE_PACKAGES_RTL=1 @@ -1727,7 +924,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1735,7 +931,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 @@ -1743,7 +938,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-haiku) REQUIRE_PACKAGES_RTL=1 @@ -1751,7 +945,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1759,7 +952,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-solaris) REQUIRE_PACKAGES_RTL=1 @@ -1767,7 +959,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-qnx) REQUIRE_PACKAGES_RTL=1 @@ -1775,7 +966,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 @@ -1783,7 +973,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1791,7 +980,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wdosx) REQUIRE_PACKAGES_RTL=1 @@ -1799,7 +987,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1807,7 +994,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-emx) REQUIRE_PACKAGES_RTL=1 @@ -1815,7 +1001,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-watcom) REQUIRE_PACKAGES_RTL=1 @@ -1823,7 +1008,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 @@ -1831,7 +1015,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) REQUIRE_PACKAGES_RTL=1 @@ -1839,7 +1022,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1847,7 +1029,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-symbian) REQUIRE_PACKAGES_RTL=1 @@ -1855,7 +1036,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-nativent) REQUIRE_PACKAGES_RTL=1 @@ -1863,7 +1043,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-iphonesim) REQUIRE_PACKAGES_RTL=1 @@ -1871,7 +1050,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-linux) REQUIRE_PACKAGES_RTL=1 @@ -1879,7 +1057,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -1887,7 +1064,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1895,7 +1071,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1903,7 +1078,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-atari) REQUIRE_PACKAGES_RTL=1 @@ -1911,7 +1085,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-openbsd) REQUIRE_PACKAGES_RTL=1 @@ -1919,7 +1092,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-palmos) REQUIRE_PACKAGES_RTL=1 @@ -1927,7 +1099,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),m68k-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1935,7 +1106,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-linux) REQUIRE_PACKAGES_RTL=1 @@ -1943,7 +1113,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -1951,7 +1120,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-amiga) REQUIRE_PACKAGES_RTL=1 @@ -1959,7 +1127,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-macos) REQUIRE_PACKAGES_RTL=1 @@ -1967,7 +1134,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-darwin) REQUIRE_PACKAGES_RTL=1 @@ -1975,7 +1141,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-morphos) REQUIRE_PACKAGES_RTL=1 @@ -1983,7 +1148,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -1991,7 +1155,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc-wii) REQUIRE_PACKAGES_RTL=1 @@ -1999,7 +1162,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 @@ -2007,7 +1169,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-netbsd) REQUIRE_PACKAGES_RTL=1 @@ -2015,7 +1176,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2023,7 +1183,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),sparc-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2031,7 +1190,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2039,7 +1197,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 @@ -2047,7 +1204,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 @@ -2055,7 +1211,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2063,7 +1218,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 @@ -2071,7 +1225,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2079,7 +1232,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 @@ -2087,7 +1239,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 @@ -2095,7 +1246,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2103,7 +1253,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 @@ -2111,7 +1260,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 @@ -2119,7 +1267,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 @@ -2127,7 +1274,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2135,7 +1281,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 @@ -2143,7 +1288,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 @@ -2151,7 +1295,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 @@ -2159,7 +1302,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2167,7 +1309,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2175,7 +1316,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 @@ -2183,7 +1323,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 @@ -2191,7 +1330,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 @@ -2199,7 +1337,6 @@ REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_FPMKUNIT=1 -REQUIRE_PACKAGES_FCL-BASE=1 endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) @@ -2391,44 +1528,6 @@ ifdef UNITDIR_FPMAKE_FPMKUNIT override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FPMKUNIT) endif endif -ifdef REQUIRE_PACKAGES_FCL-BASE -PACKAGEDIR_FCL-BASE:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Makefile.fpc,$(PACKAGESDIR)))))) -ifneq ($(PACKAGEDIR_FCL-BASE),) -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX)),) -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(TARGETSUFFIX) -else -UNITDIR_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units/$(SOURCESUFFIX) -else -ifneq ($(wildcard $(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX)),) -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE)/units_bs/$(SOURCESUFFIX) -else -UNITDIR_FPMAKE_FCL-BASE=$(PACKAGEDIR_FCL-BASE) -endif -endif -ifdef CHECKDEPEND -$(PACKAGEDIR_FCL-BASE)/$(FPCMADE): - $(MAKE) -C $(PACKAGEDIR_FCL-BASE) $(FPCMADE) -override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL-BASE)/$(FPCMADE) -endif -else -PACKAGEDIR_FCL-BASE= -UNITDIR_FCL-BASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl-base/Package.fpc,$(UNITSDIR))))) -ifneq ($(UNITDIR_FCL-BASE),) -UNITDIR_FCL-BASE:=$(firstword $(UNITDIR_FCL-BASE)) -else -UNITDIR_FCL-BASE= -endif -endif -ifdef UNITDIR_FCL-BASE -override COMPILER_UNITDIR+=$(UNITDIR_FCL-BASE) -endif -ifdef UNITDIR_FPMAKE_FCL-BASE -override COMPILER_FPMAKE_UNITDIR+=$(UNITDIR_FPMAKE_FCL-BASE) -endif -endif ifndef NOCPUDEF override FPCOPTDEF=$(ARCH) endif @@ -2445,12 +1544,16 @@ endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-XP$(BINUTILSPREFIX) -override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) endif endif +ifndef CROSSCOMPILE +ifneq ($(BINUTILSPREFIX),) +override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) +endif +endif ifdef UNITDIR override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) endif @@ -2550,12 +1653,6 @@ 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 @@ -2590,113 +1687,10 @@ 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_examples -ifneq ($(TARGET_EXAMPLES),) -HASEXAMPLES=1 -override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES))) -override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES)) -override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) -override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES)) -override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES) -override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES) -ifeq ($(OS_TARGET),os2) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -ifeq ($(OS_TARGET),emx) -override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES)) -endif -endif -ifneq ($(TARGET_EXAMPLEDIRS),) -HASEXAMPLES=1 -endif -fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS)) -.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)) @@ -2720,9 +1714,6 @@ endif fpc_install: all $(INSTALLTARGET) ifdef INSTALLEXEFILES $(MKDIR) $(INSTALL_BINDIR) -ifdef UPXPROG - -$(UPXPROG) $(INSTALLEXEFILES) -endif $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR) endif ifdef INSTALL_CREATEPACKAGEFPC @@ -2981,7 +1972,6 @@ fpc_baseinfo: @$(ECHO) Date...... $(DATE) @$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) PPUMove... $(PPUMOVE) - @$(ECHO) Upx....... $(UPXPROG) @$(ECHO) Zip....... $(ZIPPROG) @$(ECHO) @$(ECHO) == Object info == @@ -3038,28 +2028,59 @@ 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 -all: fpc_all -debug: fpc_debug -smart: fpc_smart -release: fpc_release -units: fpc_units -examples: fpc_examples -shared: fpc_shared -install: fpc_install +units: +examples: +shared: 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 +cleanall: info: fpc_info makefiles: fpc_makefiles -.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles +.PHONY: units examples shared sourceinstall exampleinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info makefiles ifneq ($(wildcard fpcmake.loc),) include fpcmake.loc endif .NOTPARALLEL: +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif diff --git a/packages/tcl/Makefile.fpc b/packages/tcl/Makefile.fpc index 26f1e6eab5..4694917620 100644 --- a/packages/tcl/Makefile.fpc +++ b/packages/tcl/Makefile.fpc @@ -1,17 +1,13 @@ # -# Makefile.fpc for Tcl/Tk bindings +# Makefile.fpc for running fpmake # + [package] name=tcl version=2.7.1 -[target] -units=tcl80 -examples=tcl_demo - [require] -libc=y -packages=fcl-base +packages=rtl fpmkunit [install] fpcpackage=y @@ -19,12 +15,62 @@ fpcpackage=y [default] fpcdir=../.. -[compiler] -includedir=src -sourcedir=src tests - -[shared] -build=n +[prerules] +FPMAKE_BIN_CLEAN=$(wildcard .$(PATHSEP)fpmake$(SRCEXEEXT)) +ifdef OS_TARGET +FPC_TARGETOPT+=--os=$(OS_TARGET) +endif +ifdef CPU_TARGET +FPC_TARGETOPT+=--cpu=$(CPU_TARGET) +endif +LOCALFPMAKE=.$(PATHSEP)fpmake$(SRCEXEEXT) [rules] .NOTPARALLEL: + +fpmake: fpmake.pp + $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR)) $(FPCMAKEOPT) +all: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu +smart: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -XX -o -CX +release: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dRELEASE +debug: fpmake + $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -bu -o -dDEBUG +# If no fpmake exists and (dist)clean is called, do not try to build fpmake, it will +# most often fail because the dependencies are cleared. +# In case of a clean, simply do nothing +ifeq ($(FPMAKE_BIN_CLEAN),) +clean: +else +clean: + $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif +# In case of a distclean, perform an 'old'-style distclean. This to avoid problems +# when the package is compiled using fpcmake prior to running this clean using fpmake +ifeq ($(FPMAKE_BIN_CLEAN),) +distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_cleanall +else +distclean: +ifdef inUnix + { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; } +else + $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) +endif + -$(DEL) $(LOCALFPMAKE) +endif +install: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) +endif +# distinstall also installs the example-sources +distinstall: fpmake +ifdef UNIXHier + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR) -ie +else + $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR) -ie +endif + diff --git a/packages/tcl/Makefile.fpc.fpcmake b/packages/tcl/Makefile.fpc.fpcmake new file mode 100644 index 0000000000..26f1e6eab5 --- /dev/null +++ b/packages/tcl/Makefile.fpc.fpcmake @@ -0,0 +1,30 @@ +# +# Makefile.fpc for Tcl/Tk bindings +# +[package] +name=tcl +version=2.7.1 + +[target] +units=tcl80 +examples=tcl_demo + +[require] +libc=y +packages=fcl-base + +[install] +fpcpackage=y + +[default] +fpcdir=../.. + +[compiler] +includedir=src +sourcedir=src tests + +[shared] +build=n + +[rules] +.NOTPARALLEL: