* fpmake support

git-svn-id: trunk@9899 -

.gitattributes

@@ -3810,43 +3810,121 @@ packages/fcl-async/src/libasynch.inc svneol=native#text/plain
 packages/fcl-async/src/unix/libasync.pp svneol=native#text/plain
 packages/fcl-base/Makefile svneol=native#text/plain
 packages/fcl-base/Makefile.fpc svneol=native#text/plain
+packages/fcl-base/examples/Makefile svneol=native#text/plain
+packages/fcl-base/examples/Makefile.fpc svneol=native#text/plain
+packages/fcl-base/examples/README -text
+packages/fcl-base/examples/asiotest.pp svneol=native#text/plain
+packages/fcl-base/examples/b64.pp svneol=native#text/plain
+packages/fcl-base/examples/b64dec.pp svneol=native#text/plain
+packages/fcl-base/examples/b64enc.pp svneol=native#text/plain
+packages/fcl-base/examples/b64test.pp svneol=native#text/plain
+packages/fcl-base/examples/b64test2.pp svneol=native#text/plain
+packages/fcl-base/examples/base64decodingtestcase.pas svneol=native#text/plain
+packages/fcl-base/examples/cachetest.pp svneol=native#text/plain
+packages/fcl-base/examples/cfgtest.pp svneol=native#text/plain
+packages/fcl-base/examples/daemon.pp svneol=native#text/plain
+packages/fcl-base/examples/daemon.txt svneol=native#text/plain
+packages/fcl-base/examples/dbugsrv.pp svneol=native#text/plain
+packages/fcl-base/examples/debugtest.pp svneol=native#text/plain
+packages/fcl-base/examples/doecho.pp svneol=native#text/plain
+packages/fcl-base/examples/dparser.pp svneol=native#text/plain
+packages/fcl-base/examples/dsockcli.pp svneol=native#text/plain
+packages/fcl-base/examples/dsocksvr.pp svneol=native#text/plain
+packages/fcl-base/examples/fpdoc.dtd -text
+packages/fcl-base/examples/fstream.pp svneol=native#text/plain
+packages/fcl-base/examples/htdump.pp svneol=native#text/plain
+packages/fcl-base/examples/intl/Makefile svneol=native#text/plain
+packages/fcl-base/examples/intl/README svneol=native#text/plain
+packages/fcl-base/examples/intl/restest.de.mo -text
+packages/fcl-base/examples/intl/restest.de.po svneol=native#text/plain
+packages/fcl-base/examples/intl/restest.fr.mo -text
+packages/fcl-base/examples/intl/restest.fr.po svneol=native#text/plain
+packages/fcl-base/examples/intl/restest.nl.mo -text
+packages/fcl-base/examples/intl/restest.nl.po svneol=native#text/plain
+packages/fcl-base/examples/intl/restest.pb.mo -text
+packages/fcl-base/examples/intl/restest.pb.po svneol=native#text/plain
+packages/fcl-base/examples/intl/restest.ru.mo -text
+packages/fcl-base/examples/intl/restest.ru.po svneol=native#text/plain
+packages/fcl-base/examples/intl/resttest.po svneol=native#text/plain
+packages/fcl-base/examples/ipcclient.pp svneol=native#text/plain
+packages/fcl-base/examples/ipcserver.pp svneol=native#text/plain
+packages/fcl-base/examples/isockcli.pp svneol=native#text/plain
+packages/fcl-base/examples/isocksvr.pp svneol=native#text/plain
+packages/fcl-base/examples/istream.pp svneol=native#text/plain
+packages/fcl-base/examples/kword.xml -text
+packages/fcl-base/examples/list.pp svneol=native#text/plain
+packages/fcl-base/examples/mstream.pp svneol=native#text/plain
+packages/fcl-base/examples/overview.rtf -text svneol=unset#unset
+packages/fcl-base/examples/parser.dat -text
+packages/fcl-base/examples/poolmm1.pp svneol=native#text/plain
+packages/fcl-base/examples/poolmm2.pp svneol=native#text/plain
+packages/fcl-base/examples/restest.pp svneol=native#text/plain
+packages/fcl-base/examples/showver.pp svneol=native#text/plain
+packages/fcl-base/examples/showver.rc -text
+packages/fcl-base/examples/showver.res -text
+packages/fcl-base/examples/simple.xml -text
+packages/fcl-base/examples/sockcli.pp svneol=native#text/plain
+packages/fcl-base/examples/socksvr.pp svneol=native#text/plain
+packages/fcl-base/examples/sstream.pp svneol=native#text/plain
+packages/fcl-base/examples/stringl.pp svneol=native#text/plain
+packages/fcl-base/examples/tarmakercons.pas svneol=native#text/plain
+packages/fcl-base/examples/tarmakerconsgzip.pas svneol=native#text/plain
+packages/fcl-base/examples/testapp.pp svneol=native#text/plain
+packages/fcl-base/examples/testbf.pp svneol=native#text/plain
+packages/fcl-base/examples/testbs.pp svneol=native#text/plain
+packages/fcl-base/examples/testcgi.html -text
+packages/fcl-base/examples/testcgi.pp svneol=native#text/plain
+packages/fcl-base/examples/testcont.pp svneol=native#text/plain
+packages/fcl-base/examples/testez.pp svneol=native#text/plain
+packages/fcl-base/examples/testhres.pp svneol=native#text/plain
+packages/fcl-base/examples/testnres.pp svneol=native#text/plain
+packages/fcl-base/examples/testol.pp svneol=native#text/plain
+packages/fcl-base/examples/testproc.pp svneol=native#text/plain
+packages/fcl-base/examples/testreg.pp svneol=native#text/plain
+packages/fcl-base/examples/testrhre.pp svneol=native#text/plain
+packages/fcl-base/examples/testrnre.pp svneol=native#text/plain
+packages/fcl-base/examples/testrsre.pp svneol=native#text/plain
+packages/fcl-base/examples/testrtf.pp svneol=native#text/plain
+packages/fcl-base/examples/testser.pp svneol=native#text/plain
+packages/fcl-base/examples/testsres.pp svneol=native#text/plain
+packages/fcl-base/examples/testtimer.pp svneol=native#text/plain
+packages/fcl-base/examples/testunzip.pp svneol=native#text/plain
+packages/fcl-base/examples/testur.pp svneol=native#text/plain
+packages/fcl-base/examples/testweb.pp svneol=native#text/plain
+packages/fcl-base/examples/testz.pp svneol=native#text/plain
+packages/fcl-base/examples/testz2.pp svneol=native#text/plain
+packages/fcl-base/examples/testzip.pp svneol=native#text/plain
+packages/fcl-base/examples/threads.pp svneol=native#text/plain
+packages/fcl-base/examples/tidea.pp svneol=native#text/plain
+packages/fcl-base/examples/tstelcmd.pp svneol=native#text/plain
+packages/fcl-base/examples/tstelgtk.pp svneol=native#text/plain
+packages/fcl-base/examples/txmlreg.pp svneol=native#text/plain
+packages/fcl-base/examples/xmldump.pp svneol=native#text/plain
+packages/fcl-base/fpmake.pp svneol=native#text/plain
 packages/fcl-base/src/amiga/eventlog.inc svneol=native#text/plain
