diff --git a/compiler/Makefile b/compiler/Makefile index 8f3c4b3af2..ddc38cdfad 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fpcompiler diff --git a/compiler/new/Makefile b/compiler/new/Makefile index 2600f30920..c7c84bf7c2 100644 --- a/compiler/new/Makefile +++ b/compiler/new/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fpcompiler diff --git a/fcl/Makefile b/fcl/Makefile index 7db7429ded..826467dfe5 100644 --- a/fcl/Makefile +++ b/fcl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/fcl/db/Makefile b/fcl/db/Makefile index 99610cf4d9..0c3379778a 100644 --- a/fcl/db/Makefile +++ b/fcl/db/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/fcl/db/dbase/Makefile b/fcl/db/dbase/Makefile index 29654970de..d157067aa5 100644 --- a/fcl/db/dbase/Makefile +++ b/fcl/db/dbase/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/fcl/db/interbase/Makefile b/fcl/db/interbase/Makefile index 5d83110ccc..161adf61b2 100644 --- a/fcl/db/interbase/Makefile +++ b/fcl/db/interbase/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/fcl/db/mysql/Makefile b/fcl/db/mysql/Makefile index 9e81f478f4..43a9976a92 100644 --- a/fcl/db/mysql/Makefile +++ b/fcl/db/mysql/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/fcl/db/tests/Makefile b/fcl/db/tests/Makefile index ca71634a67..449b7b9761 100644 --- a/fcl/db/tests/Makefile +++ b/fcl/db/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=testds createds tested diff --git a/fcl/shedit/Makefile b/fcl/shedit/Makefile index 53eb5f10a4..b4c1e3eccc 100644 --- a/fcl/shedit/Makefile +++ b/fcl/shedit/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile index 369eb1fc4f..22bf2d494c 100644 --- a/fcl/shedit/gtk/Makefile +++ b/fcl/shedit/gtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=gtkdemo diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile index 2a9304b468..c3b528f91c 100644 --- a/fcl/tests/Makefile +++ b/fcl/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=stringl dparser fstream mstream list threads testrtf cfgtest xmldump htdump testcgi tidea b64test b64test2 b64enc b64dec restest testz testz2 istream doecho diff --git a/fcl/xml/Makefile b/fcl/xml/Makefile index f9acd0df00..cadf05512d 100644 --- a/fcl/xml/Makefile +++ b/fcl/xml/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fcl diff --git a/ide/Makefile b/ide/Makefile index 398d3ba774..337aa96168 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=ide diff --git a/ide/fake/Makefile b/ide/fake/Makefile index 00f3bcdb2e..9da22c445c 100644 --- a/ide/fake/Makefile +++ b/ide/fake/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_DIRS+=compiler gdb diff --git a/ide/fake/compiler/Makefile b/ide/fake/compiler/Makefile index 1ba3afb443..17d30d2637 100644 --- a/ide/fake/compiler/Makefile +++ b/ide/fake/compiler/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_UNITS+=browcol compiler systems version comphook globtype tokens diff --git a/ide/fake/gdb/Makefile b/ide/fake/gdb/Makefile index 80ae5cbdcc..8c3a0170ed 100644 --- a/ide/fake/gdb/Makefile +++ b/ide/fake/gdb/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_UNITS+=gdbcon gdbint diff --git a/ide/text/Makefile b/ide/text/Makefile index f84fdf4645..3266ca048d 100644 --- a/ide/text/Makefile +++ b/ide/text/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifeq ($(OS_TARGET),linux) diff --git a/install/demo/Makefile b/install/demo/Makefile index de12526303..ee47ad3b68 100644 --- a/install/demo/Makefile +++ b/install/demo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=demo diff --git a/install/demo/graph/Makefile b/install/demo/graph/Makefile index 34b11bb9b0..2940bf032d 100644 --- a/install/demo/graph/Makefile +++ b/install/demo/graph/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifdef GRAPHICS diff --git a/install/demo/linux/Makefile b/install/demo/linux/Makefile index 298f859e14..26020ef2d9 100644 --- a/install/demo/linux/Makefile +++ b/install/demo/linux/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifeq ($(OS_TARGET),linux) diff --git a/install/demo/modex/Makefile b/install/demo/modex/Makefile index 16e91eec4e..4b6eb50ec6 100644 --- a/install/demo/modex/Makefile +++ b/install/demo/modex/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifeq ($(OS_TARGET),go32v2) diff --git a/install/demo/os2/Makefile b/install/demo/os2/Makefile index a0dc2fe275..ae09b07005 100644 --- a/install/demo/os2/Makefile +++ b/install/demo/os2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifeq ($(OS_TARGET),os2) diff --git a/install/demo/text/Makefile b/install/demo/text/Makefile index 733898e6f3..6596b40a3c 100644 --- a/install/demo/text/Makefile +++ b/install/demo/text/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=eratos qsort hello blackbox magic lines diff --git a/install/demo/win32/Makefile b/install/demo/win32/Makefile index 257cfe645b..659b666e24 100644 --- a/install/demo/win32/Makefile +++ b/install/demo/win32/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifeq ($(OS_TARGET),win32) diff --git a/install/fpinst/Makefile b/install/fpinst/Makefile index 683aa4fa46..35749eb87a 100644 --- a/install/fpinst/Makefile +++ b/install/fpinst/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fpinst diff --git a/packages/Makefile b/packages/Makefile index 906d0d1176..c808669668 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifeq ($(OS_TARGET),linux) diff --git a/packages/cmem/Makefile b/packages/cmem/Makefile index f6dbeac289..ff05c1686d 100644 --- a/packages/cmem/Makefile +++ b/packages/cmem/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=cmem diff --git a/packages/forms/Makefile b/packages/forms/Makefile index 47e0056e24..743830e848 100644 --- a/packages/forms/Makefile +++ b/packages/forms/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=forms diff --git a/packages/forms/demo/Makefile b/packages/forms/demo/Makefile index 64cf423220..8f0e0dcef8 100644 --- a/packages/forms/demo/Makefile +++ b/packages/forms/demo/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=pushme yesno pushbutton touchbutton minput inputall choice butttypes colsel colsel1 buttonall chartall positioner secretinput cursor fdial ldial ndial invslider sliderall borderwidth boxtype xyplotover arrowbutton browserop browserall chartstrip colbrowser counter fbrowse1 fbrowse flclock fonts goodies lalign ll longlabel menu objinactive objpos newbutton multilabel objreturn diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index ddf545b8eb..dd9f563865 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=gdbint diff --git a/packages/gdbint/libgdb/Makefile b/packages/gdbint/libgdb/Makefile index b2452d65ac..ff5d55888d 100644 --- a/packages/gdbint/libgdb/Makefile +++ b/packages/gdbint/libgdb/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifndef ECHO diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index f419bc7c80..6e7ffa1d52 100644 --- a/packages/ggi/Makefile +++ b/packages/ggi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=ggi diff --git a/packages/gtk/Makefile b/packages/gtk/Makefile index f5735cc76b..3402bb8972 100644 --- a/packages/gtk/Makefile +++ b/packages/gtk/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=gtk diff --git a/packages/gtk/examples/Makefile b/packages/gtk/examples/Makefile index 15aaf540d0..5b0966dee0 100644 --- a/packages/gtk/examples/Makefile +++ b/packages/gtk/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_DIRS+=tutorial diff --git a/packages/gtk/examples/tutorial/Makefile b/packages/gtk/examples/tutorial/Makefile index 814c565582..639c41c7d0 100644 --- a/packages/gtk/examples/tutorial/Makefile +++ b/packages/gtk/examples/tutorial/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifndef ECHO diff --git a/packages/gtk/gtkgl/Makefile b/packages/gtk/gtkgl/Makefile index d234f423f7..ea0c623972 100644 --- a/packages/gtk/gtkgl/Makefile +++ b/packages/gtk/gtkgl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=gtk diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index c2a8efd869..b7a1c6fb31 100644 --- a/packages/ibase/Makefile +++ b/packages/ibase/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=ibase diff --git a/packages/inet/Makefile b/packages/inet/Makefile index 8f9aa8d728..de055e66e9 100644 --- a/packages/inet/Makefile +++ b/packages/inet/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=inet diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index c248909237..cae48427ff 100644 --- a/packages/mysql/Makefile +++ b/packages/mysql/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=mysql diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index bb161a08bb..fb4341fa3b 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=ncurses diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index 01b16cee6d..8eb0ced5e7 100644 --- a/packages/opengl/Makefile +++ b/packages/opengl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=opengl diff --git a/packages/opengl/build/Makefile b/packages/opengl/build/Makefile index f6be56a12c..fafde37db7 100644 --- a/packages/opengl/build/Makefile +++ b/packages/opengl/build/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all_units override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=c_gen diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile index d4ca8f98e2..1c1df05141 100644 --- a/packages/opengl/examples/Makefile +++ b/packages/opengl/examples/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -112,7 +112,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=glutdemo morph3d bounce diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile index e7712ef0ae..d485037347 100644 --- a/packages/oracle/Makefile +++ b/packages/oracle/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=oracle diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index c76a2d9615..8b7ebfc489 100644 --- a/packages/paszlib/Makefile +++ b/packages/paszlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=paszlib diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index e2e7f38015..0eca155e0a 100644 --- a/packages/postgres/Makefile +++ b/packages/postgres/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=postgres diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile index d3c65ffc47..2610f0959b 100644 --- a/packages/regexpr/Makefile +++ b/packages/regexpr/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=regexpr diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index 1538e27eb9..2917292603 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=svgalib diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index fb1cc936a2..772dd11e55 100644 --- a/packages/syslog/Makefile +++ b/packages/syslog/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=syslog diff --git a/packages/uncgi/Makefile b/packages/uncgi/Makefile index 3bf20a35ea..a7de60ea39 100644 --- a/packages/uncgi/Makefile +++ b/packages/uncgi/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=uncgi diff --git a/packages/unzip/Makefile b/packages/unzip/Makefile index ed2209c54e..8d03f669f0 100644 --- a/packages/unzip/Makefile +++ b/packages/unzip/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=unzip diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index a109603665..55e403d8e0 100644 --- a/packages/utmp/Makefile +++ b/packages/utmp/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=utmp diff --git a/packages/x11/Makefile b/packages/x11/Makefile index da38cd6cd9..2c39e1b2d2 100644 --- a/packages/x11/Makefile +++ b/packages/x11/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=x11 diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index f0dd53cb33..9185834959 100644 --- a/packages/zlib/Makefile +++ b/packages/zlib/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=zlib diff --git a/rtl/Makefile b/rtl/Makefile index 81b7d98be4..af8ae3c92f 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 81b6dc3f7a..6462d474bd 100644 --- a/rtl/freebsd/Makefile +++ b/rtl/freebsd/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -122,7 +122,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl diff --git a/rtl/go32v1/Makefile b/rtl/go32v1/Makefile index 99d2253484..f4ea91e909 100644 --- a/rtl/go32v1/Makefile +++ b/rtl/go32v1/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -122,7 +122,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index f3e7b0401c..9271b1034c 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -122,7 +122,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 4dc730f5a1..a7a236c039 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -122,7 +122,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index adf56eb8c3..f6b375ade6 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -122,7 +122,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 5efe1b5f6d..29db865569 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -122,7 +122,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=rtl @@ -142,7 +141,7 @@ OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph include $(WININC)/makefile.inc WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) -override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings windows ole2 opengl32 os_types winsock initc dos crt objects graph sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo wincrt winmouse winevent sockets printer dynlibs video mouse keyboard callspec +override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings windows ole2 opengl32 os_types winsock initc dos crt objects graph sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo wincrt winmouse winevent sockets printer dynlibs video mouse keyboard override TARGET_LOADERS+=wprt0 wdllprt0 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) diff --git a/tests/Makefile b/tests/Makefile index fd3346281b..0a12908dad 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: alltests override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) ifndef ECHO diff --git a/tests/units/Makefile b/tests/units/Makefile index 3861222cae..36f6e71969 100644 --- a/tests/units/Makefile +++ b/tests/units/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_UNITS+=erroru diff --git a/utils/Makefile b/utils/Makefile index 30b009c2e5..f967ae6b65 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override PACKAGE_NAME=fputils diff --git a/utils/fpcm/Makefile b/utils/fpcm/Makefile index e7c29fe2f3..67f9ca476e 100644 --- a/utils/fpcm/Makefile +++ b/utils/fpcm/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=fpcmake diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 36ee028e49..3838db08c4 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -177,13 +177,12 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'override FPCDIR:=$(wildcard $(FPCDIR))'#010+ #010+ '# Units dir'#010+ 'UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ #010+ - '# Pac','kages dir'#010+ - 'PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)'#010+ + '# Packages dir'#010+ + 'PACKAGESDIR=$(wildcard $(FPCD','IR) $(FPCDIR)/packages)'#010+ #010+ #010+ '[shelltools]'#010+ @@ -191,9 +190,10 @@ const fpcmakeini : array[0..118,1..240] of char=( '# Shell tools'#010+ '#####################################################################'#010+ #010+ - '# echo'#010, + '# echo'#010+ 'ifndef ECHO'#010+ - 'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))'#010+ + 'ECHO:=$(strip $(wildcard $(','addsuffix /gecho$(EXEEXT),$(SEARCHPATH)))'+ + ')'#010+ 'ifeq ($(ECHO),)'#010+ 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+ ')'#010+ @@ -202,10 +202,10 @@ const fpcmakeini : array[0..118,1..240] of char=( 'else'#010+ 'ECHO:=$(firstword $(ECHO))'#010+ 'endif'#010+ - 'else'#010, + 'else'#010+ 'ECHO:=$(firstword $(ECHO))'#010+ 'endif'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# To copy pograms'#010+ 'ifndef COPY'#010+ @@ -224,11 +224,11 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Check delete program'#010+ 'ifndef DEL'#010+ - 'DEL:=r','m -f'#010+ + 'DEL:=rm -f'#010+ 'endif'#010+ #010+ '# Check deltree program'#010+ - 'ifndef DELTREE'#010+ + 'ifn','def DELTREE'#010+ 'DELTREE:=rm -rf'#010+ 'endif'#010+ #010+ @@ -244,9 +244,9 @@ const fpcmakeini : array[0..118,1..240] of char=( '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ - 'INST','ALLEXE:=install -c -m 755'#010+ + 'INSTALLEXE:=install -c -m 755'#010+ 'else'#010+ - 'INSTALLEXE:=$(COPY)'#010+ + 'INSTALLE','XE:=$(COPY)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -259,20 +259,21 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALL','EXE MKDIR'#010+ + 'export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR'#010+ #010+ #010+ '[defaulttools]'#010+ - '#####################################################################'#010+ + '############','########################################################'+ + '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ 'ifndef AS'#010+ - 'AS','=as'#010+ + 'AS=as'#010+ 'endif'#010+ #010+ - '# linker, but probably not used'#010+ + '# linker, but probably not u','sed'#010+ 'ifndef LD'#010+ 'LD=ld'#010+ 'endif'#010+ @@ -289,7 +290,7 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# ppumove'#010+ 'ifndef PPUMOVE'#010+ - 'PPUMOVE:=$(strip $(wildca','rd $(addsuffix /ppumove$(SRCEXEEXT),$(SEARC'+ + 'PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(S','EARC'+ 'HPATH))))'#010+ 'ifeq ($(PPUMOVE),)'#010+ 'PPUMOVE='#010+ @@ -301,10 +302,10 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# ppufiles'#010+ 'ifndef PPUFILES'#010+ - 'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(S','EA'+ - 'RCHPATH))))'#010+ + 'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARC'+ + 'HPATH))))'#010+ 'ifeq ($(PPUFILES),)'#010+ - 'PPUFILES='#010+ + 'PPUFI','LES='#010+ 'else'#010+ 'PPUFILES:=$(firstword $(PPUFILES))'#010+ 'endif'#010+ @@ -316,7 +317,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))'+ ')'#010+ 'ifeq ($(DATE),)'#010+ - 'DATE:=$(strip ','$(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH)'+ + 'DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEX','T),$(SEACHPATH)'+ ')))'#010+ 'ifeq ($(DATE),)'#010+ 'DATE='#010+ @@ -333,10 +334,10 @@ const fpcmakeini : array[0..118,1..240] of char=( 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ - 'endif'#010, + 'endif'#010+ #010+ - '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+ - 'uase'#010+ + '# Look if UPX is found for go32v2 and ','win32. We can'#039't use $UPX b'+ + 'ecuase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ @@ -346,7 +347,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'UPXPROG:=1'#010+ 'endif'#010+ 'ifdef UPXPROG'#010+ - 'UPXPROG:=$(strip $(','wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPAT'+ + 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$','(SEARCHPAT'+ 'H))))'#010+ 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ @@ -361,7 +362,7 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# ZipProg, you can'#039't use Zip as the var name (PFV)'#010+ 'ifndef ZIPPROG'#010+ - 'ZIPPR','OG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPAT'+ + 'ZIPPROG:=$(strip $(wildcard $(addsuffix /zip','$(SRCEXEEXT),$(SEARCHPAT'+ 'H))))'#010+ 'ifeq ($(ZIPPROG),)'#010+ 'ZIPPROG='#010+ @@ -376,8 +377,8 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Tar'#010+ 'ifndef TARPROG'#010+ - 'TARPROG:=$(strip $(wildcard $(add','suffix /tar$(SRCEXEEXT),$(SEARCHPAT'+ - 'H))))'#010+ + 'TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)'+ + '))',')'#010+ 'ifeq ($(TARPROG),)'#010+ 'TARPROG='#010+ 'else'#010+ @@ -396,7 +397,7 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '#######','#############################################################'+ + '##############################################','######################'+ '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ @@ -405,10 +406,10 @@ const fpcmakeini : array[0..118,1..240] of char=( 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ - 'PPUE','XT=.ppu'#010+ + 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ - 'SMARTEXT=.sl'#010+ + 'SMARTEXT=.sl'#010, 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ 'LIBPREFIX=lib'#010+ @@ -424,9 +425,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'SMARTEXT=.sl1'#010+ 'STATICLIBEXT=.a1'#010+ 'SHAREDLIBEXT=.so1'#010+ - 'LIBPREF','IX='#010+ + 'LIBPREFIX='#010+ 'FPCMADE=fpcmade.v1'#010+ - 'PACKAGESUFFIX=v1'#010+ + 'PACKAGESUFFIX=v1',#010+ 'endif'#010+ #010+ '# Go32v2'#010+ @@ -444,9 +445,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ZIPSUFFIX=linux'#010+ 'endif'#010+ #010+ - '# Li','nux'#010+ + '# Linux'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ - 'EXEEXT='#010+ + 'EXEEXT=',#010+ 'HASSHAREDLIB=1'#010+ 'FPCMADE=fpcmade.freebsd'#010+ 'ZIPSUFFIX=freebsd'#010+ @@ -461,11 +462,11 @@ const fpcmakeini : array[0..118,1..240] of char=( 'STATICLIBEXT=.aw'#010+ 'SHAREDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.w32'#010+ - 'Z','IPSUFFIX=w32'#010+ + 'ZIPSUFFIX=w32'#010+ 'endif'#010+ #010+ '# OS/2'#010+ - 'ifeq ($(OS_TARGET),os2)'#010+ + 'ifeq ($(OS_T','ARGET),os2)'#010+ 'PPUEXT=.ppo'#010+ 'ASMEXT=.so2'#010+ 'OEXT=.oo2'#010+ @@ -477,9 +478,8 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '[defaultdirs]'#010+ - '###################################################','#################'+ - '#'#010+ - '# Default Directories'#010+ + '#####################################################################'#010+ + '# Default Directorie','s'#010+ '#####################################################################'#010+ #010+ '# Units dir'#010+ @@ -489,8 +489,8 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Units dir'#010+ 'ifdef REQUIRE_PACKAGESDIR'#010+ - 'override ','PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ - 'endif'#010+ + 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ + 'end','if'#010+ #010+ #010+ '# Linux and freebsd use unix dirs with /usr/bin, /usr/lib'#010+ @@ -498,9 +498,9 @@ const fpcmakeini : array[0..118,1..240] of char=( '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ - 'ifeq ($(OS','_TARGET),linux)'#010+ + 'ifeq ($(OS_TARGET),linux)'#010+ 'UNIXINSTALLDIR=1'#010+ - 'endif'#010+ + 'endif'#010, 'ifeq ($(OS_TARGET),freebsd)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ @@ -514,8 +514,8 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# set the prefix dire','ctory where to install everything'#010+ - 'ifndef INSTALL_PREFIX'#010+ + '# set the prefix directory where to install everything'#010+ + 'ifnde','f INSTALL_PREFIX'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_PREFIX=/usr/local'#010+ 'else'#010+ @@ -526,18 +526,19 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Where to place the resulting zip files'#010+ 'ifndef DIST_DESTDIR'#010+ - 'DIST_DESTDIR:=$(B','ASEDIR)'#010+ + 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ 'export DIST_DESTDIR'#010+ #010+ #010+ - '#####################################################################'#010+ + '###','#################################################################'+ + '#'#010+ '# Install Directories'#010+ '#####################################################################'#010+ #010+ - '# set the base directory where to install',' everything'#010+ + '# set the base directory where to install everything'#010+ 'ifndef INSTALL_BASEDIR'#010+ - 'ifdef UNIXINSTALLDIR'#010+ + 'ifde','f UNIXINSTALLDIR'#010+ 'INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ 'INSTALL_BASEDIR=$(INSTALL_PREFIX)'#010+ @@ -546,8 +547,8 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# set the directory where to install the binaries'#010+ 'ifndef INSTALL_BINDIR'#010+ - 'ifd','ef UNIXINSTALLDIR'#010+ - 'INSTALL_BINDIR=$(INSTALL_PREFIX)/bin'#010+ + 'ifdef UNIXINSTALLDIR'#010+ + 'INSTALL_BINDIR=$(INST','ALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)'#010+ 'endif'#010+ @@ -555,9 +556,9 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ - 'INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS','_TARGET)'#010+ + 'INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)'#010+ 'ifdef PACKAGE_NAME'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ + 'INSTALL_UNI','TDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -566,19 +567,19 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ - 'INSTALL_LIBDIR=$(INSTALL_U','NITDIR)'#010+ + 'INSTALL_LIBDIR=$(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Where the source files will be stored'#010+ + '# Where the source',' files will be stored'#010+ 'ifndef INSTALL_SOURCEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source'#010+ 'endif'#010+ - 'ifdef PACKAGE_NAME'#010, - 'INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)'#010+ + 'ifdef PACKAGE_NAME'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)','/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -587,17 +588,17 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)'#010+ 'else'#010+ - 'INSTALL_DOCDIR=$(INSTALL_BASED','IR)/doc'#010+ + 'INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Where to install the examples, under linux we use the doc dir'#010+ + '# Where to install',' the examples, under linux we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples'#010+ - 'els','e'#010+ - 'INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples'#010+ + 'else'#010+ + 'INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)','/examples'#010+ 'endif'#010+ 'ifdef EXAMPLESUBDIR'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)'#010+ @@ -606,20 +607,20 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Where the some extra (data)files will be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ - 'INSTALL_DATADIR=$(IN','STALL_BASEDIR)'#010+ + 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ #010+ '[dirlibc]'#010+ - '# On linux, try to find where libgcc.a is.'#010+ + '# On l','inux, try to find where libgcc.a is.'#010+ 'ifdef inUnix'#010+ 'ifndef GCCLIBDIR'#010+ 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ print'+ ' $$4 } '#039'`)'#010+ 'endif'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "^\','#" /etc/ld.so.conf | awk '#039'{ ORS='+ - '" "; print $1 }'#039')'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ + '"; pr','int $1 }'#039')'#010+ 'endif'#010+ 'export GCCLIBDIR OTHERLIB'#010+ 'endif'#010+ @@ -628,18 +629,17 @@ const fpcmakeini : array[0..118,1..240] of char=( '[command_begin]'#010+ '#####################################################################'#010+ '# Compiler Command Line'#010+ - '########################################','############################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define'#010+ + '# Load c','ommandline OPTDEF and add FPC_CPU define'#010+ 'override FPCOPTDEF=$(CPU_TARGET)'#010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'override FPCOPT+=-T$(OS_TARGET',')'#010+ + 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ - '# User dirs should be first, so they are looked at first'#010+ + '# User dirs should be first, s','o they are looked at first'#010+ 'ifdef UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ @@ -647,10 +647,10 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,','$(OBJDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ + 'override ','FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ '# Smartlinking'#010+ @@ -665,9 +665,9 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ - 'override F','PCOPT+=-gl'#010+ + 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+ 'ifdef RELEASE'#010+ @@ -680,9 +680,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ - '# Optimiz','er'#010+ + '# Optimizer'#010+ 'ifdef OPTIMIZE'#010+ - 'override FPCOPT+=-OG2p3'#010+ + 'override FPCOPT+=-OG2','p3'#010+ 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ @@ -694,26 +694,26 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef COMPILER_OPTIONS'#010+ 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ - 'ifdef COMPILER_U','NITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ + 'ifdef COMPILER_UNITDIR'#010+ + 'override FPCOPT+=$(addprefix -Fu',',$(COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ - 'end','if'#010+ + 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ + 'override F','PCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ #010+ '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ - 'ifeq ($(COMPILER_TARGETDIR','),.)'#010+ + 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ - 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'ove','rride TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -721,9 +721,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ - 'override UNITTA','RGETDIRPREFIX='#010+ + 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'override UNITTARGET','DIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ @@ -733,8 +733,8 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '[command_libc]'#010+ - '# ','Add GCC lib path if asked'#010+ - 'ifdef GCCLIBDIR'#010+ + '# Add GCC lib path if asked'#010+ + 'ifdef GCCLIBD','IR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ @@ -745,10 +745,10 @@ const fpcmakeini : array[0..118,1..240] of char=( '[command_end]'#010+ '# Add commandline options last so they can override'#010+ 'ifdef OPT'#010+ - 'override',' FPCOPT+=$(OPT)'#010+ + 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Add defines from FPCOPTDEF to FPCOPT'#010+ + '# Add defines fr','om FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ @@ -758,7 +758,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ - '# For win32 the options are',' passed using the environment FPCEXTCMD'#010+ + '# For win32 the options are passed using the environment FPCEXTCMD',#010+ 'ifeq ($(OS_SOURCE),win32)'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ @@ -768,8 +768,8 @@ const fpcmakeini : array[0..118,1..240] of char=( '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ - '# also call ppas if with command',' option -s'#010+ - '# but only if the OS_SOURCE and OS_TARGET are equal'#010+ + '# also call ppas if with command option -s'#010+ + '# but only if the OS_SOURCE ','and OS_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -780,19 +780,19 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '############################################','########################'+ - '#'#010+ - '# Loaders'#010+ '#####################################################################'#010+ + '# Loaders'#010+ + '###','#################################################################'+ + '#'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ 'ifdef TARGET_LOADERS'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ - 'override INSTALLTAR','GET+=fpc_loaders_install'#010+ + 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'override LOAD','EROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ @@ -803,18 +803,17 @@ const fpcmakeini : array[0..118,1..240] of char=( 'fpc_loaders_clean:'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ #010+ - 'fpc_load','ers_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + 'fpc_loaders_install:'#010+ + ' $(MKDIR) $(INSTALL','_UNITDIR)'#010+ ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ #010+ #010+ '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ - '#############################################','#######################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '.PHONY: fpc_units'#010+ + '.PHONY: fpc_u','nits'#010+ #010+ 'ifdef TARGET_UNITS'#010+ 'override ALLTARGET+=fpc_units'#010+ @@ -822,12 +821,12 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ 'fpc_units: $(UNITPPUFILES)'#010+ #010+ #010+ - '[exerules]'#010+ + '[exer','ules]'#010+ '#####################################################################'#010+ '# Exes'#010+ '#####################################################################'#010+ @@ -835,13 +834,13 @@ const fpcmakeini : array[0..118,1..240] of char=( '.PHONY: fpc_exes'#010+ #010+ 'ifdef TARGET_PROGRAMS'#010+ - 'overrid','e EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARG','ET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ 'x $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ - 'override INSTALLEXEFILE','S+=$(EXEFILES)'#010+ - 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ + 'override CLEANEXEFILES+=','$(EXEFILES) $(EXEOFILES)'#010+ 'endif'#010+ #010+ 'fpc_exes: $(EXEFILES)'#010+ @@ -850,10 +849,9 @@ const fpcmakeini : array[0..118,1..240] of char=( '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ - '#############################################','#######################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - 'ifdef TARGET_RSTS'#010+ + 'ifdef TARGET_','RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ @@ -862,29 +860,30 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '[examplerules]'#010+ '#####################################################################'#010+ - '# Examples',#010+ - '#####################################################################'#010+ + '# Examples'#010+ + '######################################','##############################'+ + '#'#010+ #010+ '.PHONY: fpc_examples fpc_test'#010+ #010+ 'ifdef TARGET_EXAMPLES'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ - 'o','verride EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXE','EXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ #010+ - 'override CLEANEXEFILES+=$(EXAMPLEFILE','S) $(EXAMPLEOFILES)'#010+ + 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ - 'S))'#010+ + 'fpc_examples',': all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'IRS))'#010+ #010+ #010+ '[compilerules]'#010+ '#####################################################################'#010+ '# General compile rules'#010+ - '############################','########################################'+ + '###################################################################','#'+ '#'#010+ #010+ '.PHONY: fpc_packages fpc_all fpc_smart fpc_debug'#010+ @@ -897,7 +896,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'fpc_all: fpc_packages $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' ',' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ + ' $(MAKE) all LINKSMART=1 CREATESMAR','T=1'#010+ #010+ 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ @@ -908,10 +907,10 @@ const fpcmakeini : array[0..118,1..240] of char=( '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+ #010+ '%$(PPUEXT): %.pp'#010+ - ' $(CO','MPILER) $<'#010+ + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(PPUEXT): %.pas'#010+ + '%$(PPUE','XT): %.pas'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -923,17 +922,17 @@ const fpcmakeini : array[0..118,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '# Search paths for .ppu',' and .pp and .pas'#010+ - 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + '# Search paths for .ppu and .pp and .pas'#010+ + 'vpath %.pp $(COMPILER','_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ #010+ '[libraryrules]'#010+ - '#################################################','###################'+ - '#'#010+ - '# Library'#010+ '#####################################################################'#010+ + '# Library'#010+ + '########','############################################################'+ + '#'#010+ #010+ '.PHONY: fpc_shared'#010+ #010+ @@ -943,9 +942,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'else'#010+ 'LIB_FULLNAME=$(LIB_NAME)'#010+ 'endif'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ - '# Default sharedlib units are all unit objects'#010+ + '# Default sharedlib units are all un','it objects'#010+ 'ifndef LIB_SHAREDUNITS'#010+ 'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+ 'endif'#010+ @@ -954,40 +953,40 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef HASSHAREDLIB'#010+ ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ 'else'#010+ - ' @$(ECHO) Shared Librari','es not supported'#010+ + ' @$(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ - '[installrules]'#010+ + '[installrules]',#010+ '#####################################################################'#010+ '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install fpc_sourceinstall fpc_e','xampleinstall'#010+ + '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'over','ride INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'ifdef PPUFILES'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ 'PPUFILES))'#010+ - 'override INSTA','LLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(s'+ + 'override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGE','TDIRPREFIX),$(s'+ 'hell $(PPUFILES) -S -O $(INSTALLPPUFILES)))'#010+ 'else'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(','I'+ - 'NSTALLPPUFILES)))'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ - 'PPUFILES))'#010+ + 'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INS'+ + 'TALLPPUFILES)))'#010+ + 'override INSTALLPPUF','ILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTA'+ + 'LLPPUFILES))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(INSTALLPPULINKFILES)))'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'over','ride INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+ + 'override INSTALLEXEFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(INSTALLEX'+ 'EFILES))'#010+ 'endif'#010+ #010+ @@ -997,22 +996,22 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef INSTALLEXEFILES'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ - 'ifdef UP','XPROG'#010+ - ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ + 'ifdef UPXPROG'#010+ + ' -$(UPXPROG) $(INSTALLEXEF','ILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'ifneq ($(','INSTALLPPULINKFILES),)'#010+ - ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010+ + ' $(INSTAL','L) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -','sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(','LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1022,15 +1021,15 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ - ' $(MKDIR) $(INSTALL','_SOURCEDIR)'#010+ - ' $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+ + ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ + ' $(COPYTREE) $(BASED','IR) $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ - ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTA','LL_EXAMPLEDIR)'#010+ + ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef TARGET_EXAMPLEDIRS'#010+ + 'ifdef TARGET_EXAMP','LEDIRS'#010+ 'ifndef EXAMPLESOURCEFILES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ @@ -1038,18 +1037,19 @@ const fpcmakeini : array[0..118,1..240] of char=( 'AMPLEDIR)'#010+ 'endif'#010+ #010+ - 'fpc_distinstall: fpc_install fpc_exa','mpleinstall'#010+ + 'fpc_distinstall: fpc_install fpc_exampleinstall'#010+ #010+ #010+ '[zipinstallrules]'#010+ - '#####################################################################'#010+ + '#######','#############################################################'+ + '#'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleins','tall'#010+ + '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file'#010+ - 'ifndef PACKDIR'#010+ + 'i','fndef PACKDIR'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)'#010+ 'else'#010+ @@ -1059,9 +1059,9 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ - 'ifdef D','IST_ZIPNAME'#010+ + 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ - 'else'#010+ + 'els','e'#010+ 'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ @@ -1075,10 +1075,10 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use tar by default under ','linux'#010+ + '# Use tar by default under linux'#010+ 'ifndef USEZIP'#010+ 'ifdef inUnix'#010+ - 'USETAR=1'#010+ + 'USETAR','=1'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1089,29 +1089,29 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Create commands to create the zip/tar file'#010+ 'ZIPWRAPPER=$(DIST_DESTDIR)/fpczip$(BATCHEXT)'#010+ - 'ZIPCMD_CDPACK:=cd',' $(subst /,$(PATHSEP),$(PACKDIR))'#010+ - 'ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))'#010+ + 'ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))'#010+ + 'ZIPCM','D_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNA','ME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFI'+ - 'LE) *'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ + 'ZIPCMD_ZIP:=$(subst /,$(PA','THSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDEST'+ + 'FILE) *'#010+ 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ - 'ifneq ($(E','CHO),echo)'#010+ - ' $(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)'#010+ + 'ifneq ($(ECHO),echo)'#010+ + ' $(ECHO) "$(ZIPCMD_CD','PACK)" > $(ZIPWRAPPER)'#010+ ' $(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)'#010+ ' $(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ - ' $(ECHO) $(ZIPCM','D_ZIP) >> $(ZIPWRAPPER)'#010+ - ' $(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ + ' $(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ + ' $(ECHO)',' $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -1120,9 +1120,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCM','D_CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ - ' $(DELTREE) $(PACKDIR)'#010+ + ' $(DELTREE) $(PA','CKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+ @@ -1130,8 +1130,8 @@ const fpcmakeini : array[0..118,1..240] of char=( 'fpc_zipexampleinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+ #010+ - 'fpc_zip','distinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ + 'fpc_zipdistinstall:'#010+ + ' $(MAKE) fpc_zipins','tall ZIPTARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ @@ -1139,7 +1139,7 @@ const fpcmakeini : array[0..118,1..240] of char=( '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHO','NY: fpc_clean fpc_cleanall fpc_distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclea','n'#010+ #010+ 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ @@ -1150,24 +1150,24 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ - 'ifdef CLEANPPUFI','LES'#010+ - 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ - 'ILES))'#010+ + 'ifdef CLEANPPUFILES'#010+ + 'override CLEANPPUFILES:=$(addprefix',' $(UNITTARGETDIRPREFIX),$(CLEANPP'+ + 'UFILES))'#010+ '# Get the .o and .a files created for the units'#010+ 'ifdef PPUFILES'#010+ 'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+ 'else'#010+ - 'CLEANPPULINKFILES:=$(wildcard $(su','bst $(PPUEXT),$(OEXT),$(CLEANPPUFI'+ - 'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+ + 'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'S))',' $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+ 'ANPPUFILES))))'#010+ 'endif'#010+ 'override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN'+ 'PPULINKFILES))'#010+ 'endif'#010+ #010+ - 'fpc_clean: $(CLEANTARGE','T)'#010+ + 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ + ' -$(DEL) ','$(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ @@ -1176,7 +1176,7 @@ const fpcmakeini : array[0..118,1..240] of char=( ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefi','x $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILE','S))'+ #010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ @@ -1186,26 +1186,26 @@ const fpcmakeini : array[0..118,1..240] of char=( ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ - #010, + #010+ #010+ 'fpc_distclean: fpc_clean'#010+ #010+ - '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ + '# Also run c','lean first if targetdir is set. Unittargetdir is always'#010+ '# set if targetdir or unittargetdir is specified'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ - 'fpc_cleanall: $(CLEANTARGET) $(TARG','ETDIRCLEAN)'#010+ + 'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEXEFILES)'#010+ + ' ',' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) $(FPCMADE) $(PPAS',') link.res $(FPCEXTFILE) $(REDIRFIL'+ - 'E)'#010+ + ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ #010+ + #010, #010+ '[inforules]'#010+ '#####################################################################'#010+ @@ -1215,81 +1215,81 @@ const fpcmakeini : array[0..118,1..240] of char=( '.PHONY: fpc_info'#010+ #010+ 'fpc_info:'#010+ - ' ',' @$(ECHO)'#010+ - ' @$(ECHO) == Package info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Package',' info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' ','@$(ECHO) FPC.......... $(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) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Directory info =='#010+ + ' ',' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @','$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ + ' @$(ECHO) PackagesDir..... $(PACKAGESDIR',')'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO',') Pwd....... $(PWD)'#010+ - ' @$(ECHO) Echo...... $(ECHO)'#010+ + ' @$(ECHO) Pwd....... $(PWD)'#010+ + ' @$(ECHO) ','Echo...... $(ECHO)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ - ' @$(ECHO) Zip...','.... $(ZIPPROG)'#010+ + ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Object info =='#010+ + ' ',' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders...... $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units........ $(TARGET_UNITS)'#010+ - ' @$(ECHO) Target Programs..... $(T','ARGET_PROGRAMS)'#010+ - ' @$(ECHO) Target Dirs......... $(TARGET_DIRS)'#010+ + ' @$(ECHO) Target Programs..... $(TARGET_PROGRAMS)'#010+ + ' @$(ECHO) Targe','t 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 Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO) C','lean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ==',' Install info =='#010+ + ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ + ' ',' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) INSTALL_BASEDI','R...... $(INSTALL_BASEDIR)'#010+ - ' @$(ECHO) INSTALL_BINDIR....... $(INSTALL_BINDIR)'#010+ + ' @$(ECHO) INSTALL_BASEDIR...... $(INSTALL_BASEDIR)'#010+ + ' @$(E','CHO) INSTALL_BINDIR....... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) INSTALL_LIBDIR....... $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) INSTALL_UNITDIR...... $(INSTALL_UNITDIR)'#010+ - ' @$(ECHO) INSTALL_SOURCEDIR...','. $(INSTALL_SOURCEDIR)'#010+ - ' @$(ECHO) INSTALL_DOCDIR....... $(INSTALL_DOCDIR)'#010+ + ' @$(ECHO) INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)'#010+ + ' @$(ECHO)',' INSTALL_DOCDIR....... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) INSTALL_DATADIR...... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DIST_DESTDIR......... $(DIST_DESTDIR)'#010+ - ' @$(ECHO) DIST_ZIPN','AME......... $(DIST_ZIPNAME)'#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) DIST_ZIPNAME......... $(DIST_ZIPNAME)'#010+ + ' @$','(ECHO)'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ - 'ifneq ($(wildcard f','pcmake.loc),)'#010+ + 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '[userrules]'#010+ '#####################################################################'#010+ diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 437c6076a4..117de8d54b 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -168,7 +168,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) # Units dir UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index a3fa6b6195..7b86e85ccb 100644 --- a/utils/fprcp/Makefile +++ b/utils/fprcp/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=fprcp diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index 2162e5cded..ee4b416082 100644 --- a/utils/h2pas/Makefile +++ b/utils/h2pas/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=h2pas h2paspp diff --git a/utils/simulator/Makefile b/utils/simulator/Makefile index 9d4a657df8..dfa084f3f3 100644 --- a/utils/simulator/Makefile +++ b/utils/simulator/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=alphasim diff --git a/utils/tply/Makefile b/utils/tply/Makefile index f296fb56f5..35fea7a763 100644 --- a/utils/tply/Makefile +++ b/utils/tply/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/01] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/02/02] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -120,7 +120,6 @@ endif endif endif endif -override FPCDIR:=$(wildcard $(FPCDIR)) UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages) override TARGET_PROGRAMS+=plex pyacc