Răsfoiți Sursa

* Dbus moved, incl everything

git-svn-id: trunk@9935 -
marco 17 ani în urmă
părinte
comite
010eee173b

+ 23 - 22
.gitattributes

@@ -706,28 +706,6 @@ packages/Makefile svneol=native#text/plain
 packages/Makefile.fpc svneol=native#text/plain
 packages/Makefile.fpc svneol=native#text/plain
 packages/base/Makefile svneol=native#text/plain
 packages/base/Makefile svneol=native#text/plain
 packages/base/Makefile.fpc svneol=native#text/plain
 packages/base/Makefile.fpc svneol=native#text/plain
-packages/base/dbus/Makefile svneol=native#text/plain
-packages/base/dbus/Makefile.fpc svneol=native#text/plain
-packages/base/dbus/dbus-address.inc svneol=native#text/plain
-packages/base/dbus/dbus-arch-deps.inc svneol=native#text/plain
-packages/base/dbus/dbus-bus.inc svneol=native#text/plain
-packages/base/dbus/dbus-connection.inc svneol=native#text/plain
-packages/base/dbus/dbus-errors.inc svneol=native#text/plain
-packages/base/dbus/dbus-macros.inc svneol=native#text/plain
-packages/base/dbus/dbus-memory.inc svneol=native#text/plain
-packages/base/dbus/dbus-message.inc svneol=native#text/plain
-packages/base/dbus/dbus-pending-call.inc svneol=native#text/plain
-packages/base/dbus/dbus-protocol.inc svneol=native#text/plain
-packages/base/dbus/dbus-server.inc svneol=native#text/plain
-packages/base/dbus/dbus-shared.inc svneol=native#text/plain
-packages/base/dbus/dbus-signature.inc svneol=native#text/plain
-packages/base/dbus/dbus-threads.inc svneol=native#text/plain
-packages/base/dbus/dbus-types.inc svneol=native#text/plain
-packages/base/dbus/dbus.pas svneol=native#text/plain
-packages/base/dbus/dbus_arch_deps.inc svneol=native#text/plain
-packages/base/dbus/example/Makefile svneol=native#text/plain
-packages/base/dbus/example/Makefile.fpc svneol=native#text/plain
-packages/base/dbus/example/busexample.pp svneol=native#text/plain
 packages/base/gdbint/Makefile svneol=native#text/plain
 packages/base/gdbint/Makefile svneol=native#text/plain
 packages/base/gdbint/Makefile.fpc svneol=native#text/plain
 packages/base/gdbint/Makefile.fpc svneol=native#text/plain
 packages/base/gdbint/fpmake.inc svneol=native#text/plain
 packages/base/gdbint/fpmake.inc svneol=native#text/plain
@@ -1217,6 +1195,29 @@ packages/base/sqlite/sqlitedb.pas svneol=native#text/plain
 packages/base/sqlite/test.pas svneol=native#text/plain
 packages/base/sqlite/test.pas svneol=native#text/plain
 packages/base/sqlite/testapiv3x.README -text
 packages/base/sqlite/testapiv3x.README -text
 packages/base/sqlite/testapiv3x.pp -text
 packages/base/sqlite/testapiv3x.pp -text
+packages/dbus/Makefile svneol=native#text/plain
+packages/dbus/Makefile.fpc 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
+packages/dbus/fpmake.pp svneol=native#text/plain
+packages/dbus/src/dbus-address.inc svneol=native#text/plain
+packages/dbus/src/dbus-arch-deps.inc svneol=native#text/plain
+packages/dbus/src/dbus-bus.inc svneol=native#text/plain
+packages/dbus/src/dbus-connection.inc svneol=native#text/plain
+packages/dbus/src/dbus-errors.inc svneol=native#text/plain
+packages/dbus/src/dbus-macros.inc svneol=native#text/plain
+packages/dbus/src/dbus-memory.inc svneol=native#text/plain
+packages/dbus/src/dbus-message.inc svneol=native#text/plain
+packages/dbus/src/dbus-pending-call.inc svneol=native#text/plain
+packages/dbus/src/dbus-protocol.inc svneol=native#text/plain
+packages/dbus/src/dbus-server.inc svneol=native#text/plain
+packages/dbus/src/dbus-shared.inc svneol=native#text/plain
+packages/dbus/src/dbus-signature.inc svneol=native#text/plain
+packages/dbus/src/dbus-threads.inc svneol=native#text/plain
+packages/dbus/src/dbus-types.inc svneol=native#text/plain
+packages/dbus/src/dbus.pas svneol=native#text/plain
+packages/dbus/src/dbus_arch_deps.inc svneol=native#text/plain
 packages/extra/Makefile svneol=native#text/plain
 packages/extra/Makefile svneol=native#text/plain
 packages/extra/Makefile.fpc svneol=native#text/plain
 packages/extra/Makefile.fpc svneol=native#text/plain
 packages/extra/a52/Makefile svneol=native#text/plain
 packages/extra/a52/Makefile svneol=native#text/plain

