From cb744d37ff5988d7f1f8cfaba3ffc5c759a06162 Mon Sep 17 00:00:00 2001 From: Jonas Maebe Date: Wed, 22 Aug 2007 08:16:10 +0000 Subject: [PATCH] - reverted change for avoiding recompilation of units in subdirs, it breaks other things git-svn-id: trunk@8298 - --- fv/Makefile | 4 +- ide/compiler/Makefile | 4 +- ide/fakegdb/Makefile | 4 +- packages/base/dbus/Makefile | 4 +- packages/base/gdbint/Makefile | 4 +- packages/base/graph/Makefile | 4 +- packages/base/hash/Makefile | 4 +- packages/base/httpd/examples/Makefile | 4 +- packages/base/httpd/httpd-1.3/Makefile | 4 +- packages/base/httpd/httpd-2.0/Makefile | 4 +- packages/base/httpd/httpd-2.2/Makefile | 4 +- packages/base/ibase/Makefile | 4 +- packages/base/imagemagick/Makefile | 4 +- packages/base/libasync/Makefile | 4 +- packages/base/libc/Makefile | 4 +- packages/base/mysql/Makefile | 4 +- packages/base/netdb/Makefile | 4 +- packages/base/odbc/Makefile | 4 +- packages/base/oracle/Makefile | 4 +- packages/base/oracle/example/Makefile | 4 +- packages/base/pasjpeg/Makefile | 4 +- packages/base/paszlib/Makefile | 4 +- packages/base/postgres/Makefile | 4 +- packages/base/pthreads/Makefile | 4 +- packages/base/regexpr/Makefile | 4 +- packages/base/sqlite/Makefile | 4 +- packages/base/winunits/Makefile | 4 +- packages/extra/a52/Makefile | 4 +- packages/extra/amunits/units/Makefile | 4 +- packages/extra/amunits/utilunits/Makefile | 4 +- packages/extra/bfd/Makefile | 4 +- packages/extra/cairo/Makefile | 4 +- packages/extra/cdrom/Makefile | 4 +- packages/extra/chm/Makefile | 4 +- packages/extra/dts/Makefile | 4 +- packages/extra/fftw/Makefile | 4 +- packages/extra/forms/Makefile | 4 +- packages/extra/fpgtk/Makefile | 4 +- packages/extra/gbaunits/Makefile | 4 +- packages/extra/gdbm/Makefile | 4 +- packages/extra/ggi/Makefile | 4 +- packages/extra/gnome1/gconf/Makefile | 4 +- packages/extra/gnome1/gnome/Makefile | 4 +- packages/extra/gnome1/zvt/Makefile | 4 +- packages/extra/gtk/Makefile | 4 +- packages/extra/gtk/gtkgl/Makefile | 4 +- packages/extra/gtk2/Makefile | 4 +- packages/extra/hermes/Makefile | 4 +- packages/extra/imlib/Makefile | 4 +- packages/extra/ldap/Makefile | 4 +- packages/extra/libcurl/Makefile | 4 +- packages/extra/libgd/Makefile | 4 +- packages/extra/libpng/Makefile | 4 +- packages/extra/lua/Makefile | 4 +- packages/extra/mad/Makefile | 4 +- packages/extra/matroska/Makefile | 4 +- packages/extra/modplug/Makefile | 4 +- packages/extra/ncurses/Makefile | 4 +- packages/extra/newt/Makefile | 4 +- packages/extra/numlib/Makefile | 4 +- packages/extra/oggvorbis/Makefile | 4 +- packages/extra/openal/Makefile | 4 +- packages/extra/opengl/Makefile | 4 +- packages/extra/openssl/Makefile | 4 +- packages/extra/os2units/clkdll/Makefile | 4 +- packages/extra/os2units/ftpapi/Makefile | 4 +- packages/extra/os2units/hwvideo/Makefile | 4 +- packages/extra/os2units/lvm/Makefile | 4 +- packages/extra/os2units/mmtk/Makefile | 4 +- packages/extra/palmunits/Makefile | 4 +- packages/extra/pcap/Makefile | 4 +- packages/extra/ptc/Makefile | 4 +- packages/extra/rexx/Makefile | 4 +- packages/extra/sdl/Makefile | 4 +- packages/extra/sndfile/Makefile | 4 +- packages/extra/svgalib/Makefile | 4 +- packages/extra/syslog/Makefile | 4 +- packages/extra/tcl/Makefile | 4 +- packages/extra/univint/Makefile | 4 +- packages/extra/unixutil/Makefile | 4 +- packages/extra/unzip/Makefile | 4 +- packages/extra/utmp/Makefile | 4 +- packages/extra/uuid/Makefile | 4 +- packages/extra/x11/Makefile | 4 +- packages/extra/zlib/Makefile | 4 +- packages/fcl-base/Makefile | 4 +- packages/fcl-db/Makefile | 4 +- packages/fcl-db/src/dbase/Makefile | 4 +- packages/fcl-db/src/memds/Makefile | 4 +- packages/fcl-db/src/sdf/Makefile | 4 +- packages/fcl-db/src/sqldb/Makefile | 4 +- packages/fcl-db/src/sqldb/interbase/Makefile | 4 +- packages/fcl-db/src/sqldb/mysql/Makefile | 4 +- packages/fcl-db/src/sqldb/odbc/Makefile | 4 +- packages/fcl-db/src/sqldb/oracle/Makefile | 4 +- packages/fcl-db/src/sqldb/postgres/Makefile | 4 +- packages/fcl-db/src/sqldb/sqlite/Makefile | 4 +- packages/fcl-db/src/sqlite/Makefile | 4 +- packages/fcl-fpcunit/Makefile | 4 +- .../fcl-fpcunit/src/exampletests/Makefile | 4 +- packages/fcl-fpcunit/src/tests/Makefile | 4 +- packages/fcl-image/Makefile | 4 +- packages/fcl-net/Makefile | 4 +- packages/fcl-net/src/tests/Makefile | 4 +- packages/fcl-passrc/Makefile | 4 +- packages/fcl-registry/Makefile | 4 +- packages/fcl-web/Makefile | 4 +- packages/fcl-xml/Makefile | 4 +- packages/fpmkunit/Makefile | 4 +- rtl/amiga/Makefile | 4 +- rtl/beos/Makefile | 4 +- rtl/darwin/Makefile | 4 +- rtl/embedded/Makefile | 4 +- rtl/emx/Makefile | 4 +- rtl/freebsd/Makefile | 4 +- rtl/gba/Makefile | 4 +- rtl/go32v2/Makefile | 4 +- rtl/linux/Makefile | 4 +- rtl/macos/Makefile | 4 +- rtl/morphos/Makefile | 4 +- rtl/nds/Makefile | 4 +- rtl/netbsd/Makefile | 4 +- rtl/netware/Makefile | 4 +- rtl/netwlibc/Makefile | 4 +- rtl/openbsd/Makefile | 4 +- rtl/os2/Makefile | 4 +- rtl/palmos/Makefile | 4 +- rtl/solaris/Makefile | 4 +- rtl/symbian/Makefile | 4 +- rtl/watcom/Makefile | 4 +- rtl/win32/Makefile | 4 +- rtl/win64/Makefile | 4 +- rtl/wince/Makefile | 4 +- utils/fpcm/Makefile | 10 +- utils/fpcm/fpcmake.inc | 295 +++++++++--------- utils/fpcm/fpcmake.ini | 4 +- 136 files changed, 418 insertions(+), 423 deletions(-) diff --git a/fv/Makefile b/fv/Makefile index 24d9179ac1..5f998e9aa5 100644 --- a/fv/Makefile +++ b/fv/Makefile @@ -1940,8 +1940,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/ide/compiler/Makefile b/ide/compiler/Makefile index 9614eb36e1..d329392ffb 100644 --- a/ide/compiler/Makefile +++ b/ide/compiler/Makefile @@ -1964,8 +1964,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/ide/fakegdb/Makefile b/ide/fakegdb/Makefile index 77ef1d3f27..a4e7a2bbb5 100644 --- a/ide/fakegdb/Makefile +++ b/ide/fakegdb/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/dbus/Makefile b/packages/base/dbus/Makefile index f52d40dc4d..29497264ee 100644 --- a/packages/base/dbus/Makefile +++ b/packages/base/dbus/Makefile @@ -1664,8 +1664,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/gdbint/Makefile b/packages/base/gdbint/Makefile index 85dc6fa267..89d851f391 100644 --- a/packages/base/gdbint/Makefile +++ b/packages/base/gdbint/Makefile @@ -1996,8 +1996,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/graph/Makefile b/packages/base/graph/Makefile index a243b69a98..a4158e5400 100644 --- a/packages/base/graph/Makefile +++ b/packages/base/graph/Makefile @@ -2042,8 +2042,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/hash/Makefile b/packages/base/hash/Makefile index 6c7eb5b4de..08f5d591cf 100644 --- a/packages/base/hash/Makefile +++ b/packages/base/hash/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/httpd/examples/Makefile b/packages/base/httpd/examples/Makefile index a3170305bf..6b61e82c04 100644 --- a/packages/base/httpd/examples/Makefile +++ b/packages/base/httpd/examples/Makefile @@ -1740,8 +1740,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/httpd/httpd-1.3/Makefile b/packages/base/httpd/httpd-1.3/Makefile index 9b47b68ed1..75f3d9181b 100644 --- a/packages/base/httpd/httpd-1.3/Makefile +++ b/packages/base/httpd/httpd-1.3/Makefile @@ -1508,8 +1508,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/httpd/httpd-2.0/Makefile b/packages/base/httpd/httpd-2.0/Makefile index 084795b3df..d25a6fa00b 100644 --- a/packages/base/httpd/httpd-2.0/Makefile +++ b/packages/base/httpd/httpd-2.0/Makefile @@ -1508,8 +1508,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/httpd/httpd-2.2/Makefile b/packages/base/httpd/httpd-2.2/Makefile index 8f4c589e3c..05fce8b23d 100644 --- a/packages/base/httpd/httpd-2.2/Makefile +++ b/packages/base/httpd/httpd-2.2/Makefile @@ -1508,8 +1508,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/ibase/Makefile b/packages/base/ibase/Makefile index 3405d89ef8..743c1a5820 100644 --- a/packages/base/ibase/Makefile +++ b/packages/base/ibase/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/imagemagick/Makefile b/packages/base/imagemagick/Makefile index b2a1f33ffd..e883f32dbe 100644 --- a/packages/base/imagemagick/Makefile +++ b/packages/base/imagemagick/Makefile @@ -1823,8 +1823,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/libasync/Makefile b/packages/base/libasync/Makefile index 0d89602891..36a78f79d3 100644 --- a/packages/base/libasync/Makefile +++ b/packages/base/libasync/Makefile @@ -1537,8 +1537,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/libc/Makefile b/packages/base/libc/Makefile index 89753ae77e..d5df1e3ea8 100644 --- a/packages/base/libc/Makefile +++ b/packages/base/libc/Makefile @@ -1510,8 +1510,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/mysql/Makefile b/packages/base/mysql/Makefile index 101fc9b6d6..cd791ab42c 100644 --- a/packages/base/mysql/Makefile +++ b/packages/base/mysql/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/netdb/Makefile b/packages/base/netdb/Makefile index 5f46c13c05..b1ba62a4ee 100644 --- a/packages/base/netdb/Makefile +++ b/packages/base/netdb/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/odbc/Makefile b/packages/base/odbc/Makefile index 1c8eb96f5b..1376c10de9 100644 --- a/packages/base/odbc/Makefile +++ b/packages/base/odbc/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/oracle/Makefile b/packages/base/oracle/Makefile index 040d15db48..0642c14ce8 100644 --- a/packages/base/oracle/Makefile +++ b/packages/base/oracle/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/oracle/example/Makefile b/packages/base/oracle/example/Makefile index 47c0e9ab89..5a886c9d1b 100644 --- a/packages/base/oracle/example/Makefile +++ b/packages/base/oracle/example/Makefile @@ -2568,8 +2568,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/pasjpeg/Makefile b/packages/base/pasjpeg/Makefile index 17d5805470..369f41ee87 100644 --- a/packages/base/pasjpeg/Makefile +++ b/packages/base/pasjpeg/Makefile @@ -1783,8 +1783,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/paszlib/Makefile b/packages/base/paszlib/Makefile index 383a5b8c86..d783821d4f 100644 --- a/packages/base/paszlib/Makefile +++ b/packages/base/paszlib/Makefile @@ -1705,8 +1705,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/postgres/Makefile b/packages/base/postgres/Makefile index 60ff944a5b..fae904e6bd 100644 --- a/packages/base/postgres/Makefile +++ b/packages/base/postgres/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/pthreads/Makefile b/packages/base/pthreads/Makefile index 4ec1097964..8ee524a2cb 100644 --- a/packages/base/pthreads/Makefile +++ b/packages/base/pthreads/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/regexpr/Makefile b/packages/base/regexpr/Makefile index e77eed1dff..e14639af33 100644 --- a/packages/base/regexpr/Makefile +++ b/packages/base/regexpr/Makefile @@ -1783,8 +1783,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/sqlite/Makefile b/packages/base/sqlite/Makefile index ed599ad354..99a0e4a66a 100644 --- a/packages/base/sqlite/Makefile +++ b/packages/base/sqlite/Makefile @@ -1473,8 +1473,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/base/winunits/Makefile b/packages/base/winunits/Makefile index ad14c3c954..a61aa7e5d4 100644 --- a/packages/base/winunits/Makefile +++ b/packages/base/winunits/Makefile @@ -2096,8 +2096,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/a52/Makefile b/packages/extra/a52/Makefile index b7a8872df0..2b3cab6bb1 100644 --- a/packages/extra/a52/Makefile +++ b/packages/extra/a52/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/amunits/units/Makefile b/packages/extra/amunits/units/Makefile index 5d0ef91021..57bf9af38d 100644 --- a/packages/extra/amunits/units/Makefile +++ b/packages/extra/amunits/units/Makefile @@ -1939,8 +1939,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/amunits/utilunits/Makefile b/packages/extra/amunits/utilunits/Makefile index 836d3ac219..5759ed17c0 100644 --- a/packages/extra/amunits/utilunits/Makefile +++ b/packages/extra/amunits/utilunits/Makefile @@ -1939,8 +1939,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/bfd/Makefile b/packages/extra/bfd/Makefile index 64b49ca8dc..9c6054328c 100644 --- a/packages/extra/bfd/Makefile +++ b/packages/extra/bfd/Makefile @@ -1473,8 +1473,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/cairo/Makefile b/packages/extra/cairo/Makefile index 3fd4805203..26958ca38d 100644 --- a/packages/extra/cairo/Makefile +++ b/packages/extra/cairo/Makefile @@ -2150,8 +2150,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/cdrom/Makefile b/packages/extra/cdrom/Makefile index 42d32a10f9..165462d495 100644 --- a/packages/extra/cdrom/Makefile +++ b/packages/extra/cdrom/Makefile @@ -1651,8 +1651,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/chm/Makefile b/packages/extra/chm/Makefile index ea25514a8b..859e1761e3 100644 --- a/packages/extra/chm/Makefile +++ b/packages/extra/chm/Makefile @@ -2135,8 +2135,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/dts/Makefile b/packages/extra/dts/Makefile index d2752f7857..2382ed8b6f 100644 --- a/packages/extra/dts/Makefile +++ b/packages/extra/dts/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/fftw/Makefile b/packages/extra/fftw/Makefile index 8a28fd4eb2..d52d04d325 100644 --- a/packages/extra/fftw/Makefile +++ b/packages/extra/fftw/Makefile @@ -1473,8 +1473,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/forms/Makefile b/packages/extra/forms/Makefile index 0eff4759d1..e0c3204858 100644 --- a/packages/extra/forms/Makefile +++ b/packages/extra/forms/Makefile @@ -1900,8 +1900,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/fpgtk/Makefile b/packages/extra/fpgtk/Makefile index 3543d61c59..bb1b5c5ef5 100644 --- a/packages/extra/fpgtk/Makefile +++ b/packages/extra/fpgtk/Makefile @@ -2273,8 +2273,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gbaunits/Makefile b/packages/extra/gbaunits/Makefile index 37fc5d005a..ca93e743c6 100644 --- a/packages/extra/gbaunits/Makefile +++ b/packages/extra/gbaunits/Makefile @@ -1629,8 +1629,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gdbm/Makefile b/packages/extra/gdbm/Makefile index fb13e3dd23..82478d534b 100644 --- a/packages/extra/gdbm/Makefile +++ b/packages/extra/gdbm/Makefile @@ -1629,8 +1629,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/ggi/Makefile b/packages/extra/ggi/Makefile index 236d44c3a4..c85ca8159b 100644 --- a/packages/extra/ggi/Makefile +++ b/packages/extra/ggi/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gnome1/gconf/Makefile b/packages/extra/gnome1/gconf/Makefile index 75d3a9d4cf..33bd731f18 100644 --- a/packages/extra/gnome1/gconf/Makefile +++ b/packages/extra/gnome1/gconf/Makefile @@ -2023,8 +2023,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gnome1/gnome/Makefile b/packages/extra/gnome1/gnome/Makefile index dca1c09528..3bc9bbf97f 100644 --- a/packages/extra/gnome1/gnome/Makefile +++ b/packages/extra/gnome1/gnome/Makefile @@ -1978,8 +1978,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gnome1/zvt/Makefile b/packages/extra/gnome1/zvt/Makefile index 584e39aed1..98a5288071 100644 --- a/packages/extra/gnome1/zvt/Makefile +++ b/packages/extra/gnome1/zvt/Makefile @@ -2134,8 +2134,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gtk/Makefile b/packages/extra/gtk/Makefile index 98e42added..194a5244b0 100644 --- a/packages/extra/gtk/Makefile +++ b/packages/extra/gtk/Makefile @@ -2101,8 +2101,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gtk/gtkgl/Makefile b/packages/extra/gtk/gtkgl/Makefile index cdcbdb99cb..e3d082751c 100644 --- a/packages/extra/gtk/gtkgl/Makefile +++ b/packages/extra/gtk/gtkgl/Makefile @@ -1789,8 +1789,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/gtk2/Makefile b/packages/extra/gtk2/Makefile index 1b1ceafe19..04723d0191 100644 --- a/packages/extra/gtk2/Makefile +++ b/packages/extra/gtk2/Makefile @@ -2187,8 +2187,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/hermes/Makefile b/packages/extra/hermes/Makefile index 2423e59454..b34c857b3a 100644 --- a/packages/extra/hermes/Makefile +++ b/packages/extra/hermes/Makefile @@ -1818,8 +1818,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/imlib/Makefile b/packages/extra/imlib/Makefile index eebad97844..c430438340 100644 --- a/packages/extra/imlib/Makefile +++ b/packages/extra/imlib/Makefile @@ -1901,8 +1901,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/ldap/Makefile b/packages/extra/ldap/Makefile index 047d280db2..c77803c164 100644 --- a/packages/extra/ldap/Makefile +++ b/packages/extra/ldap/Makefile @@ -1549,8 +1549,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/libcurl/Makefile b/packages/extra/libcurl/Makefile index f4f26c739e..84bbbabdfe 100644 --- a/packages/extra/libcurl/Makefile +++ b/packages/extra/libcurl/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/libgd/Makefile b/packages/extra/libgd/Makefile index 24bdf1fd67..5db62b9e1d 100644 --- a/packages/extra/libgd/Makefile +++ b/packages/extra/libgd/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/libpng/Makefile b/packages/extra/libpng/Makefile index 4365649eb7..14c39a0741 100644 --- a/packages/extra/libpng/Makefile +++ b/packages/extra/libpng/Makefile @@ -1588,8 +1588,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/lua/Makefile b/packages/extra/lua/Makefile index 485b6786b4..dd7032e3c5 100644 --- a/packages/extra/lua/Makefile +++ b/packages/extra/lua/Makefile @@ -1473,8 +1473,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/mad/Makefile b/packages/extra/mad/Makefile index 2853639c35..4fe5ebdb96 100644 --- a/packages/extra/mad/Makefile +++ b/packages/extra/mad/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/matroska/Makefile b/packages/extra/matroska/Makefile index 4891f58025..46f3eac33c 100644 --- a/packages/extra/matroska/Makefile +++ b/packages/extra/matroska/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/modplug/Makefile b/packages/extra/modplug/Makefile index 8c71169e58..7cff5a93b1 100644 --- a/packages/extra/modplug/Makefile +++ b/packages/extra/modplug/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/ncurses/Makefile b/packages/extra/ncurses/Makefile index 0aac7f9d00..ba0837a1bd 100644 --- a/packages/extra/ncurses/Makefile +++ b/packages/extra/ncurses/Makefile @@ -1664,8 +1664,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/newt/Makefile b/packages/extra/newt/Makefile index 7914c56fc6..589daa5c54 100644 --- a/packages/extra/newt/Makefile +++ b/packages/extra/newt/Makefile @@ -1666,8 +1666,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/numlib/Makefile b/packages/extra/numlib/Makefile index bbc490e65d..f6da5c66ee 100644 --- a/packages/extra/numlib/Makefile +++ b/packages/extra/numlib/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/oggvorbis/Makefile b/packages/extra/oggvorbis/Makefile index c33972a3a8..0eef2c07c1 100644 --- a/packages/extra/oggvorbis/Makefile +++ b/packages/extra/oggvorbis/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/openal/Makefile b/packages/extra/openal/Makefile index cb5b7fa829..82ca01c828 100644 --- a/packages/extra/openal/Makefile +++ b/packages/extra/openal/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/opengl/Makefile b/packages/extra/opengl/Makefile index b6e7b13b3a..cd261a65a1 100644 --- a/packages/extra/opengl/Makefile +++ b/packages/extra/opengl/Makefile @@ -1709,8 +1709,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/openssl/Makefile b/packages/extra/openssl/Makefile index ad67bdc809..5c65a2c495 100644 --- a/packages/extra/openssl/Makefile +++ b/packages/extra/openssl/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/os2units/clkdll/Makefile b/packages/extra/os2units/clkdll/Makefile index 00e1e6f6c4..bba67ba704 100644 --- a/packages/extra/os2units/clkdll/Makefile +++ b/packages/extra/os2units/clkdll/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/os2units/ftpapi/Makefile b/packages/extra/os2units/ftpapi/Makefile index c5cd5737b2..f00b64cca1 100644 --- a/packages/extra/os2units/ftpapi/Makefile +++ b/packages/extra/os2units/ftpapi/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/os2units/hwvideo/Makefile b/packages/extra/os2units/hwvideo/Makefile index c78d51d9be..5610131393 100644 --- a/packages/extra/os2units/hwvideo/Makefile +++ b/packages/extra/os2units/hwvideo/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/os2units/lvm/Makefile b/packages/extra/os2units/lvm/Makefile index 59720085b5..23ef100a7d 100644 --- a/packages/extra/os2units/lvm/Makefile +++ b/packages/extra/os2units/lvm/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/os2units/mmtk/Makefile b/packages/extra/os2units/mmtk/Makefile index c1be691385..08b288cb85 100644 --- a/packages/extra/os2units/mmtk/Makefile +++ b/packages/extra/os2units/mmtk/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/palmunits/Makefile b/packages/extra/palmunits/Makefile index 003426d8c9..2461fbe236 100644 --- a/packages/extra/palmunits/Makefile +++ b/packages/extra/palmunits/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/pcap/Makefile b/packages/extra/pcap/Makefile index 2f2eac9edc..c13cdcda51 100644 --- a/packages/extra/pcap/Makefile +++ b/packages/extra/pcap/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/ptc/Makefile b/packages/extra/ptc/Makefile index 3d0de00fe9..6636f53156 100644 --- a/packages/extra/ptc/Makefile +++ b/packages/extra/ptc/Makefile @@ -2272,8 +2272,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/rexx/Makefile b/packages/extra/rexx/Makefile index 039087caad..c69d97db71 100644 --- a/packages/extra/rexx/Makefile +++ b/packages/extra/rexx/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/sdl/Makefile b/packages/extra/sdl/Makefile index 711ba2b9ae..f464aa6769 100644 --- a/packages/extra/sdl/Makefile +++ b/packages/extra/sdl/Makefile @@ -1664,8 +1664,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/sndfile/Makefile b/packages/extra/sndfile/Makefile index 3042a45c0d..cb72076a36 100644 --- a/packages/extra/sndfile/Makefile +++ b/packages/extra/sndfile/Makefile @@ -1820,8 +1820,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/svgalib/Makefile b/packages/extra/svgalib/Makefile index 63a426e911..bcdd32f9f0 100644 --- a/packages/extra/svgalib/Makefile +++ b/packages/extra/svgalib/Makefile @@ -1664,8 +1664,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/syslog/Makefile b/packages/extra/syslog/Makefile index 863139545e..a1557f7e8b 100644 --- a/packages/extra/syslog/Makefile +++ b/packages/extra/syslog/Makefile @@ -1664,8 +1664,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/tcl/Makefile b/packages/extra/tcl/Makefile index 5e5391450e..3b68e3c814 100644 --- a/packages/extra/tcl/Makefile +++ b/packages/extra/tcl/Makefile @@ -2074,8 +2074,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/univint/Makefile b/packages/extra/univint/Makefile index ce8ceb22f3..844e2b5064 100644 --- a/packages/extra/univint/Makefile +++ b/packages/extra/univint/Makefile @@ -1784,8 +1784,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/unixutil/Makefile b/packages/extra/unixutil/Makefile index 6baacc46b4..a9eabdf4c7 100644 --- a/packages/extra/unixutil/Makefile +++ b/packages/extra/unixutil/Makefile @@ -2150,8 +2150,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/unzip/Makefile b/packages/extra/unzip/Makefile index 3a21ae224b..3cf05ec96b 100644 --- a/packages/extra/unzip/Makefile +++ b/packages/extra/unzip/Makefile @@ -1471,8 +1471,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/utmp/Makefile b/packages/extra/utmp/Makefile index 046774a866..3f7819922c 100644 --- a/packages/extra/utmp/Makefile +++ b/packages/extra/utmp/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/uuid/Makefile b/packages/extra/uuid/Makefile index 7ef8e6133f..0a58393f6e 100644 --- a/packages/extra/uuid/Makefile +++ b/packages/extra/uuid/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/x11/Makefile b/packages/extra/x11/Makefile index 145450529d..dc020caf15 100644 --- a/packages/extra/x11/Makefile +++ b/packages/extra/x11/Makefile @@ -1510,8 +1510,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/extra/zlib/Makefile b/packages/extra/zlib/Makefile index f0f8811acc..0119478c64 100644 --- a/packages/extra/zlib/Makefile +++ b/packages/extra/zlib/Makefile @@ -1508,8 +1508,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-base/Makefile b/packages/fcl-base/Makefile index 194589ac1e..0362c28b4b 100644 --- a/packages/fcl-base/Makefile +++ b/packages/fcl-base/Makefile @@ -2581,8 +2581,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/Makefile b/packages/fcl-db/Makefile index a6310768a9..c8d21cab9f 100644 --- a/packages/fcl-db/Makefile +++ b/packages/fcl-db/Makefile @@ -2984,8 +2984,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/dbase/Makefile b/packages/fcl-db/src/dbase/Makefile index 7a8bf72cb0..a587a03fd2 100644 --- a/packages/fcl-db/src/dbase/Makefile +++ b/packages/fcl-db/src/dbase/Makefile @@ -1846,8 +1846,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/memds/Makefile b/packages/fcl-db/src/memds/Makefile index 27c51d4f5d..4cc540872b 100644 --- a/packages/fcl-db/src/memds/Makefile +++ b/packages/fcl-db/src/memds/Makefile @@ -1783,8 +1783,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sdf/Makefile b/packages/fcl-db/src/sdf/Makefile index 9ada184605..f91a57ad49 100644 --- a/packages/fcl-db/src/sdf/Makefile +++ b/packages/fcl-db/src/sdf/Makefile @@ -1627,8 +1627,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/Makefile b/packages/fcl-db/src/sqldb/Makefile index d688f1479b..89b9733f9e 100644 --- a/packages/fcl-db/src/sqldb/Makefile +++ b/packages/fcl-db/src/sqldb/Makefile @@ -2175,8 +2175,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/interbase/Makefile b/packages/fcl-db/src/sqldb/interbase/Makefile index 1dfe20ea86..5b19a1e036 100644 --- a/packages/fcl-db/src/sqldb/interbase/Makefile +++ b/packages/fcl-db/src/sqldb/interbase/Makefile @@ -1742,8 +1742,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/mysql/Makefile b/packages/fcl-db/src/sqldb/mysql/Makefile index 1886c41572..c1e57ebf5b 100644 --- a/packages/fcl-db/src/sqldb/mysql/Makefile +++ b/packages/fcl-db/src/sqldb/mysql/Makefile @@ -1742,8 +1742,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/odbc/Makefile b/packages/fcl-db/src/sqldb/odbc/Makefile index c47a46021d..07c55c2076 100644 --- a/packages/fcl-db/src/sqldb/odbc/Makefile +++ b/packages/fcl-db/src/sqldb/odbc/Makefile @@ -1742,8 +1742,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/oracle/Makefile b/packages/fcl-db/src/sqldb/oracle/Makefile index 7009d7fb40..a2d34ede14 100644 --- a/packages/fcl-db/src/sqldb/oracle/Makefile +++ b/packages/fcl-db/src/sqldb/oracle/Makefile @@ -1742,8 +1742,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/postgres/Makefile b/packages/fcl-db/src/sqldb/postgres/Makefile index 0c8a7dd5bd..39523c8ba5 100644 --- a/packages/fcl-db/src/sqldb/postgres/Makefile +++ b/packages/fcl-db/src/sqldb/postgres/Makefile @@ -1898,8 +1898,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqldb/sqlite/Makefile b/packages/fcl-db/src/sqldb/sqlite/Makefile index bb9141ee65..6f60c14b9f 100644 --- a/packages/fcl-db/src/sqldb/sqlite/Makefile +++ b/packages/fcl-db/src/sqldb/sqlite/Makefile @@ -1705,8 +1705,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-db/src/sqlite/Makefile b/packages/fcl-db/src/sqlite/Makefile index 9a1dc4eb18..5b89d4285b 100644 --- a/packages/fcl-db/src/sqlite/Makefile +++ b/packages/fcl-db/src/sqlite/Makefile @@ -1549,8 +1549,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-fpcunit/Makefile b/packages/fcl-fpcunit/Makefile index 765326c931..b1c1cc8ec9 100644 --- a/packages/fcl-fpcunit/Makefile +++ b/packages/fcl-fpcunit/Makefile @@ -2291,8 +2291,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-fpcunit/src/exampletests/Makefile b/packages/fcl-fpcunit/src/exampletests/Makefile index db7e875858..abad87959c 100644 --- a/packages/fcl-fpcunit/src/exampletests/Makefile +++ b/packages/fcl-fpcunit/src/exampletests/Makefile @@ -2213,8 +2213,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-fpcunit/src/tests/Makefile b/packages/fcl-fpcunit/src/tests/Makefile index ea95331670..3dc42ddf60 100644 --- a/packages/fcl-fpcunit/src/tests/Makefile +++ b/packages/fcl-fpcunit/src/tests/Makefile @@ -2213,8 +2213,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-image/Makefile b/packages/fcl-image/Makefile index 0c977c8354..58476db4c6 100644 --- a/packages/fcl-image/Makefile +++ b/packages/fcl-image/Makefile @@ -2581,8 +2581,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-net/Makefile b/packages/fcl-net/Makefile index b5cdd1671f..ce4dcfd1e2 100644 --- a/packages/fcl-net/Makefile +++ b/packages/fcl-net/Makefile @@ -2489,8 +2489,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-net/src/tests/Makefile b/packages/fcl-net/src/tests/Makefile index 2a42e8e8fe..b5360ff4a5 100644 --- a/packages/fcl-net/src/tests/Makefile +++ b/packages/fcl-net/src/tests/Makefile @@ -2445,8 +2445,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-passrc/Makefile b/packages/fcl-passrc/Makefile index 320a0287d6..70c21c7899 100644 --- a/packages/fcl-passrc/Makefile +++ b/packages/fcl-passrc/Makefile @@ -1939,8 +1939,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-registry/Makefile b/packages/fcl-registry/Makefile index b11503e71e..36a820628f 100644 --- a/packages/fcl-registry/Makefile +++ b/packages/fcl-registry/Makefile @@ -2291,8 +2291,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-web/Makefile b/packages/fcl-web/Makefile index 17bcb8e355..c17f07457f 100644 --- a/packages/fcl-web/Makefile +++ b/packages/fcl-web/Makefile @@ -2850,8 +2850,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fcl-xml/Makefile b/packages/fcl-xml/Makefile index 7ff50bd49e..f5fdc27be1 100644 --- a/packages/fcl-xml/Makefile +++ b/packages/fcl-xml/Makefile @@ -2369,8 +2369,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/packages/fpmkunit/Makefile b/packages/fpmkunit/Makefile index 6f67938098..7b71804255 100644 --- a/packages/fpmkunit/Makefile +++ b/packages/fpmkunit/Makefile @@ -1783,8 +1783,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile index 85e84eadd1..39afb579ff 100644 --- a/rtl/amiga/Makefile +++ b/rtl/amiga/Makefile @@ -1952,8 +1952,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index 4b5b419797..0cca8c1eeb 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -2108,8 +2108,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile index 3dd7964ba6..e71eaf0bed 100644 --- a/rtl/darwin/Makefile +++ b/rtl/darwin/Makefile @@ -1786,8 +1786,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index bfc30c558a..d86cae3115 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -1614,8 +1614,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile index 1e998f186f..0b1e2a9de7 100644 --- a/rtl/emx/Makefile +++ b/rtl/emx/Makefile @@ -1956,8 +1956,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index e68898c66d..451df5b183 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -1966,8 +1966,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile index 0b05ff0b5b..73628ce5ff 100644 --- a/rtl/gba/Makefile +++ b/rtl/gba/Makefile @@ -1796,8 +1796,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 530471708f..5b929cc7b6 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1956,8 +1956,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index e8af7da430..94f693d17d 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -2279,8 +2279,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile index 3ed923c399..3ad4093594 100644 --- a/rtl/macos/Makefile +++ b/rtl/macos/Makefile @@ -1616,8 +1616,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile index 4ac90fa968..bb4180fba3 100644 --- a/rtl/morphos/Makefile +++ b/rtl/morphos/Makefile @@ -1952,8 +1952,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile index facd1aa87e..436d6fae91 100644 --- a/rtl/nds/Makefile +++ b/rtl/nds/Makefile @@ -1796,8 +1796,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile index 08b4084b28..dba458c8b1 100644 --- a/rtl/netbsd/Makefile +++ b/rtl/netbsd/Makefile @@ -1966,8 +1966,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile index 881d4d2c13..aa5765539f 100644 --- a/rtl/netware/Makefile +++ b/rtl/netware/Makefile @@ -1958,8 +1958,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile index f658b1a0a6..77a213fba7 100644 --- a/rtl/netwlibc/Makefile +++ b/rtl/netwlibc/Makefile @@ -1953,8 +1953,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile index cf845f96a4..42a933e292 100644 --- a/rtl/openbsd/Makefile +++ b/rtl/openbsd/Makefile @@ -1966,8 +1966,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index ec72666d20..177456f9f8 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -1956,8 +1956,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile index 85128256b7..8d02f35a18 100644 --- a/rtl/palmos/Makefile +++ b/rtl/palmos/Makefile @@ -1796,8 +1796,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile index 30d0fb1636..adb784e5a1 100644 --- a/rtl/solaris/Makefile +++ b/rtl/solaris/Makefile @@ -1774,8 +1774,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile index 64b752d930..3855766146 100644 --- a/rtl/symbian/Makefile +++ b/rtl/symbian/Makefile @@ -1765,8 +1765,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile index b98a94526e..b1c72c1ebd 100644 --- a/rtl/watcom/Makefile +++ b/rtl/watcom/Makefile @@ -1954,8 +1954,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index a1b92ddc23..11549378c8 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -2112,8 +2112,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile index 5d3e2bf6da..990ab884fc 100644 --- a/rtl/win64/Makefile +++ b/rtl/win64/Makefile @@ -2108,8 +2108,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile index 7b34665f77..dfaba019a8 100644 --- a/rtl/wince/Makefile +++ b/rtl/wince/Makefile @@ -1617,8 +1617,8 @@ endif .PHONY: fpc_units ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile index 07cd873cc4..0f1c3ad5b1 100644 --- a/utils/fpcm/Makefile +++ b/utils/fpcm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/08/22] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/03/04] # 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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded @@ -1490,9 +1490,6 @@ ifeq ($(FULL_TARGET),i386-beos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_NETDB=1 -REQUIRE_PACKAGES_LIBASYNC=1 -REQUIRE_PACKAGES_PTHREADS=1 REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-netbsd) @@ -1522,7 +1519,6 @@ ifeq ($(FULL_TARGET),i386-netware) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-openbsd) @@ -1565,7 +1561,6 @@ ifeq ($(FULL_TARGET),i386-netwlibc) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_PASZLIB=1 -REQUIRE_PACKAGES_NETDB=1 REQUIRE_PACKAGES_FCL-BASE=1 endif ifeq ($(FULL_TARGET),i386-wince) @@ -2051,7 +2046,7 @@ override FPCOPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) -override FPCOPT+=-XP$(BINUTILSPREFIX) +override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc endif ifneq ($(BINUTILSPREFIX),) override FPCOPT+=-Xr$(RLINKPATH) @@ -2246,7 +2241,6 @@ vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR) -vpath %.inc $(COMPILER_INCLUDEDIR) vpath %$(OEXT) $(COMPILER_UNITTARGETDIR) vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR) .PHONY: fpc_shared diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index bd39dc0b9e..87aac443c1 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1558,12 +1558,11 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifneq ($(TARGET_UNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010, #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))'+ - ')'#010+ - 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET'+ - '_IMPLICITUNITS)))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ + 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEA','NPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFI','LES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ @@ -1572,7 +1571,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '[exerules]'#010+ '#####################################################################'#010+ '# Exes'#010+ - '#######################################','#############################'+ + '#############################################################','#######'+ '#'#010+ #010+ '.PHONY: fpc_exes'#010+ @@ -1581,21 +1580,21 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ - 'override EXEOFILES:=$(addsuffix',' $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROG','RAMS)) $(addpre'+ 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ 'PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ - 'override INSTALLEXEFI','LES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ + 'overr','ide CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARG','ET_PROGRAMS))'#010+ - 'endif'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ + 'en','dif'#010+ 'endif'#010+ #010+ 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ @@ -1604,7 +1603,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ - '###################################','#################################'+ + '#########################################################','###########'+ '#'#010+ #010+ 'ifdef TARGET_RSTS'#010+ @@ -1615,26 +1614,27 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[examplerules]'#010+ - '#####################################################################'#010, - '# Examples'#010+ '#####################################################################'#010+ + '# Examples'#010+ + '###########','#########################################################'+ + '#'#010+ #010+ '.PHONY: fpc_examples'#010+ #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ - 'LES)) $(addsuffix .pas,$','(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ + 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(a','ddsuffix .lpr,$(TARGET'+ '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ - 'refix $(STA','TICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ + 'refix $(STATICLIBPREFIX),$(addsuf','fix $(STATICLIBEXT),$(TARGET_EXAMPL'+ 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'GET_EXAMPLES)))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANE','XEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $','(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1644,7 +1644,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLE','FILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _al','l,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ @@ -1653,7 +1653,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc','_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ + '.PHONY: fpc_all fpc_smart fpc_deb','ug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1664,9 +1664,9 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MA','KE) all DEBUG=1'#010+ + ' $(MAKE) all DEBUG=1'#010+ #010+ - 'fpc_release:'#010+ + 'fpc_r','elease:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ '# General compile rules, available for both possible .pp and .pas exte'+ @@ -1675,7 +1675,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ - ' ',' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ + ' $(MKDIRTREE) $(COMPI','LER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ @@ -1688,8 +1688,8 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEX','T): %.pp'#010+ - ' $(COMPILER) $<'#010+ + '%$(EXEEXT): %.pp'#010+ + ' $(COM','PILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ @@ -1704,20 +1704,20 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%','.res: %.rc'#010+ - ' windres -i $< -o $@'#010+ + '%.res: %.rc'#010+ + ' win','dres -i $< -o $@'#010+ #010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMP','ILER_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath',' %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ - '################################','####################################'+ + '######################################################','##############'+ '#'#010+ '# Library'#010+ '#####################################################################'#010+ @@ -1727,10 +1727,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override INSTALLTARGET+=fpc_shared_install'#010+ #010+ 'ifndef SHARED_LIBVERSION'#010+ - 'SHARED_LIBVERSION=$(FPC_VERSION)',#010+ + 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ #010+ - 'ifndef SHARED_LIBNAME'#010+ + 'ifndef SHARED_','LIBNAME'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ #010+ @@ -1740,16 +1740,16 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ - 'ifndef ','SHARED_LIBUNITS'#010+ - 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ + 'ifndef SHARED_LIBUNITS'#010+ + 'SHARED','_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ 'endif'#010+ #010+ 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ - ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 C','REATESMART=1'#010+ - 'ifneq ($(SHARED_BUILD),n)'#010+ + ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ + 'ifneq ($(','SHARED_BUILD),n)'#010+ ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ 'endif'#010+ @@ -1757,8 +1757,8 @@ const fpcmakeini : array[0..213,1..240] of char=( ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ - 'fpc_shared_instal','l:'#010+ - 'ifneq ($(SHARED_BUILD),n)'#010+ + 'fpc_shared_install:'#010+ + 'ifneq ($(SHARED_BUI','LD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ @@ -1767,15 +1767,16 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '[installrules',']'#010+ - '#####################################################################'#010+ + '[installrules]'#010+ + '####################','################################################'+ + '#'#010+ '# Install rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'ove','rride INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override INSTALLPPUFILES+','=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ @@ -1784,18 +1785,18 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - 'override INSTALLPPULINKFILES',':=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ + 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(','OEXT),$(INSTALLPPU'+ 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ - 'ifneq ($(UNITTARGETD','IRPREFIX),)'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ - '$(INSTALLPPUFILES)))'#010+ + 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ + 'override I','NSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdi'+ + 'r $(INSTALLPPUFILES)))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ - '# Implicitly install',' Package.fpc'#010+ - 'override INSTALL_CREATEPACKAGEFPC=1'#010+ + '# Implicitly install Package.fpc'#010+ + 'override ','INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ @@ -1805,8 +1806,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'fpc_install: all $(INSTALLTARGET)'#010, - 'ifdef INSTALLEXEFILES'#010+ + 'fpc_install: all $(INSTALLTARGET)'#010+ + 'ifdef INSTALLEXEFILES'#010, ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ @@ -1814,14 +1815,14 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ - 'ifdef INSTALL_CREATEP','ACKAGEFPC'#010+ - 'ifdef FPCMAKE'#010+ + 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ + 'ifdef FPCMAK','E'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ - ' $(FPCMAKE) -p -T$(CPU_TAR','GET)-$(OS_TARGET) Makefile.fpc'#010+ + ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Make','file.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -1830,15 +1831,15 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' $(INSTALL) $(INSTALLPPUFILES) $(I','NSTALL_UNITDIR)'#010+ - 'ifneq ($(INSTALLPPULINKFILES),)'#010+ + ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ + 'ifneq ','($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ - ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010, + ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' l','n -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1848,15 +1849,15 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ - ' ',' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ + ' $(MKDIR) $(INST','ALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef EXAMPLESOURCE','FILES'#010+ - ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + 'ifdef EXAMPLESOURCEFILES'#010+ + ' $(COPY) ','$(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ @@ -1864,7 +1865,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '[distinstallrules]'#010+ - '#####################################','###############################'+ + '###########################################################','#########'+ '#'#010+ '# Dist Install'#010+ '#####################################################################'#010+ @@ -1875,7 +1876,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[zipinstallrules]'#010+ - '####################################','################################'+ + '##########################################################','##########'+ '#'#010+ '# Zip'#010+ '#####################################################################'#010+ @@ -1883,7 +1884,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ - '# ','subdir, because the deltree can'#039't see the whole tree to remove'+ + '# subdir, because the de','ltree can'#039't see the whole tree to remove'+ #010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ @@ -1895,8 +1896,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ - 'ifdef DIST_ZIP','NAME'#010+ - 'ZIPNAME=$(DIST_ZIPNAME)'#010+ + 'ifdef DIST_ZIPNAME'#010+ + 'ZIPNAME=$(DIST_ZI','PNAME)'#010+ 'else'#010+ 'ZIPNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -1910,9 +1911,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifndef ZIPTARGET'#010+ 'ifdef DIST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ - 'else',#010+ + 'else'#010+ 'ZIPTARGET=install'#010+ - 'endif'#010+ + 'end','if'#010+ 'endif'#010+ #010+ '# Use tar by default under linux'#010+ @@ -1927,8 +1928,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able to run in the current OS ','so fix'#010+ - '# the path separator'#010+ + '# We need to be able to run in the current OS so fix'#010+ + '# the path sepa','rator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ @@ -1937,37 +1938,37 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD_CDPACK:=cd $(subst /,$(','ZIPPATHSEP),$(PACKDIR))'#010+ + 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)',')'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPN','AME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ - 'TFILE) *'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ + 'ZIPCMD_Z','IP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+ + 'ESTFILE) *'#010+ 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ - ' $(DEL) $(ZIPDES','TFILE)'#010+ - 'ifdef USEZIPWRAPPER'#010+ + ' $(DEL) $(ZIPDESTFILE)'#010+ + 'ifdef USEZIPWRA','PPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(','ZIPWRAPPE'+ - 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ - 'ER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ + #010+ + ' $(','ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+ + 'PPER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ - 'ifdef ','inUnix'#010+ - ' /bin/sh $(ZIPWRAPPER)'#010+ + 'ifdef inUnix'#010+ + ' /bin/sh',' $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPWRAPPER)'#010+ 'endif'#010+ @@ -1978,7 +1979,7 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(DELTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ - ' $(MAKE) f','pc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(Z'+ + ' $(MAKE) fpc_zipinstall ZIPTARGE','T=sourceinstall ZIPSUFFIX=$(Z'+ 'IPSOURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ @@ -1988,7 +1989,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ - ' $(MAKE) fp','c_zipinstall ZIPTARGET=distinstall'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET','=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ @@ -1996,9 +1997,9 @@ const fpcmakeini : array[0..213,1..240] of char=( '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cleanall fpc_','distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ - 'ifdef EXEFILES'#010+ + 'ifdef EXEFI','LES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ 'endif'#010+ @@ -2008,21 +2009,21 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:','=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(O','EXT),$(CLEANPPUFILE'+ 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ - 'override ','CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ + 'override CLEANPPULINKFILES+=$(s','ubst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ 'PPUFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ - 'IX),$(CLEANPPULIN','KFILES)))'#010+ + 'IX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ - 'fpc_clean: $(CLEANTARGET)'#010+ + 'fpc_c','lean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ @@ -2032,8 +2033,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef ','CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' ','-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+ + #010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ @@ -2041,7 +2043,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) Pack','age.fpc $(PPAS) script.res link.res $'+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script','.res link.res $'+ '(FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ #010+ @@ -2050,8 +2052,8 @@ const fpcmakeini : array[0..213,1..240] of char=( ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'ifdef CLEANPPU','FILES'#010+ - ' -$(DEL) $(CLEANPPUFILES)'#010+ + 'ifdef CLEANPPUFILES'#010+ + ' -$(DEL) ','$(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ @@ -2060,14 +2062,14 @@ const fpcmakeini : array[0..213,1..240] of char=( ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'endif'#010+ - ' -$(DELTREE) u','nits'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DELTREE) units'#010+ + ' -$(DEL) *','$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) fpcmade.* Package.fpc $(','PPAS) script.res link.res $('+ + ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.','res $('+ 'FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ @@ -2081,7 +2083,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '######','##############################################################'+ + '############################','########################################'+ '#'#010+ '# Base info rules'#010+ '#####################################################################'#010+ @@ -2091,93 +2093,93 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override INFORULES+=fpc_baseinfo'#010+ #010+ 'fpc_baseinfo:'#010+ - ' @$(ECHO)'#010, - ' @$(ECHO) == Package info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == P','ackage info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) F','PC.......... $(FPC)'#010+ - ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ + ' @$(ECHO) FPC.......... $(FPC)'#010+ + ' ',' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ - ' @$(ECHO) Target OS.... $(OS','_TARGET)'#010+ - ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ + ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ + ' @$(EC','HO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Dir','ectory info =='#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) == Directory info =='#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ - ' @$(ECHO) CrossBinDir..... $(CROSSBIN','DIR)'#010+ - ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ + ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ + ' @$(ECHO) ',' UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' ',' @$(ECHO) == Tools info =='#010+ + ' @$(ECHO) == Tools i','nfo =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Mv........ $(MVPROG',')'#010+ - ' @$(ECHO) Cp........ $(CPPROG)'#010+ + ' @$(ECHO) Mv........ $(MVPROG)'#010+ + ' @$(ECHO) Cp','........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' ',' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ + ' @$(ECHO) FPCMake... ','$(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ',' Target Loaders........ $(TARGET_LOADERS)'#010+ + ' @$(ECHO) Target Loaders.......','. $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ - ' @$(ECHO)',' Target Dirs........... $(TARGET_DIRS)'#010+ + ' @$(ECHO) Target Dirs.........','.. $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ - ' ',' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ + ' @$(ECHO) Clean File','s......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ - ' @','$(ECHO)'#010+ - ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECH','O) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ - ' @$(ECHO) Z','ipSuffix............ $(ZIPSUFFIX)'#010+ + ' @$(ECHO) ZipSuffix............ $','(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ - ' @$(EC','HO) Install binary dir... $(INSTALL_BINDIR)'#010+ + ' @$(ECHO) Install binary di','r... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ - ' @$(ECHO) ',' Install doc dir...... $(INSTALL_DOCDIR)'#010+ + ' @$(ECHO) Install doc dir......',' $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ - ' ',' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ + ' @$(ECHO) Dist zip ','name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ @@ -2185,16 +2187,16 @@ const fpcmakeini : array[0..213,1..240] of char=( '# Info rules'#010+ '#####################################################################'#010+ #010+ - '.PHON','Y: fpc_info'#010+ + '.PHONY: fpc_info'#010+ #010+ - 'fpc_info: $(INFORULES)'#010+ + 'fpc_info:',' $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_makefile fpc_ma','kefiles fpc_makefile_sub1 fpc_makefile_su'+ + '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_s','ub1 fpc_makefile_su'+ 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ @@ -2203,10 +2205,10 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(','TAR'+ - 'GET_DIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_DIRS))'#010+ 'endif'#010+ - 'ifdef TARGET_EXAMPLEDIRS'#010+ + 'if','def TARGET_EXAMPLEDIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ @@ -2214,17 +2216,16 @@ const fpcmakeini : array[0..213,1..240] of char=( 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ 'EXAMPLEDIRS))'#010+ #010+ - 'fpc_makefile_dirs',': fpc_makefile_sub1 fpc_makefile_sub2'#010+ + 'fpc_makefile_dirs: fpc_makefile_sub1 fp','c_makefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ - '###################################################','#################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc),)'#010+ + 'if','neq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -2232,18 +2233,18 @@ const fpcmakeini : array[0..213,1..240] of char=( '[userrules]'#010+ '#####################################################################'#010+ '# Users rules'#010+ - '###############################################################','#####'+ - '#'#010+ + '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '#####################################################################'#010+ + '###','#################################################################'+ + '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ - 'ifneq ($(findstring $(OS_TARGET),','win32 win64),)'#010+ - 'LCL_PLATFORM=win32'#010+ + 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ + 'LCL_PLA','TFORM=win32'#010+ 'else'#010+ 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ @@ -2254,8 +2255,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ - 'ove','rride LCLDIR=wrong'#010+ - 'endif'#010+ + 'override LCLDIR=wrong'#010+ + 'end','if'#010+ 'else'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2264,43 +2265,43 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef DEFAULT_LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ - 'override LCLDIR=wro','ng'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Check for development version'#010+ + '# Chec','k for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ - 'override LCLDIR','=wrong'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Check for release version'#010+ + '# ','Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ - 'override LCLD','IR=wrong'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ - #010+ + #010, '# Generate dirs'#010+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ 'IR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#010+ - 'export LCLDIR LCLUNITDIR ','LCLCOMPONENTDIR'#010+ + 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ - '# Add LCL dirs to paths'#010+ + '# Add',' LCL dirs to paths'#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '######','##############################################################'+ + '############################','########################################'+ '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ @@ -2310,7 +2311,7 @@ const fpcmakeini : array[0..213,1..240] of char=( ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ - ' @$(ECHO',') LCLDIR............... $(LCLDIR)'#010+ + ' @$(ECHO) LCLDIR.............','.. $(LCLDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index bb85a9f96f..d8d4d56383 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -1510,8 +1510,8 @@ endif ifneq ($(TARGET_UNITS),) override ALLTARGET+=fpc_units -override UNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_UNITS))) -override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT), $(notdir $(TARGET_IMPLICITUNITS))) +override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS)) +override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS)) override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES) endif