+packages/fcl-base/src/avl_tree.pp svneol=native#text/plain
+packages/fcl-base/src/base64.pp svneol=native#text/plain
 packages/fcl-base/src/beos/eventlog.inc svneol=native#text/plain
-packages/fcl-base/src/fpmake.inc svneol=native#text/plain
-packages/fcl-base/src/fpmake.pp svneol=native#text/plain
+packages/fcl-base/src/blowfish.pp svneol=native#text/plain
+packages/fcl-base/src/bufstream.pp svneol=native#text/plain
+packages/fcl-base/src/cachecls.pp svneol=native#text/plain
+packages/fcl-base/src/cgiapp.pp svneol=native#text/plain
+packages/fcl-base/src/contnrs.pp svneol=native#text/plain
+packages/fcl-base/src/custapp.pp svneol=native#text/plain
+packages/fcl-base/src/daemonapp.pp svneol=native#text/plain
+packages/fcl-base/src/eventlog.pp svneol=native#text/plain
+packages/fcl-base/src/ezcgi.pp svneol=native#text/plain
+packages/fcl-base/src/felog.inc svneol=native#text/plain
+packages/fcl-base/src/fptimer.pp svneol=native#text/plain
+packages/fcl-base/src/gettext.pp svneol=native#text/plain
 packages/fcl-base/src/go32v2/custapp.inc svneol=native#text/plain
 packages/fcl-base/src/go32v2/eventlog.inc svneol=native#text/plain
-packages/fcl-base/src/inc/avl_tree.pp svneol=native#text/plain
-packages/fcl-base/src/inc/base64.pp svneol=native#text/plain
-packages/fcl-base/src/inc/blowfish.pp svneol=native#text/plain
-packages/fcl-base/src/inc/bufstream.pp svneol=native#text/plain
-packages/fcl-base/src/inc/cachecls.pp svneol=native#text/plain
-packages/fcl-base/src/inc/cgiapp.pp svneol=native#text/plain
-packages/fcl-base/src/inc/contnrs.pp svneol=native#text/plain
-packages/fcl-base/src/inc/custapp.pp svneol=native#text/plain
-packages/fcl-base/src/inc/daemonapp.pp svneol=native#text/plain
-packages/fcl-base/src/inc/eventlog.pp svneol=native#text/plain
-packages/fcl-base/src/inc/ezcgi.pp svneol=native#text/plain
-packages/fcl-base/src/inc/felog.inc svneol=native#text/plain
-packages/fcl-base/src/inc/fptimer.pp svneol=native#text/plain
-packages/fcl-base/src/inc/gettext.pp svneol=native#text/plain
-packages/fcl-base/src/inc/idea.pp svneol=native#text/plain
-packages/fcl-base/src/inc/inicol.pp svneol=native#text/plain
-packages/fcl-base/src/inc/inifiles.pp svneol=native#text/plain
-packages/fcl-base/src/inc/iostream.pp svneol=native#text/plain
-packages/fcl-base/src/inc/libtar.pas svneol=native#text/plain
-packages/fcl-base/src/inc/maskutils.pp svneol=native#text/plain
-packages/fcl-base/src/inc/pooledmm.pp svneol=native#text/plain
-packages/fcl-base/src/inc/rtfdata.inc svneol=native#text/plain
-packages/fcl-base/src/inc/rtfpars.pp svneol=native#text/plain
-packages/fcl-base/src/inc/rttiutils.pp svneol=native#text/plain
-packages/fcl-base/src/inc/streamcoll.pp svneol=native#text/plain
-packages/fcl-base/src/inc/streamex.pp svneol=native#text/plain
-packages/fcl-base/src/inc/streamio.pp svneol=native#text/plain
-packages/fcl-base/src/inc/syncobjs.pp svneol=native#text/plain
-packages/fcl-base/src/inc/wformat.pp svneol=native#text/plain
-packages/fcl-base/src/inc/whtml.pp svneol=native#text/plain
-packages/fcl-base/src/inc/wtex.pp svneol=native#text/plain
+packages/fcl-base/src/idea.pp svneol=native#text/plain
+packages/fcl-base/src/inicol.pp svneol=native#text/plain
+packages/fcl-base/src/inifiles.pp svneol=native#text/plain
+packages/fcl-base/src/iostream.pp svneol=native#text/plain
+packages/fcl-base/src/libtar.pp svneol=native#text/plain
+packages/fcl-base/src/maskutils.pp svneol=native#text/plain
 packages/fcl-base/src/morphos/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/netware/custapp.inc svneol=native#text/plain
 packages/fcl-base/src/netware/eventlog.inc svneol=native#text/plain
@@ -3854,8 +3932,18 @@ packages/fcl-base/src/netwlibc/custapp.inc svneol=native#text/plain
 packages/fcl-base/src/netwlibc/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/os2/custapp.inc svneol=native#text/plain
 packages/fcl-base/src/os2/eventlog.inc svneol=native#text/plain
+packages/fcl-base/src/pooledmm.pp svneol=native#text/plain
+packages/fcl-base/src/rtfdata.inc svneol=native#text/plain
+packages/fcl-base/src/rtfpars.pp svneol=native#text/plain
+packages/fcl-base/src/rttiutils.pp svneol=native#text/plain
+packages/fcl-base/src/streamcoll.pp svneol=native#text/plain
+packages/fcl-base/src/streamex.pp svneol=native#text/plain
+packages/fcl-base/src/streamio.pp svneol=native#text/plain
+packages/fcl-base/src/syncobjs.pp svneol=native#text/plain
 packages/fcl-base/src/unix/daemonapp.inc svneol=native#text/plain
 packages/fcl-base/src/unix/eventlog.inc svneol=native#text/plain
+packages/fcl-base/src/wformat.pp svneol=native#text/plain
+packages/fcl-base/src/whtml.pp svneol=native#text/plain
 packages/fcl-base/src/win/ServiceManager.pas -text
 packages/fcl-base/src/win/daemonapp.inc svneol=native#text/plain
 packages/fcl-base/src/win/eventlog.inc svneol=native#text/plain
@@ -3863,99 +3951,9 @@ packages/fcl-base/src/win/fclel.mc -text
 packages/fcl-base/src/win/fclel.rc -text
 packages/fcl-base/src/win/fclel.res -text
 packages/fcl-base/src/win/fileinfo.pp svneol=native#text/plain
-packages/fcl-base/src/win/httpapp.pp svneol=native#text/plain
 packages/fcl-base/src/wince/eventlog.inc svneol=native#text/plain
 packages/fcl-base/src/wince/fileinfo.pp svneol=native#text/plain
-packages/fcl-base/tests/Makefile svneol=native#text/plain
-packages/fcl-base/tests/Makefile.fpc svneol=native#text/plain
-packages/fcl-base/tests/README -text
-packages/fcl-base/tests/asiotest.pp svneol=native#text/plain
-packages/fcl-base/tests/b64.pp svneol=native#text/plain
-packages/fcl-base/tests/b64dec.pp svneol=native#text/plain
-packages/fcl-base/tests/b64enc.pp svneol=native#text/plain
-packages/fcl-base/tests/b64test.pp svneol=native#text/plain
-packages/fcl-base/tests/b64test2.pp svneol=native#text/plain
-packages/fcl-base/tests/base64decodingtestcase.pas svneol=native#text/plain
-packages/fcl-base/tests/cachetest.pp svneol=native#text/plain
-packages/fcl-base/tests/cfgtest.pp svneol=native#text/plain
-packages/fcl-base/tests/daemon.pp svneol=native#text/plain
-packages/fcl-base/tests/daemon.txt svneol=native#text/plain
-packages/fcl-base/tests/dbugsrv.pp svneol=native#text/plain
-packages/fcl-base/tests/debugtest.pp svneol=native#text/plain
-packages/fcl-base/tests/doecho.pp svneol=native#text/plain
-packages/fcl-base/tests/dparser.pp svneol=native#text/plain
-packages/fcl-base/tests/dsockcli.pp svneol=native#text/plain
-packages/fcl-base/tests/dsocksvr.pp svneol=native#text/plain
-packages/fcl-base/tests/fpdoc.dtd -text
-packages/fcl-base/tests/fstream.pp svneol=native#text/plain
-packages/fcl-base/tests/htdump.pp svneol=native#text/plain
-packages/fcl-base/tests/intl/Makefile svneol=native#text/plain
-packages/fcl-base/tests/intl/README svneol=native#text/plain
-packages/fcl-base/tests/intl/restest.de.mo -text
-packages/fcl-base/tests/intl/restest.de.po svneol=native#text/plain
-packages/fcl-base/tests/intl/restest.fr.mo -text
-packages/fcl-base/tests/intl/restest.fr.po svneol=native#text/plain
-packages/fcl-base/tests/intl/restest.nl.mo -text
-packages/fcl-base/tests/intl/restest.nl.po svneol=native#text/plain
-packages/fcl-base/tests/intl/restest.pb.mo -text
-packages/fcl-base/tests/intl/restest.pb.po svneol=native#text/plain
-packages/fcl-base/tests/intl/restest.ru.mo -text
-packages/fcl-base/tests/intl/restest.ru.po svneol=native#text/plain
-packages/fcl-base/tests/intl/resttest.po svneol=native#text/plain
-packages/fcl-base/tests/ipcclient.pp svneol=native#text/plain
-packages/fcl-base/tests/ipcserver.pp svneol=native#text/plain
-packages/fcl-base/tests/isockcli.pp svneol=native#text/plain
-packages/fcl-base/tests/isocksvr.pp svneol=native#text/plain
-packages/fcl-base/tests/istream.pp svneol=native#text/plain
-packages/fcl-base/tests/kword.xml -text
-packages/fcl-base/tests/list.pp svneol=native#text/plain
-packages/fcl-base/tests/mstream.pp svneol=native#text/plain
-packages/fcl-base/tests/overview.rtf -text svneol=unset#unset
-packages/fcl-base/tests/parser.dat -text
-packages/fcl-base/tests/poolmm1.pp svneol=native#text/plain
-packages/fcl-base/tests/poolmm2.pp svneol=native#text/plain
-packages/fcl-base/tests/restest.pp svneol=native#text/plain
-packages/fcl-base/tests/showver.pp svneol=native#text/plain
-packages/fcl-base/tests/showver.rc -text
-packages/fcl-base/tests/showver.res -text
-packages/fcl-base/tests/simple.xml -text
-packages/fcl-base/tests/sockcli.pp svneol=native#text/plain
-packages/fcl-base/tests/socksvr.pp svneol=native#text/plain
-packages/fcl-base/tests/sstream.pp svneol=native#text/plain
-packages/fcl-base/tests/stringl.pp svneol=native#text/plain
-packages/fcl-base/tests/tarmakercons.pas svneol=native#text/plain
-packages/fcl-base/tests/tarmakerconsgzip.pas svneol=native#text/plain
-packages/fcl-base/tests/testapp.pp svneol=native#text/plain
-packages/fcl-base/tests/testbf.pp svneol=native#text/plain
-packages/fcl-base/tests/testbs.pp svneol=native#text/plain
-packages/fcl-base/tests/testcgi.html -text
-packages/fcl-base/tests/testcgi.pp svneol=native#text/plain
-packages/fcl-base/tests/testcont.pp svneol=native#text/plain
-packages/fcl-base/tests/testez.pp svneol=native#text/plain
-packages/fcl-base/tests/testhres.pp svneol=native#text/plain
-packages/fcl-base/tests/testnres.pp svneol=native#text/plain
-packages/fcl-base/tests/testol.pp svneol=native#text/plain
-packages/fcl-base/tests/testproc.pp svneol=native#text/plain
-packages/fcl-base/tests/testreg.pp svneol=native#text/plain
-packages/fcl-base/tests/testrhre.pp svneol=native#text/plain
-packages/fcl-base/tests/testrnre.pp svneol=native#text/plain
-packages/fcl-base/tests/testrsre.pp svneol=native#text/plain
-packages/fcl-base/tests/testrtf.pp svneol=native#text/plain
-packages/fcl-base/tests/testser.pp svneol=native#text/plain
-packages/fcl-base/tests/testsres.pp svneol=native#text/plain
-packages/fcl-base/tests/testtimer.pp svneol=native#text/plain
-packages/fcl-base/tests/testunzip.pp svneol=native#text/plain
-packages/fcl-base/tests/testur.pp svneol=native#text/plain
-packages/fcl-base/tests/testweb.pp svneol=native#text/plain
-packages/fcl-base/tests/testz.pp svneol=native#text/plain
-packages/fcl-base/tests/testz2.pp svneol=native#text/plain
-packages/fcl-base/tests/testzip.pp svneol=native#text/plain
-packages/fcl-base/tests/threads.pp svneol=native#text/plain
-packages/fcl-base/tests/tidea.pp svneol=native#text/plain
-packages/fcl-base/tests/tstelcmd.pp svneol=native#text/plain
-packages/fcl-base/tests/tstelgtk.pp svneol=native#text/plain
-packages/fcl-base/tests/txmlreg.pp svneol=native#text/plain
-packages/fcl-base/tests/xmldump.pp svneol=native#text/plain
+packages/fcl-base/src/wtex.pp svneol=native#text/plain
 packages/fcl-db/Makefile svneol=native#text/plain
 packages/fcl-db/Makefile.fpc svneol=native#text/plain
 packages/fcl-db/src/Dataset.txt svneol=native#text/plain

.gitignore

@@ -1334,6 +1334,20 @@ packages/extra/zlib/*.ppu
 packages/extra/zlib/*.s
 packages/extra/zlib/fpcmade.*
 packages/extra/zlib/units
+packages/fcl-base/examples/*.bak
+packages/fcl-base/examples/*.exe
+packages/fcl-base/examples/*.o
+packages/fcl-base/examples/*.ppu
+packages/fcl-base/examples/*.s
+packages/fcl-base/examples/fpcmade.*
+packages/fcl-base/examples/intl/*.bak
+packages/fcl-base/examples/intl/*.exe
+packages/fcl-base/examples/intl/*.o
+packages/fcl-base/examples/intl/*.ppu
+packages/fcl-base/examples/intl/*.s
+packages/fcl-base/examples/intl/fpcmade.*
+packages/fcl-base/examples/intl/units
+packages/fcl-base/examples/units
 packages/fcl-base/src/amiga/*.bak
 packages/fcl-base/src/amiga/*.exe
 packages/fcl-base/src/amiga/*.o
@@ -1355,13 +1369,6 @@ packages/fcl-base/src/go32v2/*.ppu
 packages/fcl-base/src/go32v2/*.s
 packages/fcl-base/src/go32v2/fpcmade.*
 packages/fcl-base/src/go32v2/units
-packages/fcl-base/src/inc/*.bak
-packages/fcl-base/src/inc/*.exe
-packages/fcl-base/src/inc/*.o
-packages/fcl-base/src/inc/*.ppu
-packages/fcl-base/src/inc/*.s
-packages/fcl-base/src/inc/fpcmade.*
-packages/fcl-base/src/inc/units
 packages/fcl-base/src/netware/*.bak
 packages/fcl-base/src/netware/*.exe
 packages/fcl-base/src/netware/*.o
@@ -1390,20 +1397,6 @@ packages/fcl-base/src/unix/*.ppu
 packages/fcl-base/src/unix/*.s
 packages/fcl-base/src/unix/fpcmade.*
 packages/fcl-base/src/unix/units
-packages/fcl-base/tests/*.bak
-packages/fcl-base/tests/*.exe
-packages/fcl-base/tests/*.o
-packages/fcl-base/tests/*.ppu
-packages/fcl-base/tests/*.s
-packages/fcl-base/tests/fpcmade.*
-packages/fcl-base/tests/intl/*.bak
-packages/fcl-base/tests/intl/*.exe
-packages/fcl-base/tests/intl/*.o
-packages/fcl-base/tests/intl/*.ppu
-packages/fcl-base/tests/intl/*.s
-packages/fcl-base/tests/intl/fpcmade.*
-packages/fcl-base/tests/intl/units
-packages/fcl-base/tests/units
 packages/fcl-db/src/*.bak
 packages/fcl-db/src/*.exe
 packages/fcl-db/src/*.o

packages/fcl-base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/05]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/22]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -886,163 +886,163 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src
 endif
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -2187,7 +2187,7 @@ endif
 endif
 endif
 .PHONY: fpc_units
-ifneq ($(TARGET_UNITS),)
+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))

packages/fcl-base/Makefile.fpc

@@ -45,7 +45,7 @@ includedir_emx=src/os2
 includedir_win32=src/win
 includedir_win64=src/win
 includedir_wince=src/win
-sourcedir=src/$(OS_TARGET) src/inc
+sourcedir=src/$(OS_TARGET) src
 
 [install]
 fpcpackage=y

packages/fcl-base/fpmake.pp

@@ -0,0 +1,110 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  T : TTarget;
+  P : TPackage;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('fcl-base');
+{$ifdef ALLPACKAGES}
+    P.Directory:='fcl-base';
+{$endif ALLPACKAGES}
+    P.Version:='2.2.1';
+    P.SourcePath.Add('src');
+    P.SourcePath.Add('src/unix',AllUnixOSes);
+    P.SourcePath.Add('src/win',AllWindowsOSes);
+    P.SourcePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
+    P.IncludePath.Add('src');
+    P.IncludePath.Add('src/unix',AllUnixOSes);
+    P.IncludePath.Add('src/win',AllWindowsOSes);
+    P.IncludePath.Add('src/$(OS)',AllOSes-AllWindowsOSes-AllUnixOSes);
+    T:=P.Targets.AddUnit('avl_tree.pp');
+    T:=P.Targets.AddUnit('base64.pp');
+    T:=P.Targets.AddUnit('blowfish.pp');
+    T:=P.Targets.AddUnit('bufstream.pp');
+    T:=P.Targets.AddUnit('cachecls.pp');
+      T.ResourceStrings:=true;
+    T:=P.Targets.AddUnit('cgiapp.pp');
+      T.ResourceStrings:=true;
+      with T.Dependencies do
+        begin
+          AddUnit('custapp');
+          AddUnit('iostream');
+        end;
+    T:=P.Targets.AddUnit('contnrs.pp');
+    T:=P.Targets.AddUnit('custapp.pp');
+      T.ResourceStrings:=true;
+    T:=P.Targets.AddUnit('daemonapp.pp',AllWindowsOSes+AllUnixOSes);
+      with T.Dependencies do
+        begin
+          AddInclude('daemonapp.inc');
+          AddUnit('custapp');
+          AddUnit('eventlog');
+        end;
+    T:=P.Targets.AddUnit('eventlog.pp');
+      T.ResourceStrings:=true;
+      with T.Dependencies do
+        begin
+          AddInclude('eventlog.inc');
+        end;
+    T:=P.Targets.AddUnit('ezcgi.pp');
+    T:=P.Targets.AddUnit('fptimer.pp',AllWindowsOSes+AllUnixOSes);
+    T:=P.Targets.AddUnit('gettext.pp');
+    T:=P.Targets.AddUnit('idea.pp');
+    T:=P.Targets.AddUnit('inicol.pp');
+      T.ResourceStrings:=true;
+      with T.Dependencies do
+        begin
+          AddUnit('inifiles');
+        end;
+    T:=P.Targets.AddUnit('inifiles.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('contnrs');
+        end;
+    T:=P.Targets.AddUnit('iostream.pp');
+    T:=P.Targets.AddUnit('libtar.pp');
+    T:=P.Targets.AddUnit('maskutils.pp');
+    T:=P.Targets.AddUnit('pooledmm.pp');
+    T:=P.Targets.AddUnit('rtfpars.pp');
+      with T.Dependencies do
+        begin
+          AddInclude('rtfdata.inc');
+        end;
+    T:=P.Targets.AddUnit('rttiutils.pp');
+    T:=P.Targets.AddUnit('streamcoll.pp');
+      T.ResourceStrings:=true;
+    T:=P.Targets.AddUnit('streamex.pp');
+    T:=P.Targets.AddUnit('streamio.pp');
+    T:=P.Targets.AddUnit('syncobjs.pp',AllOSes-[GO32v2,OS2,EMX]);
+    T:=P.Targets.AddUnit('wformat.pp');
+    T:=P.Targets.AddUnit('whtml.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('wformat');
+        end;
+    T:=P.Targets.AddUnit('wtex.pp');
+      with T.Dependencies do
+        begin
+          AddUnit('wformat');
+        end;
+
+    // Windows units
+    T:=P.Targets.AddUnit('ServiceManager.pas',[Win32,Win64]);
+    T:=P.Targets.AddUnit('fileinfo',AllWindowsOSes);
+
+    // Additional sources
+    P.Sources.AddSrcFiles('src/win/fclel.*');
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}

packages/fcl-base/src/cachecls.pp

@@ -11,6 +11,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
 
+{$mode objfpc}
+{$H+}
 
 unit CacheCls;