Fișier diff suprimat deoarece este prea mare
+ 419 - 53
packages/Makefile


+ 1 - 1
packages/Makefile.fpc

@@ -9,7 +9,7 @@ dirs_darwin=fcl-web fcl-async ibase mysql ncurses zlib oracle
 dirs_solaris=fcl-web fcl-async ibase mysql ncurses zlib oracle
 dirs_solaris=fcl-web fcl-async ibase mysql ncurses zlib oracle
 dirs_netbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
 dirs_netbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
 dirs_openbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
 dirs_openbsd=fcl-web fcl-async ibase mysql ncurses zlib oracle
-dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip zlib oracle
+dirs_linux=fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus
 dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle
 dirs_win32=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle
 dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle
 dirs_win64=winunits-base winunits-jedi fcl-web ibase mysql zlib oracle
 dirs_wince=fcl-web ibase mysql
 dirs_wince=fcl-web ibase mysql

+ 24 - 145
packages/base/Makefile

@@ -241,28 +241,28 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd libc
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd libc
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
 override TARGET_DIRS+=regexpr  gdbint
 override TARGET_DIRS+=regexpr  gdbint
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_DIRS+=regexpr  gdbint   odbc sqlite postgres oracle imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   odbc sqlite postgres  imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
 override TARGET_DIRS+=regexpr  gdbint   postgres odbc sqlite pthreads imagemagick
 override TARGET_DIRS+=regexpr  gdbint   postgres odbc sqlite pthreads imagemagick
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_DIRS+=regexpr  postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -271,13 +271,13 @@ ifeq ($(FULL_TARGET),i386-netware)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=regexpr  postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -298,13 +298,13 @@ ifeq ($(FULL_TARGET),i386-symbian)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -313,7 +313,7 @@ ifeq ($(FULL_TARGET),m68k-atari)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -322,10 +322,10 @@ ifeq ($(FULL_TARGET),m68k-embedded)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -334,7 +334,7 @@ ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=regexpr  postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -343,34 +343,34 @@ ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_DIRS+=regexpr  postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_DIRS+=regexpr  postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_DIRS+=regexpr  odbc sqlite postgres oracle
+override TARGET_DIRS+=regexpr  odbc sqlite postgres
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -391,10 +391,10 @@ ifeq ($(FULL_TARGET),arm-symbian)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_DIRS+=regexpr  gdbint   postgres oracle odbc pthreads sqlite imagemagick dbus httpd
+override TARGET_DIRS+=regexpr  gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=regexpr  postgres oracle odbc sqlite pthreads imagemagick httpd
+override TARGET_DIRS+=regexpr  postgres  odbc sqlite pthreads imagemagick httpd
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_DIRS+=regexpr
 override TARGET_DIRS+=regexpr
@@ -1482,12 +1482,10 @@ ifeq ($(FULL_TARGET),i386-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_LIBC=1
 TARGET_DIRS_LIBC=1
 endif
 endif
@@ -1501,7 +1499,6 @@ TARGET_DIRS_GDBINT=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
@@ -1512,7 +1509,6 @@ ifeq ($(FULL_TARGET),i386-freebsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1532,7 +1528,6 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
@@ -1540,7 +1535,6 @@ endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1557,7 +1551,6 @@ ifeq ($(FULL_TARGET),i386-openbsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
@@ -1568,7 +1561,6 @@ endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1599,19 +1591,16 @@ ifeq ($(FULL_TARGET),m68k-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1622,7 +1611,6 @@ ifeq ($(FULL_TARGET),m68k-netbsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
@@ -1637,7 +1625,6 @@ ifeq ($(FULL_TARGET),m68k-openbsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
@@ -1652,19 +1639,16 @@ ifeq ($(FULL_TARGET),powerpc-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
@@ -1678,7 +1662,6 @@ endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1695,19 +1678,16 @@ ifeq ($(FULL_TARGET),sparc-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
@@ -1715,7 +1695,6 @@ endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1729,19 +1708,16 @@ ifeq ($(FULL_TARGET),x86_64-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1751,7 +1727,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1763,7 +1738,6 @@ TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
@@ -1772,12 +1746,10 @@ ifeq ($(FULL_TARGET),arm-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
@@ -1804,18 +1776,15 @@ ifeq ($(FULL_TARGET),powerpc64-linux)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_GDBINT=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_IMAGEMAGICK=1
 TARGET_DIRS_IMAGEMAGICK=1
-TARGET_DIRS_DBUS=1
 TARGET_DIRS_HTTPD=1
 TARGET_DIRS_HTTPD=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_REGEXPR=1
 TARGET_DIRS_POSTGRES=1
 TARGET_DIRS_POSTGRES=1
-TARGET_DIRS_ORACLE=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_ODBC=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_SQLITE=1
 TARGET_DIRS_PTHREADS=1
 TARGET_DIRS_PTHREADS=1
@@ -1960,51 +1929,6 @@ postgres:
 	$(MAKE) -C postgres all
 	$(MAKE) -C postgres all
 .PHONY: postgres_all postgres_debug postgres_smart postgres_release postgres_units postgres_examples postgres_shared postgres_install postgres_sourceinstall postgres_exampleinstall postgres_distinstall postgres_zipinstall postgres_zipsourceinstall postgres_zipexampleinstall postgres_zipdistinstall postgres_clean postgres_distclean postgres_cleanall postgres_info postgres_makefiles postgres
 .PHONY: postgres_all postgres_debug postgres_smart postgres_release postgres_units postgres_examples postgres_shared postgres_install postgres_sourceinstall postgres_exampleinstall postgres_distinstall postgres_zipinstall postgres_zipsourceinstall postgres_zipexampleinstall postgres_zipdistinstall postgres_clean postgres_distclean postgres_cleanall postgres_info postgres_makefiles postgres
 endif
 endif
-ifdef TARGET_DIRS_ORACLE
-oracle_all:
-	$(MAKE) -C oracle all
-oracle_debug:
-	$(MAKE) -C oracle debug
-oracle_smart:
-	$(MAKE) -C oracle smart
-oracle_release:
-	$(MAKE) -C oracle release
-oracle_units:
-	$(MAKE) -C oracle units
-oracle_examples:
-	$(MAKE) -C oracle examples
-oracle_shared:
-	$(MAKE) -C oracle shared
-oracle_install:
-	$(MAKE) -C oracle install
-oracle_sourceinstall:
-	$(MAKE) -C oracle sourceinstall
-oracle_exampleinstall:
-	$(MAKE) -C oracle exampleinstall
-oracle_distinstall:
-	$(MAKE) -C oracle distinstall
-oracle_zipinstall:
-	$(MAKE) -C oracle zipinstall
-oracle_zipsourceinstall:
-	$(MAKE) -C oracle zipsourceinstall
-oracle_zipexampleinstall:
-	$(MAKE) -C oracle zipexampleinstall
-oracle_zipdistinstall:
-	$(MAKE) -C oracle zipdistinstall
-oracle_clean:
-	$(MAKE) -C oracle clean
-oracle_distclean:
-	$(MAKE) -C oracle distclean
-oracle_cleanall:
-	$(MAKE) -C oracle cleanall
-oracle_info:
-	$(MAKE) -C oracle info
-oracle_makefiles:
-	$(MAKE) -C oracle makefiles
-oracle:
-	$(MAKE) -C oracle all
-.PHONY: oracle_all oracle_debug oracle_smart oracle_release oracle_units oracle_examples oracle_shared oracle_install oracle_sourceinstall oracle_exampleinstall oracle_distinstall oracle_zipinstall oracle_zipsourceinstall oracle_zipexampleinstall oracle_zipdistinstall oracle_clean oracle_distclean oracle_cleanall oracle_info oracle_makefiles oracle
-endif
 ifdef TARGET_DIRS_ODBC
 ifdef TARGET_DIRS_ODBC
 odbc_all:
 odbc_all:
 	$(MAKE) -C odbc all
 	$(MAKE) -C odbc all
@@ -2185,51 +2109,6 @@ imagemagick:
 	$(MAKE) -C imagemagick all
 	$(MAKE) -C imagemagick all
 .PHONY: imagemagick_all imagemagick_debug imagemagick_smart imagemagick_release imagemagick_units imagemagick_examples imagemagick_shared imagemagick_install imagemagick_sourceinstall imagemagick_exampleinstall imagemagick_distinstall imagemagick_zipinstall imagemagick_zipsourceinstall imagemagick_zipexampleinstall imagemagick_zipdistinstall imagemagick_clean imagemagick_distclean imagemagick_cleanall imagemagick_info imagemagick_makefiles imagemagick
 .PHONY: imagemagick_all imagemagick_debug imagemagick_smart imagemagick_release imagemagick_units imagemagick_examples imagemagick_shared imagemagick_install imagemagick_sourceinstall imagemagick_exampleinstall imagemagick_distinstall imagemagick_zipinstall imagemagick_zipsourceinstall imagemagick_zipexampleinstall imagemagick_zipdistinstall imagemagick_clean imagemagick_distclean imagemagick_cleanall imagemagick_info imagemagick_makefiles imagemagick
 endif
 endif
-ifdef TARGET_DIRS_DBUS
-dbus_all:
-	$(MAKE) -C dbus all
-dbus_debug:
-	$(MAKE) -C dbus debug
-dbus_smart:
-	$(MAKE) -C dbus smart
-dbus_release:
-	$(MAKE) -C dbus release
-dbus_units:
-	$(MAKE) -C dbus units
-dbus_examples:
-	$(MAKE) -C dbus examples
-dbus_shared:
-	$(MAKE) -C dbus shared
-dbus_install:
-	$(MAKE) -C dbus install
-dbus_sourceinstall:
-	$(MAKE) -C dbus sourceinstall
-dbus_exampleinstall:
-	$(MAKE) -C dbus exampleinstall
-dbus_distinstall:
-	$(MAKE) -C dbus distinstall
-dbus_zipinstall:
-	$(MAKE) -C dbus zipinstall
-dbus_zipsourceinstall:
-	$(MAKE) -C dbus zipsourceinstall
-dbus_zipexampleinstall:
-	$(MAKE) -C dbus zipexampleinstall
-dbus_zipdistinstall:
-	$(MAKE) -C dbus zipdistinstall
-dbus_clean:
-	$(MAKE) -C dbus clean
-dbus_distclean:
-	$(MAKE) -C dbus distclean
-dbus_cleanall:
-	$(MAKE) -C dbus cleanall
-dbus_info:
-	$(MAKE) -C dbus info
-dbus_makefiles:
-	$(MAKE) -C dbus makefiles
-dbus:
-	$(MAKE) -C dbus all
-.PHONY: dbus_all dbus_debug dbus_smart dbus_release dbus_units dbus_examples dbus_shared dbus_install dbus_sourceinstall dbus_exampleinstall dbus_distinstall dbus_zipinstall dbus_zipsourceinstall dbus_zipexampleinstall dbus_zipdistinstall dbus_clean dbus_distclean dbus_cleanall dbus_info dbus_makefiles dbus
-endif
 ifdef TARGET_DIRS_HTTPD
 ifdef TARGET_DIRS_HTTPD
 httpd_all:
 httpd_all:
 	$(MAKE) -C httpd all
 	$(MAKE) -C httpd all

+ 1 - 1
packages/base/Makefile.fpc

@@ -5,7 +5,7 @@
 [target]
 [target]
 dirs=regexpr
 dirs=regexpr
 dirs_i386_linux=libc
 dirs_i386_linux=libc
-dirs_linux=gdbint   postgres  odbc pthreads sqlite imagemagick dbus httpd
+dirs_linux=gdbint   postgres  odbc pthreads sqlite imagemagick  httpd
 dirs_win32=gdbint   odbc sqlite postgres  imagemagick httpd 
 dirs_win32=gdbint   odbc sqlite postgres  imagemagick httpd 
 dirs_win64=  odbc sqlite postgres  
 dirs_win64=  odbc sqlite postgres  
 dirs_wince= sqlite postgres
 dirs_wince= sqlite postgres

+ 472 - 154
packages/base/dbus/Makefile → packages/dbus/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26]
 #
 #
 default: all
 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
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -98,7 +98,7 @@ endif
 endif
 endif
 export ECHO
 export ECHO
 endif
 endif
-override DEFAULT_FPCDIR=../../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifndef FPC
 ifdef PP
 ifdef PP
 FPC=$(PP)
 FPC=$(PP)
@@ -402,165 +402,483 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_UNITS+=dbus
 override TARGET_UNITS+=dbus
 endif
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLEDIRS+=example
+override TARGET_EXAMPLEDIRS+=examples
 endif
 endif
 override INSTALL_FPCPACKAGE=y
 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-netbsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_INCLUDEDIR+=src
+endif
+ifeq ($(FULL_TARGET),i386-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-go32v2)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-win32)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-os2)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-freebsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-beos)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-netbsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-solaris)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-qnx)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-netware)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-openbsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-wdosx)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-darwin)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-emx)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-watcom)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-netwlibc)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-wince)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),i386-symbian)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-freebsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-netbsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-amiga)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-atari)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-openbsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-palmos)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),m68k-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-netbsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-amiga)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-macos)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-darwin)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-morphos)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),sparc-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),sparc-netbsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),sparc-solaris)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),sparc-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),x86_64-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),x86_64-freebsd)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),x86_64-darwin)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),x86_64-win64)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),x86_64-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-palmos)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-wince)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-gba)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-nds)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),arm-symbian)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc64-linux)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc64-darwin)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
+ifeq ($(FULL_TARGET),powerpc64-embedded)
+override COMPILER_SOURCEDIR+=src tests examples
+endif
 ifdef REQUIRE_UNITSDIR
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
 endif
@@ -1685,7 +2003,7 @@ endif
 endif
 endif
 endif
 endif
 .PHONY: fpc_units
 .PHONY: fpc_units
-ifneq ($(TARGET_UNITS),)
+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
 override ALLTARGET+=fpc_units
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@@ -2119,208 +2437,208 @@ fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_EXAMPLEDIR
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 fpc_makefiles: fpc_makefile fpc_makefile_dirs
 ifeq ($(FULL_TARGET),i386-linux)
 ifeq ($(FULL_TARGET),i386-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
 ifeq ($(FULL_TARGET),i386-go32v2)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-win32)
 ifeq ($(FULL_TARGET),i386-win32)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-os2)
 ifeq ($(FULL_TARGET),i386-os2)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
 ifeq ($(FULL_TARGET),i386-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-beos)
 ifeq ($(FULL_TARGET),i386-beos)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
 ifeq ($(FULL_TARGET),i386-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
 ifeq ($(FULL_TARGET),i386-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 ifeq ($(FULL_TARGET),i386-qnx)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netware)
 ifeq ($(FULL_TARGET),i386-netware)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
 ifeq ($(FULL_TARGET),i386-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
 ifeq ($(FULL_TARGET),i386-wdosx)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
 ifeq ($(FULL_TARGET),i386-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 ifeq ($(FULL_TARGET),i386-emx)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
 ifeq ($(FULL_TARGET),i386-watcom)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
 ifeq ($(FULL_TARGET),i386-netwlibc)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-wince)
 ifeq ($(FULL_TARGET),i386-wince)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
 ifeq ($(FULL_TARGET),i386-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
 ifeq ($(FULL_TARGET),i386-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
 ifeq ($(FULL_TARGET),m68k-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
 ifeq ($(FULL_TARGET),m68k-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
 ifeq ($(FULL_TARGET),m68k-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
 ifeq ($(FULL_TARGET),m68k-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
 ifeq ($(FULL_TARGET),m68k-atari)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
 ifeq ($(FULL_TARGET),m68k-openbsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
 ifeq ($(FULL_TARGET),m68k-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
 ifeq ($(FULL_TARGET),m68k-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
 ifeq ($(FULL_TARGET),powerpc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
 ifeq ($(FULL_TARGET),powerpc-amiga)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
 ifeq ($(FULL_TARGET),powerpc-macos)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
 ifeq ($(FULL_TARGET),powerpc-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 ifeq ($(FULL_TARGET),powerpc-morphos)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 ifeq ($(FULL_TARGET),powerpc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
 ifeq ($(FULL_TARGET),sparc-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
 ifeq ($(FULL_TARGET),sparc-netbsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
 ifeq ($(FULL_TARGET),sparc-solaris)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 ifeq ($(FULL_TARGET),sparc-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
 ifeq ($(FULL_TARGET),x86_64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 ifeq ($(FULL_TARGET),x86_64-win64)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
 ifeq ($(FULL_TARGET),x86_64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-linux)
 ifeq ($(FULL_TARGET),arm-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
 ifeq ($(FULL_TARGET),arm-palmos)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 ifeq ($(FULL_TARGET),arm-wince)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-gba)
 ifeq ($(FULL_TARGET),arm-gba)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-nds)
 ifeq ($(FULL_TARGET),arm-nds)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
 ifeq ($(FULL_TARGET),arm-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
 ifeq ($(FULL_TARGET),arm-symbian)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
 ifeq ($(FULL_TARGET),powerpc64-linux)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
+TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-TARGET_EXAMPLEDIRS_EXAMPLE=1
-endif
-ifdef TARGET_EXAMPLEDIRS_EXAMPLE
-example_all:
-	$(MAKE) -C example all
-example_debug:
-	$(MAKE) -C example debug
-example_smart:
-	$(MAKE) -C example smart
-example_release:
-	$(MAKE) -C example release
-example_units:
-	$(MAKE) -C example units
-example_examples:
-	$(MAKE) -C example examples
-example_shared:
-	$(MAKE) -C example shared
-example_install:
-	$(MAKE) -C example install
-example_sourceinstall:
-	$(MAKE) -C example sourceinstall
-example_exampleinstall:
-	$(MAKE) -C example exampleinstall
-example_distinstall:
-	$(MAKE) -C example distinstall
-example_zipinstall:
-	$(MAKE) -C example zipinstall
-example_zipsourceinstall:
-	$(MAKE) -C example zipsourceinstall
-example_zipexampleinstall:
-	$(MAKE) -C example zipexampleinstall
-example_zipdistinstall:
-	$(MAKE) -C example zipdistinstall
-example_clean:
-	$(MAKE) -C example clean
-example_distclean:
-	$(MAKE) -C example distclean
-example_cleanall:
-	$(MAKE) -C example cleanall
-example_info:
-	$(MAKE) -C example info
-example_makefiles:
-	$(MAKE) -C example makefiles
-example:
-	$(MAKE) -C example all
-.PHONY: example_all example_debug example_smart example_release example_units example_examples example_shared example_install example_sourceinstall example_exampleinstall example_distinstall example_zipinstall example_zipsourceinstall example_zipexampleinstall example_zipdistinstall example_clean example_distclean example_cleanall example_info example_makefiles example
+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
+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
 endif
 all: fpc_all
 all: fpc_all
 debug: fpc_debug
 debug: fpc_debug

+ 6 - 2
packages/base/dbus/Makefile.fpc → packages/dbus/Makefile.fpc

@@ -8,7 +8,7 @@ version=2.0.4
 
 
 [target]
 [target]
 units=dbus
 units=dbus
-exampledirs=example
+exampledirs=examples
 
 
 [require]
 [require]
 libc=y
 libc=y
@@ -17,7 +17,11 @@ libc=y
 fpcpackage=y
 fpcpackage=y
 
 
 [default]
 [default]
-fpcdir=../../..
+fpcdir=../..
+
+[compiler]
+includedir=src
+sourcedir=src tests examples
 
 
 [rules]
 [rules]
 
 

+ 2 - 2
packages/base/dbus/example/Makefile → packages/dbus/examples/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26]
 #
 #
 default: all
 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
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -98,7 +98,7 @@ endif
 endif
 endif
 export ECHO
 export ECHO
 endif
 endif
-override DEFAULT_FPCDIR=../../../..
+override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifndef FPC
 ifdef PP
 ifdef PP
 FPC=$(PP)
 FPC=$(PP)

+ 1 - 1
packages/base/dbus/example/Makefile.fpc → packages/dbus/examples/Makefile.fpc

@@ -12,4 +12,4 @@ packages=dbus
 fpcpackage=y
 fpcpackage=y
 
 
 [default]
 [default]
-fpcdir=../../../..
+fpcdir=../../..

+ 0 - 0
packages/base/dbus/example/busexample.pp → packages/dbus/examples/busexample.pp


+ 47 - 0
packages/dbus/fpmake.pp

@@ -0,0 +1,47 @@
+{$ifndef ALLPACKAGES}
+{$mode objfpc}{$H+}
+program fpmake;
+
+uses fpmkunit;
+
+Var
+  P : TPackage;
+  T : TTarget;
+begin
+  With Installer do
+    begin
+{$endif ALLPACKAGES}
+
+    P:=AddPackage('dbus');
+{$ifdef ALLPACKAGES}
+    P.Directory:='dbus';
+{$endif ALLPACKAGES}
+    P.Version:='2.0.0';
+    P.SourcePath.Add('src');
+
+    T:=P.Targets.AddUnit('dbus.pas');
+      with T.Dependencies do
+        begin
+          AddInclude('dbus-macros.inc');
+          AddInclude('dbus-arch-deps.inc');
+          AddInclude('dbus-types.inc');
+          AddInclude('dbus-errors.inc');
+          AddInclude('dbus-address.inc');
+          AddInclude('dbus-message.inc');
+          AddInclude('dbus-memory.inc');
+          AddInclude('dbus-shared.inc');
+          AddInclude('dbus-connection.inc');
+          AddInclude('dbus-bus.inc');
+          AddInclude('dbus-pending-call.inc');
+          AddInclude('dbus-protocol.inc');
+          AddInclude('dbus-server.inc');
+          AddInclude('dbus-signature.inc');
+          AddInclude('dbus-threads.inc');
+        end;
+
+
+{$ifndef ALLPACKAGES}
+    Run;
+    end;
+end.
+{$endif ALLPACKAGES}

+ 0 - 0
packages/base/dbus/dbus-address.inc → packages/dbus/src/dbus-address.inc


+ 0 - 0
packages/base/dbus/dbus-arch-deps.inc → packages/dbus/src/dbus-arch-deps.inc


+ 0 - 0
packages/base/dbus/dbus-bus.inc → packages/dbus/src/dbus-bus.inc


+ 0 - 0
packages/base/dbus/dbus-connection.inc → packages/dbus/src/dbus-connection.inc


+ 0 - 0
packages/base/dbus/dbus-errors.inc → packages/dbus/src/dbus-errors.inc


+ 0 - 0
packages/base/dbus/dbus-macros.inc → packages/dbus/src/dbus-macros.inc


+ 0 - 0
packages/base/dbus/dbus-memory.inc → packages/dbus/src/dbus-memory.inc


+ 0 - 0
packages/base/dbus/dbus-message.inc → packages/dbus/src/dbus-message.inc


+ 0 - 0
packages/base/dbus/dbus-pending-call.inc → packages/dbus/src/dbus-pending-call.inc


+ 0 - 0
packages/base/dbus/dbus-protocol.inc → packages/dbus/src/dbus-protocol.inc


+ 0 - 0
packages/base/dbus/dbus-server.inc → packages/dbus/src/dbus-server.inc


+ 0 - 0
packages/base/dbus/dbus-shared.inc → packages/dbus/src/dbus-shared.inc


+ 0 - 0
packages/base/dbus/dbus-signature.inc → packages/dbus/src/dbus-signature.inc


+ 0 - 0
packages/base/dbus/dbus-threads.inc → packages/dbus/src/dbus-threads.inc


+ 0 - 0
packages/base/dbus/dbus-types.inc → packages/dbus/src/dbus-types.inc


+ 0 - 0
packages/base/dbus/dbus.pas → packages/dbus/src/dbus.pas


+ 0 - 0
packages/base/dbus/dbus_arch_deps.inc → packages/dbus/src/dbus_arch_deps.inc


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff