Browse Source

* Regenerated

peter 24 years ago
parent
commit
951851e866
75 changed files with 1920 additions and 1577 deletions
  1. 30 94
      compiler/Makefile
  2. 26 90
      compiler/new/Makefile
  3. 22 5
      compiler/utils/Makefile
  4. 47 114
      demo/Makefile
  5. 22 5
      demo/graph/Makefile
  6. 22 5
      demo/linux/Makefile
  7. 22 5
      demo/modex/Makefile
  8. 22 5
      demo/os2/Makefile
  9. 22 5
      demo/text/Makefile
  10. 22 5
      demo/win32/Makefile
  11. 34 20
      fcl/Makefile
  12. 37 20
      fcl/db/Makefile
  13. 23 6
      fcl/db/dbase/Makefile
  14. 24 6
      fcl/db/interbase/Makefile
  15. 24 6
      fcl/db/mysql/Makefile
  16. 24 5
      fcl/db/tests/Makefile
  17. 26 9
      fcl/shedit/Makefile
  18. 26 5
      fcl/shedit/gtk/Makefile
  19. 24 5
      fcl/tests/Makefile
  20. 22 5
      fcl/xml/Makefile
  21. 33 100
      ide/Makefile
  22. 36 103
      ide/fake/Makefile
  23. 22 5
      ide/fake/compiler/Makefile
  24. 22 5
      ide/fake/gdb/Makefile
  25. 31 12
      ide/text/Makefile
  26. 23 5
      ide/text/compiler/Makefile
  27. 23 5
      install/fpinst/Makefile
  28. 99 166
      packages/Makefile
  29. 23 6
      packages/cmem/Makefile
  30. 27 9
      packages/forms/Makefile
  31. 24 5
      packages/forms/demo/Makefile
  32. 23 6
      packages/gdbint/Makefile
  33. 26 93
      packages/gdbint/libgdb/Makefile
  34. 27 94
      packages/gdbm/Makefile
  35. 23 6
      packages/ggi/Makefile
  36. 32 14
      packages/gtk/Makefile
  37. 31 12
      packages/gtk/examples/Makefile
  38. 31 94
      packages/gtk/examples/tutorial/Makefile
  39. 24 6
      packages/gtk/gtkgl/Makefile
  40. 23 6
      packages/ibase/Makefile
  41. 23 6
      packages/inet/Makefile
  42. 23 6
      packages/libgd/Makefile
  43. 23 5
      packages/libpng/Makefile
  44. 23 6
      packages/mysql/Makefile
  45. 23 6
      packages/ncurses/Makefile
  46. 26 9
      packages/opengl/Makefile
  47. 24 5
      packages/opengl/build/Makefile
  48. 23 5
      packages/opengl/examples/Makefile
  49. 26 9
      packages/oracle/Makefile
  50. 26 6
      packages/oracle/example/Makefile
  51. 23 6
      packages/paszlib/Makefile
  52. 23 6
      packages/postgres/Makefile
  53. 23 6
      packages/regexpr/Makefile
  54. 23 6
      packages/svgalib/Makefile
  55. 23 6
      packages/syslog/Makefile
  56. 23 6
      packages/uncgi/Makefile
  57. 22 5
      packages/unzip/Makefile
  58. 23 6
      packages/utmp/Makefile
  59. 22 5
      packages/x11/Makefile
  60. 22 5
      packages/zlib/Makefile
  61. 47 114
      rtl/Makefile
  62. 15 5
      rtl/beos/Makefile
  63. 15 5
      rtl/freebsd/Makefile
  64. 19 5
      rtl/go32v1/Makefile
  65. 15 5
      rtl/go32v2/Makefile
  66. 15 5
      rtl/linux/Makefile
  67. 15 5
      rtl/os2/Makefile
  68. 15 5
      rtl/win32/Makefile
  69. 24 91
      tests/Makefile
  70. 22 5
      tests/units/Makefile
  71. 39 20
      utils/Makefile
  72. 22 5
      utils/fprcp/Makefile
  73. 22 5
      utils/h2pas/Makefile
  74. 22 5
      utils/simulator/Makefile
  75. 22 5
      utils/tply/Makefile

+ 30 - 94
compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -246,6 +246,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -524,6 +533,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -652,86 +664,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
@@ -886,9 +821,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -932,10 +868,10 @@ utils_all:
 	$(MAKE) -C utils all
 utils_debug:
 	$(MAKE) -C utils debug
-utils_examples:
-	$(MAKE) -C utils examples
 utils_smart:
 	$(MAKE) -C utils smart
+utils_examples:
+	$(MAKE) -C utils examples
 utils_shared:
 	$(MAKE) -C utils shared
 utils_install:
@@ -964,7 +900,7 @@ utils_info:
 	$(MAKE) -C utils info
 utils:
 	$(MAKE) -C utils all
-.PHONY: utils_all utils_debug utils_examples utils_smart utils_shared utils_install utils_sourceinstall utils_exampleinstall utils_distinstall utils_zipinstall utils_zipsourceinstall utils_zipexampleinstall utils_zipdistinstall utils_clean utils_distclean utils_cleanall utils_info utils
+.PHONY: utils_all utils_debug utils_smart utils_examples utils_shared utils_install utils_sourceinstall utils_exampleinstall utils_distinstall utils_zipinstall utils_zipsourceinstall utils_zipexampleinstall utils_zipdistinstall utils_clean utils_distclean utils_cleanall utils_info utils
 endif
 ifndef DIFF
 DIFF:=$(strip $(wildcard $(addsuffix /diff$(SRCEXEEXT),$(SEARCHPATH))))
@@ -984,20 +920,20 @@ CMP:=$(firstword $(CMP))
 endif
 endif
 export CMP
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
+debug:
+smart:
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
+sourceinstall:
+exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: debug examples smart shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
+cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
+info: fpc_info
+.PHONY: debug smart examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 90
compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -237,6 +237,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -515,6 +524,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -643,86 +655,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
@@ -877,9 +812,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -935,20 +871,20 @@ CMP:=$(firstword $(CMP))
 endif
 endif
 export CMP
-debug: fpc_debug
-examples: fpc_examples
-smart: fpc_smart
-shared: fpc_shared
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall
+debug:
+smart:
+examples:
+shared:
+sourceinstall:
+exampleinstall:
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall
 zipdistinstall: fpc_zipdistinstall
-cleanall: fpc_cleanall
+cleanall:
 info: fpc_info
-.PHONY: debug examples smart shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
+.PHONY: debug smart examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -466,6 +475,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -606,6 +618,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -767,9 +783,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -809,9 +826,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -824,7 +841,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 47 - 114
demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -189,6 +189,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -552,86 +561,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
@@ -786,9 +718,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -845,10 +778,10 @@ text_all:
 	$(MAKE) -C text all
 text_debug:
 	$(MAKE) -C text debug
-text_examples:
-	$(MAKE) -C text examples
 text_smart:
 	$(MAKE) -C text smart
+text_examples:
+	$(MAKE) -C text examples
 text_shared:
 	$(MAKE) -C text shared
 text_install:
@@ -877,17 +810,17 @@ text_info:
 	$(MAKE) -C text info
 text:
 	$(MAKE) -C text all
-.PHONY: text_all text_debug text_examples text_smart text_shared text_install text_sourceinstall text_exampleinstall text_distinstall text_zipinstall text_zipsourceinstall text_zipexampleinstall text_zipdistinstall text_clean text_distclean text_cleanall text_info text
+.PHONY: text_all text_debug text_smart text_examples text_shared text_install text_sourceinstall text_exampleinstall text_distinstall text_zipinstall text_zipsourceinstall text_zipexampleinstall text_zipdistinstall text_clean text_distclean text_cleanall text_info text
 endif
 ifdef TARGET_DIRS_GRAPH
 graph_all:
 	$(MAKE) -C graph all
 graph_debug:
 	$(MAKE) -C graph debug
-graph_examples:
-	$(MAKE) -C graph examples
 graph_smart:
 	$(MAKE) -C graph smart
+graph_examples:
+	$(MAKE) -C graph examples
 graph_shared:
 	$(MAKE) -C graph shared
 graph_install:
@@ -916,17 +849,17 @@ graph_info:
 	$(MAKE) -C graph info
 graph:
 	$(MAKE) -C graph all
-.PHONY: graph_all graph_debug graph_examples graph_smart graph_shared graph_install graph_sourceinstall graph_exampleinstall graph_distinstall graph_zipinstall graph_zipsourceinstall graph_zipexampleinstall graph_zipdistinstall graph_clean graph_distclean graph_cleanall graph_info graph
+.PHONY: graph_all graph_debug graph_smart graph_examples graph_shared graph_install graph_sourceinstall graph_exampleinstall graph_distinstall graph_zipinstall graph_zipsourceinstall graph_zipexampleinstall graph_zipdistinstall graph_clean graph_distclean graph_cleanall graph_info graph
 endif
 ifdef TARGET_DIRS_LINUX
 linux_all:
 	$(MAKE) -C linux all
 linux_debug:
 	$(MAKE) -C linux debug
-linux_examples:
-	$(MAKE) -C linux examples
 linux_smart:
 	$(MAKE) -C linux smart
+linux_examples:
+	$(MAKE) -C linux examples
 linux_shared:
 	$(MAKE) -C linux shared
 linux_install:
@@ -955,17 +888,17 @@ linux_info:
 	$(MAKE) -C linux info
 linux:
 	$(MAKE) -C linux all
-.PHONY: linux_all linux_debug linux_examples linux_smart linux_shared linux_install linux_sourceinstall linux_exampleinstall linux_distinstall linux_zipinstall linux_zipsourceinstall linux_zipexampleinstall linux_zipdistinstall linux_clean linux_distclean linux_cleanall linux_info linux
+.PHONY: linux_all linux_debug linux_smart linux_examples linux_shared linux_install linux_sourceinstall linux_exampleinstall linux_distinstall linux_zipinstall linux_zipsourceinstall linux_zipexampleinstall linux_zipdistinstall linux_clean linux_distclean linux_cleanall linux_info linux
 endif
 ifdef TARGET_DIRS_MODEX
 modex_all:
 	$(MAKE) -C modex all
 modex_debug:
 	$(MAKE) -C modex debug
-modex_examples:
-	$(MAKE) -C modex examples
 modex_smart:
 	$(MAKE) -C modex smart
+modex_examples:
+	$(MAKE) -C modex examples
 modex_shared:
 	$(MAKE) -C modex shared
 modex_install:
@@ -994,17 +927,17 @@ modex_info:
 	$(MAKE) -C modex info
 modex:
 	$(MAKE) -C modex all
-.PHONY: modex_all modex_debug modex_examples modex_smart modex_shared modex_install modex_sourceinstall modex_exampleinstall modex_distinstall modex_zipinstall modex_zipsourceinstall modex_zipexampleinstall modex_zipdistinstall modex_clean modex_distclean modex_cleanall modex_info modex
+.PHONY: modex_all modex_debug modex_smart modex_examples modex_shared modex_install modex_sourceinstall modex_exampleinstall modex_distinstall modex_zipinstall modex_zipsourceinstall modex_zipexampleinstall modex_zipdistinstall modex_clean modex_distclean modex_cleanall modex_info modex
 endif
 ifdef TARGET_DIRS_WIN32
 win32_all:
 	$(MAKE) -C win32 all
 win32_debug:
 	$(MAKE) -C win32 debug
-win32_examples:
-	$(MAKE) -C win32 examples
 win32_smart:
 	$(MAKE) -C win32 smart
+win32_examples:
+	$(MAKE) -C win32 examples
 win32_shared:
 	$(MAKE) -C win32 shared
 win32_install:
@@ -1033,17 +966,17 @@ win32_info:
 	$(MAKE) -C win32 info
 win32:
 	$(MAKE) -C win32 all
-.PHONY: win32_all win32_debug win32_examples win32_smart win32_shared win32_install win32_sourceinstall win32_exampleinstall win32_distinstall win32_zipinstall win32_zipsourceinstall win32_zipexampleinstall win32_zipdistinstall win32_clean win32_distclean win32_cleanall win32_info win32
+.PHONY: win32_all win32_debug win32_smart win32_examples win32_shared win32_install win32_sourceinstall win32_exampleinstall win32_distinstall win32_zipinstall win32_zipsourceinstall win32_zipexampleinstall win32_zipdistinstall win32_clean win32_distclean win32_cleanall win32_info win32
 endif
 ifdef TARGET_DIRS_OS2
 os2_all:
 	$(MAKE) -C os2 all
 os2_debug:
 	$(MAKE) -C os2 debug
-os2_examples:
-	$(MAKE) -C os2 examples
 os2_smart:
 	$(MAKE) -C os2 smart
+os2_examples:
+	$(MAKE) -C os2 examples
 os2_shared:
 	$(MAKE) -C os2 shared
 os2_install:
@@ -1072,26 +1005,26 @@ os2_info:
 	$(MAKE) -C os2 info
 os2:
 	$(MAKE) -C os2 all
-.PHONY: os2_all os2_debug os2_examples os2_smart os2_shared os2_install os2_sourceinstall os2_exampleinstall os2_distinstall os2_zipinstall os2_zipsourceinstall os2_zipexampleinstall os2_zipdistinstall os2_clean os2_distclean os2_cleanall os2_info os2
-endif
-all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
-install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
+.PHONY: os2_all os2_debug os2_smart os2_examples os2_shared os2_install os2_sourceinstall os2_exampleinstall os2_distinstall os2_zipinstall os2_zipsourceinstall os2_zipexampleinstall os2_zipdistinstall os2_clean os2_distclean os2_cleanall os2_info os2
+endif
+all: $(addsuffix _all,$(TARGET_DIRS))
+debug:
+smart:
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
+install: $(addsuffix _install,$(TARGET_DIRS))
+sourceinstall:
+exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
-clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
-distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+clean: $(addsuffix _clean,$(TARGET_DIRS))
+distclean: $(addsuffix _distclean,$(TARGET_DIRS))
+cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -613,6 +625,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -774,9 +790,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -815,9 +832,9 @@ fpc_info:
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -829,7 +846,7 @@ zipdistinstall:
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
+.PHONY: debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -463,6 +472,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -764,9 +780,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +823,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +838,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -463,6 +472,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -764,9 +780,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +823,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +838,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -463,6 +472,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -764,9 +780,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +823,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +838,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -183,6 +183,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -461,6 +470,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,6 +613,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -762,9 +778,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -804,9 +821,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -819,7 +836,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -463,6 +472,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -764,9 +780,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +823,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +838,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 34 - 20
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -208,6 +208,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -505,6 +514,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -759,7 +772,7 @@ ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
-.PHONY: fpc_examples fpc_test
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -1008,9 +1021,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -1056,10 +1070,10 @@ xml_all:
 	$(MAKE) -C xml all
 xml_debug:
 	$(MAKE) -C xml debug
-xml_examples:
-	$(MAKE) -C xml examples
 xml_smart:
 	$(MAKE) -C xml smart
+xml_examples:
+	$(MAKE) -C xml examples
 xml_shared:
 	$(MAKE) -C xml shared
 xml_install:
@@ -1088,17 +1102,17 @@ xml_info:
 	$(MAKE) -C xml info
 xml:
 	$(MAKE) -C xml all
-.PHONY: xml_all xml_debug xml_examples xml_smart xml_shared xml_install xml_sourceinstall xml_exampleinstall xml_distinstall xml_zipinstall xml_zipsourceinstall xml_zipexampleinstall xml_zipdistinstall xml_clean xml_distclean xml_cleanall xml_info xml
+.PHONY: xml_all xml_debug xml_smart xml_examples xml_shared xml_install xml_sourceinstall xml_exampleinstall xml_distinstall xml_zipinstall xml_zipsourceinstall xml_zipexampleinstall xml_zipdistinstall xml_clean xml_distclean xml_cleanall xml_info xml
 endif
 ifdef TARGET_DIRS_DB
 db_all:
 	$(MAKE) -C db all
 db_debug:
 	$(MAKE) -C db debug
-db_examples:
-	$(MAKE) -C db examples
 db_smart:
 	$(MAKE) -C db smart
+db_examples:
+	$(MAKE) -C db examples
 db_shared:
 	$(MAKE) -C db shared
 db_install:
@@ -1127,17 +1141,17 @@ db_info:
 	$(MAKE) -C db info
 db:
 	$(MAKE) -C db all
-.PHONY: db_all db_debug db_examples db_smart db_shared db_install db_sourceinstall db_exampleinstall db_distinstall db_zipinstall db_zipsourceinstall db_zipexampleinstall db_zipdistinstall db_clean db_distclean db_cleanall db_info db
+.PHONY: db_all db_debug db_smart db_examples db_shared db_install db_sourceinstall db_exampleinstall db_distinstall db_zipinstall db_zipsourceinstall db_zipexampleinstall db_zipdistinstall db_clean db_distclean db_cleanall db_info db
 endif
 ifdef TARGET_DIRS_SHEDIT
 shedit_all:
 	$(MAKE) -C shedit all
 shedit_debug:
 	$(MAKE) -C shedit debug
-shedit_examples:
-	$(MAKE) -C shedit examples
 shedit_smart:
 	$(MAKE) -C shedit smart
+shedit_examples:
+	$(MAKE) -C shedit examples
 shedit_shared:
 	$(MAKE) -C shedit shared
 shedit_install:
@@ -1166,7 +1180,7 @@ shedit_info:
 	$(MAKE) -C shedit info
 shedit:
 	$(MAKE) -C shedit all
-.PHONY: shedit_all shedit_debug shedit_examples shedit_smart shedit_shared shedit_install shedit_sourceinstall shedit_exampleinstall shedit_distinstall shedit_zipinstall shedit_zipsourceinstall shedit_zipexampleinstall shedit_zipdistinstall shedit_clean shedit_distclean shedit_cleanall shedit_info shedit
+.PHONY: shedit_all shedit_debug shedit_smart shedit_examples shedit_shared shedit_install shedit_sourceinstall shedit_exampleinstall shedit_distinstall shedit_zipinstall shedit_zipsourceinstall shedit_zipexampleinstall shedit_zipdistinstall shedit_clean shedit_distclean shedit_cleanall shedit_info shedit
 endif
 TARGET_EXAMPLEDIRS_TESTS=1
 ifdef TARGET_EXAMPLEDIRS_TESTS
@@ -1174,10 +1188,10 @@ tests_all:
 	$(MAKE) -C tests all
 tests_debug:
 	$(MAKE) -C tests debug
-tests_examples:
-	$(MAKE) -C tests examples
 tests_smart:
 	$(MAKE) -C tests smart
+tests_examples:
+	$(MAKE) -C tests examples
 tests_shared:
 	$(MAKE) -C tests shared
 tests_install:
@@ -1206,13 +1220,13 @@ tests_info:
 	$(MAKE) -C tests info
 tests:
 	$(MAKE) -C tests all
-.PHONY: tests_all tests_debug tests_examples tests_smart tests_shared tests_install tests_sourceinstall tests_exampleinstall tests_distinstall tests_zipinstall tests_zipsourceinstall tests_zipexampleinstall tests_zipdistinstall tests_clean tests_distclean tests_cleanall tests_info tests
+.PHONY: tests_all tests_debug tests_smart tests_examples tests_shared tests_install tests_sourceinstall tests_exampleinstall tests_distinstall tests_zipinstall tests_zipsourceinstall tests_zipexampleinstall tests_zipdistinstall tests_clean tests_distclean tests_cleanall tests_info tests
 endif
 all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
+debug: fpc_debug
+smart: fpc_smart
 examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+shared:
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
@@ -1224,8 +1238,8 @@ zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
 clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 37 - 20
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -195,6 +195,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -486,6 +495,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -682,7 +694,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -858,9 +874,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -912,10 +929,10 @@ dbase_all:
 	$(MAKE) -C dbase all
 dbase_debug:
 	$(MAKE) -C dbase debug
-dbase_examples:
-	$(MAKE) -C dbase examples
 dbase_smart:
 	$(MAKE) -C dbase smart
+dbase_examples:
+	$(MAKE) -C dbase examples
 dbase_shared:
 	$(MAKE) -C dbase shared
 dbase_install:
@@ -944,17 +961,17 @@ dbase_info:
 	$(MAKE) -C dbase info
 dbase:
 	$(MAKE) -C dbase all
-.PHONY: dbase_all dbase_debug dbase_examples dbase_smart dbase_shared dbase_install dbase_sourceinstall dbase_exampleinstall dbase_distinstall dbase_zipinstall dbase_zipsourceinstall dbase_zipexampleinstall dbase_zipdistinstall dbase_clean dbase_distclean dbase_cleanall dbase_info dbase
+.PHONY: dbase_all dbase_debug dbase_smart dbase_examples dbase_shared dbase_install dbase_sourceinstall dbase_exampleinstall dbase_distinstall dbase_zipinstall dbase_zipsourceinstall dbase_zipexampleinstall dbase_zipdistinstall dbase_clean dbase_distclean dbase_cleanall dbase_info dbase
 endif
 ifdef TARGET_DIRS_MYSQL
 mysql_all:
 	$(MAKE) -C mysql all
 mysql_debug:
 	$(MAKE) -C mysql debug
-mysql_examples:
-	$(MAKE) -C mysql examples
 mysql_smart:
 	$(MAKE) -C mysql smart
+mysql_examples:
+	$(MAKE) -C mysql examples
 mysql_shared:
 	$(MAKE) -C mysql shared
 mysql_install:
@@ -983,17 +1000,17 @@ mysql_info:
 	$(MAKE) -C mysql info
 mysql:
 	$(MAKE) -C mysql all
-.PHONY: mysql_all mysql_debug mysql_examples mysql_smart mysql_shared mysql_install mysql_sourceinstall mysql_exampleinstall mysql_distinstall mysql_zipinstall mysql_zipsourceinstall mysql_zipexampleinstall mysql_zipdistinstall mysql_clean mysql_distclean mysql_cleanall mysql_info mysql
+.PHONY: mysql_all mysql_debug mysql_smart mysql_examples mysql_shared mysql_install mysql_sourceinstall mysql_exampleinstall mysql_distinstall mysql_zipinstall mysql_zipsourceinstall mysql_zipexampleinstall mysql_zipdistinstall mysql_clean mysql_distclean mysql_cleanall mysql_info mysql
 endif
 ifdef TARGET_DIRS_INTERBASE
 interbase_all:
 	$(MAKE) -C interbase all
 interbase_debug:
 	$(MAKE) -C interbase debug
-interbase_examples:
-	$(MAKE) -C interbase examples
 interbase_smart:
 	$(MAKE) -C interbase smart
+interbase_examples:
+	$(MAKE) -C interbase examples
 interbase_shared:
 	$(MAKE) -C interbase shared
 interbase_install:
@@ -1022,7 +1039,7 @@ interbase_info:
 	$(MAKE) -C interbase info
 interbase:
 	$(MAKE) -C interbase all
-.PHONY: interbase_all interbase_debug interbase_examples interbase_smart interbase_shared interbase_install interbase_sourceinstall interbase_exampleinstall interbase_distinstall interbase_zipinstall interbase_zipsourceinstall interbase_zipexampleinstall interbase_zipdistinstall interbase_clean interbase_distclean interbase_cleanall interbase_info interbase
+.PHONY: interbase_all interbase_debug interbase_smart interbase_examples interbase_shared interbase_install interbase_sourceinstall interbase_exampleinstall interbase_distinstall interbase_zipinstall interbase_zipsourceinstall interbase_zipexampleinstall interbase_zipdistinstall interbase_clean interbase_distclean interbase_cleanall interbase_info interbase
 endif
 TARGET_EXAMPLEDIRS_TESTS=1
 ifdef TARGET_EXAMPLEDIRS_TESTS
@@ -1030,10 +1047,10 @@ tests_all:
 	$(MAKE) -C tests all
 tests_debug:
 	$(MAKE) -C tests debug
-tests_examples:
-	$(MAKE) -C tests examples
 tests_smart:
 	$(MAKE) -C tests smart
+tests_examples:
+	$(MAKE) -C tests examples
 tests_shared:
 	$(MAKE) -C tests shared
 tests_install:
@@ -1062,13 +1079,13 @@ tests_info:
 	$(MAKE) -C tests info
 tests:
 	$(MAKE) -C tests all
-.PHONY: tests_all tests_debug tests_examples tests_smart tests_shared tests_install tests_sourceinstall tests_exampleinstall tests_distinstall tests_zipinstall tests_zipsourceinstall tests_zipexampleinstall tests_zipdistinstall tests_clean tests_distclean tests_cleanall tests_info tests
+.PHONY: tests_all tests_debug tests_smart tests_examples tests_shared tests_install tests_sourceinstall tests_exampleinstall tests_distinstall tests_zipinstall tests_zipsourceinstall tests_zipexampleinstall tests_zipdistinstall tests_clean tests_distclean tests_cleanall tests_info tests
 endif
 all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
+debug: fpc_debug
+smart: fpc_smart
 examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+shared:
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
@@ -1080,8 +1097,8 @@ zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS))
 clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -466,6 +475,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -602,7 +614,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -778,9 +794,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -820,9 +837,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -835,7 +852,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 6
fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -480,6 +489,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_IBASE=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_IBASE=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -649,7 +662,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -825,9 +842,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -867,9 +885,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -882,7 +900,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 6
fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -480,6 +489,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_MYSQL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_MYSQL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -649,7 +662,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -825,9 +842,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -867,9 +885,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -882,7 +900,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 5
fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -487,6 +496,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -768,6 +782,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -929,9 +947,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -971,9 +990,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -986,7 +1005,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 9
fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -466,6 +475,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -602,7 +614,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -778,9 +794,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -824,10 +841,10 @@ gtk_all:
 	$(MAKE) -C gtk all
 gtk_debug:
 	$(MAKE) -C gtk debug
-gtk_examples:
-	$(MAKE) -C gtk examples
 gtk_smart:
 	$(MAKE) -C gtk smart
+gtk_examples:
+	$(MAKE) -C gtk examples
 gtk_shared:
 	$(MAKE) -C gtk shared
 gtk_install:
@@ -856,13 +873,13 @@ gtk_info:
 	$(MAKE) -C gtk info
 gtk:
 	$(MAKE) -C gtk all
-.PHONY: gtk_all gtk_debug gtk_examples gtk_smart gtk_shared gtk_install gtk_sourceinstall gtk_exampleinstall gtk_distinstall gtk_zipinstall gtk_zipsourceinstall gtk_zipexampleinstall gtk_zipdistinstall gtk_clean gtk_distclean gtk_cleanall gtk_info gtk
+.PHONY: gtk_all gtk_debug gtk_smart gtk_examples gtk_shared gtk_install gtk_sourceinstall gtk_exampleinstall gtk_distinstall gtk_zipinstall gtk_zipsourceinstall gtk_zipexampleinstall gtk_zipdistinstall gtk_clean gtk_distclean gtk_cleanall gtk_info gtk
 endif
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -875,7 +892,7 @@ clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 5
fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -498,6 +507,13 @@ REQUIRE_PACKAGES_FCL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -868,6 +884,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -1029,9 +1049,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -1071,9 +1092,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -1086,7 +1107,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 5
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -191,6 +191,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -493,6 +502,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -774,6 +788,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -935,9 +953,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -977,9 +996,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -992,7 +1011,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,6 +613,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -762,9 +778,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -804,9 +821,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -819,7 +836,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 33 - 100
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -550,86 +559,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
@@ -784,9 +716,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -831,10 +764,10 @@ fake_all:
 	$(MAKE) -C fake all
 fake_debug:
 	$(MAKE) -C fake debug
-fake_examples:
-	$(MAKE) -C fake examples
 fake_smart:
 	$(MAKE) -C fake smart
+fake_examples:
+	$(MAKE) -C fake examples
 fake_shared:
 	$(MAKE) -C fake shared
 fake_install:
@@ -863,17 +796,17 @@ fake_info:
 	$(MAKE) -C fake info
 fake:
 	$(MAKE) -C fake all
-.PHONY: fake_all fake_debug fake_examples fake_smart fake_shared fake_install fake_sourceinstall fake_exampleinstall fake_distinstall fake_zipinstall fake_zipsourceinstall fake_zipexampleinstall fake_zipdistinstall fake_clean fake_distclean fake_cleanall fake_info fake
+.PHONY: fake_all fake_debug fake_smart fake_examples fake_shared fake_install fake_sourceinstall fake_exampleinstall fake_distinstall fake_zipinstall fake_zipsourceinstall fake_zipexampleinstall fake_zipdistinstall fake_clean fake_distclean fake_cleanall fake_info fake
 endif
 ifdef TARGET_DIRS_TEXT
 text_all:
 	$(MAKE) -C text all
 text_debug:
 	$(MAKE) -C text debug
-text_examples:
-	$(MAKE) -C text examples
 text_smart:
 	$(MAKE) -C text smart
+text_examples:
+	$(MAKE) -C text examples
 text_shared:
 	$(MAKE) -C text shared
 text_install:
@@ -902,23 +835,23 @@ text_info:
 	$(MAKE) -C text info
 text:
 	$(MAKE) -C text all
-.PHONY: text_all text_debug text_examples text_smart text_shared text_install text_sourceinstall text_exampleinstall text_distinstall text_zipinstall text_zipsourceinstall text_zipexampleinstall text_zipdistinstall text_clean text_distclean text_cleanall text_info text
-endif
-debug: fpc_debug $(addsuffix _debug,$(DEFAULT_DIR))
-examples: fpc_examples $(addsuffix _examples,$(DEFAULT_DIR))
-smart: fpc_smart $(addsuffix _smart,$(DEFAULT_DIR))
-shared: fpc_shared $(addsuffix _shared,$(DEFAULT_DIR))
-install: fpc_install $(addsuffix _install,$(DEFAULT_DIR))
-sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(DEFAULT_DIR))
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(DEFAULT_DIR))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(DEFAULT_DIR))
+.PHONY: text_all text_debug text_smart text_examples text_shared text_install text_sourceinstall text_exampleinstall text_distinstall text_zipinstall text_zipsourceinstall text_zipexampleinstall text_zipdistinstall text_clean text_distclean text_cleanall text_info text
+endif
+debug:
+smart:
+examples: $(addsuffix _examples,$(DEFAULT_DIR))
+shared:
+install: $(addsuffix _install,$(DEFAULT_DIR))
+sourceinstall: $(addsuffix _sourceinstall,$(DEFAULT_DIR))
+exampleinstall: $(addsuffix _exampleinstall,$(DEFAULT_DIR))
+distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall $(addsuffix _zipinstall,$(DEFAULT_DIR))
 zipsourceinstall: fpc_zipsourceinstall $(addsuffix _zipsourceinstall,$(DEFAULT_DIR))
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(DEFAULT_DIR))
 zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(DEFAULT_DIR))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(DEFAULT_DIR))
-info: fpc_info $(addsuffix _info,$(DEFAULT_DIR))
-.PHONY: debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
+cleanall: $(addsuffix _cleanall,$(DEFAULT_DIR))
+info: fpc_info
+.PHONY: debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 36 - 103
ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -175,6 +175,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -538,86 +547,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
@@ -699,9 +631,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -746,10 +679,10 @@ compiler_all:
 	$(MAKE) -C compiler all
 compiler_debug:
 	$(MAKE) -C compiler debug
-compiler_examples:
-	$(MAKE) -C compiler examples
 compiler_smart:
 	$(MAKE) -C compiler smart
+compiler_examples:
+	$(MAKE) -C compiler examples
 compiler_shared:
 	$(MAKE) -C compiler shared
 compiler_install:
@@ -778,17 +711,17 @@ compiler_info:
 	$(MAKE) -C compiler info
 compiler:
 	$(MAKE) -C compiler all
-.PHONY: compiler_all compiler_debug compiler_examples compiler_smart compiler_shared compiler_install compiler_sourceinstall compiler_exampleinstall compiler_distinstall compiler_zipinstall compiler_zipsourceinstall compiler_zipexampleinstall compiler_zipdistinstall compiler_clean compiler_distclean compiler_cleanall compiler_info compiler
+.PHONY: compiler_all compiler_debug compiler_smart compiler_examples compiler_shared compiler_install compiler_sourceinstall compiler_exampleinstall compiler_distinstall compiler_zipinstall compiler_zipsourceinstall compiler_zipexampleinstall compiler_zipdistinstall compiler_clean compiler_distclean compiler_cleanall compiler_info compiler
 endif
 ifdef TARGET_DIRS_GDB
 gdb_all:
 	$(MAKE) -C gdb all
 gdb_debug:
 	$(MAKE) -C gdb debug
-gdb_examples:
-	$(MAKE) -C gdb examples
 gdb_smart:
 	$(MAKE) -C gdb smart
+gdb_examples:
+	$(MAKE) -C gdb examples
 gdb_shared:
 	$(MAKE) -C gdb shared
 gdb_install:
@@ -817,26 +750,26 @@ gdb_info:
 	$(MAKE) -C gdb info
 gdb:
 	$(MAKE) -C gdb all
-.PHONY: gdb_all gdb_debug gdb_examples gdb_smart gdb_shared gdb_install gdb_sourceinstall gdb_exampleinstall gdb_distinstall gdb_zipinstall gdb_zipsourceinstall gdb_zipexampleinstall gdb_zipdistinstall gdb_clean gdb_distclean gdb_cleanall gdb_info gdb
-endif
-all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
-install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
-sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
+.PHONY: gdb_all gdb_debug gdb_smart gdb_examples gdb_shared gdb_install gdb_sourceinstall gdb_exampleinstall gdb_distinstall gdb_zipinstall gdb_zipsourceinstall gdb_zipexampleinstall gdb_zipdistinstall gdb_clean gdb_distclean gdb_cleanall gdb_info gdb
+endif
+all: $(addsuffix _all,$(TARGET_DIRS))
+debug:
+smart:
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
+install: $(addsuffix _install,$(TARGET_DIRS))
+sourceinstall: $(addsuffix _sourceinstall,$(TARGET_DIRS))
+exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
+distinstall:
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS))
-clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
-distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+clean: $(addsuffix _clean,$(TARGET_DIRS))
+distclean: $(addsuffix _distclean,$(TARGET_DIRS))
+cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -175,6 +175,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -453,6 +462,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -589,6 +601,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -750,9 +766,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -792,9 +809,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -807,7 +824,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -175,6 +175,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -453,6 +462,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -589,6 +601,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -750,9 +766,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -792,9 +809,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -807,7 +824,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 31 - 12
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -234,6 +234,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -531,6 +540,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 REQUIRE_PACKAGES_GDBINT=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+REQUIRE_PACKAGES_GDBINT=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -731,6 +745,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -892,9 +910,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -938,10 +957,10 @@ compiler_all:
 	$(MAKE) -C compiler all
 compiler_debug:
 	$(MAKE) -C compiler debug
-compiler_examples:
-	$(MAKE) -C compiler examples
 compiler_smart:
 	$(MAKE) -C compiler smart
+compiler_examples:
+	$(MAKE) -C compiler examples
 compiler_shared:
 	$(MAKE) -C compiler shared
 compiler_install:
@@ -970,22 +989,22 @@ compiler_info:
 	$(MAKE) -C compiler info
 compiler:
 	$(MAKE) -C compiler all
-.PHONY: compiler_all compiler_debug compiler_examples compiler_smart compiler_shared compiler_install compiler_sourceinstall compiler_exampleinstall compiler_distinstall compiler_zipinstall compiler_zipsourceinstall compiler_zipexampleinstall compiler_zipdistinstall compiler_clean compiler_distclean compiler_cleanall compiler_info compiler
+.PHONY: compiler_all compiler_debug compiler_smart compiler_examples compiler_shared compiler_install compiler_sourceinstall compiler_exampleinstall compiler_distinstall compiler_zipinstall compiler_zipsourceinstall compiler_zipexampleinstall compiler_zipdistinstall compiler_clean compiler_distclean compiler_cleanall compiler_info compiler
 endif
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+debug: fpc_debug
+smart: fpc_smart
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall:
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: debug examples smart shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
+info: fpc_info
+.PHONY: debug smart examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 5
ide/text/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -471,6 +480,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -634,6 +647,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -795,9 +812,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -836,9 +854,9 @@ fpc_info:
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
 distinstall:
@@ -849,7 +867,7 @@ zipdistinstall:
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: debug examples smart shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
+.PHONY: debug smart examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 5
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -205,6 +205,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -488,6 +497,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FV=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FV=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -655,6 +668,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -889,9 +906,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -931,9 +949,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -946,7 +964,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 99 - 166
packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -198,6 +198,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -561,86 +570,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
@@ -722,9 +654,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -839,10 +772,10 @@ zlib_all:
 	$(MAKE) -C zlib all
 zlib_debug:
 	$(MAKE) -C zlib debug
-zlib_examples:
-	$(MAKE) -C zlib examples
 zlib_smart:
 	$(MAKE) -C zlib smart
+zlib_examples:
+	$(MAKE) -C zlib examples
 zlib_shared:
 	$(MAKE) -C zlib shared
 zlib_install:
@@ -871,17 +804,17 @@ zlib_info:
 	$(MAKE) -C zlib info
 zlib:
 	$(MAKE) -C zlib all
-.PHONY: zlib_all zlib_debug zlib_examples zlib_smart zlib_shared zlib_install zlib_sourceinstall zlib_exampleinstall zlib_distinstall zlib_zipinstall zlib_zipsourceinstall zlib_zipexampleinstall zlib_zipdistinstall zlib_clean zlib_distclean zlib_cleanall zlib_info zlib
+.PHONY: zlib_all zlib_debug zlib_smart zlib_examples zlib_shared zlib_install zlib_sourceinstall zlib_exampleinstall zlib_distinstall zlib_zipinstall zlib_zipsourceinstall zlib_zipexampleinstall zlib_zipdistinstall zlib_clean zlib_distclean zlib_cleanall zlib_info zlib
 endif
 ifdef TARGET_DIRS_NCURSES
 ncurses_all:
 	$(MAKE) -C ncurses all
 ncurses_debug:
 	$(MAKE) -C ncurses debug
-ncurses_examples:
-	$(MAKE) -C ncurses examples
 ncurses_smart:
 	$(MAKE) -C ncurses smart
+ncurses_examples:
+	$(MAKE) -C ncurses examples
 ncurses_shared:
 	$(MAKE) -C ncurses shared
 ncurses_install:
@@ -910,17 +843,17 @@ ncurses_info:
 	$(MAKE) -C ncurses info
 ncurses:
 	$(MAKE) -C ncurses all
-.PHONY: ncurses_all ncurses_debug ncurses_examples ncurses_smart ncurses_shared ncurses_install ncurses_sourceinstall ncurses_exampleinstall ncurses_distinstall ncurses_zipinstall ncurses_zipsourceinstall ncurses_zipexampleinstall ncurses_zipdistinstall ncurses_clean ncurses_distclean ncurses_cleanall ncurses_info ncurses
+.PHONY: ncurses_all ncurses_debug ncurses_smart ncurses_examples ncurses_shared ncurses_install ncurses_sourceinstall ncurses_exampleinstall ncurses_distinstall ncurses_zipinstall ncurses_zipsourceinstall ncurses_zipexampleinstall ncurses_zipdistinstall ncurses_clean ncurses_distclean ncurses_cleanall ncurses_info ncurses
 endif
 ifdef TARGET_DIRS_X11
 x11_all:
 	$(MAKE) -C x11 all
 x11_debug:
 	$(MAKE) -C x11 debug
-x11_examples:
-	$(MAKE) -C x11 examples
 x11_smart:
 	$(MAKE) -C x11 smart
+x11_examples:
+	$(MAKE) -C x11 examples
 x11_shared:
 	$(MAKE) -C x11 shared
 x11_install:
@@ -949,17 +882,17 @@ x11_info:
 	$(MAKE) -C x11 info
 x11:
 	$(MAKE) -C x11 all
-.PHONY: x11_all x11_debug x11_examples x11_smart x11_shared x11_install x11_sourceinstall x11_exampleinstall x11_distinstall x11_zipinstall x11_zipsourceinstall x11_zipexampleinstall x11_zipdistinstall x11_clean x11_distclean x11_cleanall x11_info x11
+.PHONY: x11_all x11_debug x11_smart x11_examples x11_shared x11_install x11_sourceinstall x11_exampleinstall x11_distinstall x11_zipinstall x11_zipsourceinstall x11_zipexampleinstall x11_zipdistinstall x11_clean x11_distclean x11_cleanall x11_info x11
 endif
 ifdef TARGET_DIRS_GTK
 gtk_all:
 	$(MAKE) -C gtk all
 gtk_debug:
 	$(MAKE) -C gtk debug
-gtk_examples:
-	$(MAKE) -C gtk examples
 gtk_smart:
 	$(MAKE) -C gtk smart
+gtk_examples:
+	$(MAKE) -C gtk examples
 gtk_shared:
 	$(MAKE) -C gtk shared
 gtk_install:
@@ -988,17 +921,17 @@ gtk_info:
 	$(MAKE) -C gtk info
 gtk:
 	$(MAKE) -C gtk all
-.PHONY: gtk_all gtk_debug gtk_examples gtk_smart gtk_shared gtk_install gtk_sourceinstall gtk_exampleinstall gtk_distinstall gtk_zipinstall gtk_zipsourceinstall gtk_zipexampleinstall gtk_zipdistinstall gtk_clean gtk_distclean gtk_cleanall gtk_info gtk
+.PHONY: gtk_all gtk_debug gtk_smart gtk_examples gtk_shared gtk_install gtk_sourceinstall gtk_exampleinstall gtk_distinstall gtk_zipinstall gtk_zipsourceinstall gtk_zipexampleinstall gtk_zipdistinstall gtk_clean gtk_distclean gtk_cleanall gtk_info gtk
 endif
 ifdef TARGET_DIRS_SYSLOG
 syslog_all:
 	$(MAKE) -C syslog all
 syslog_debug:
 	$(MAKE) -C syslog debug
-syslog_examples:
-	$(MAKE) -C syslog examples
 syslog_smart:
 	$(MAKE) -C syslog smart
+syslog_examples:
+	$(MAKE) -C syslog examples
 syslog_shared:
 	$(MAKE) -C syslog shared
 syslog_install:
@@ -1027,17 +960,17 @@ syslog_info:
 	$(MAKE) -C syslog info
 syslog:
 	$(MAKE) -C syslog all
-.PHONY: syslog_all syslog_debug syslog_examples syslog_smart syslog_shared syslog_install syslog_sourceinstall syslog_exampleinstall syslog_distinstall syslog_zipinstall syslog_zipsourceinstall syslog_zipexampleinstall syslog_zipdistinstall syslog_clean syslog_distclean syslog_cleanall syslog_info syslog
+.PHONY: syslog_all syslog_debug syslog_smart syslog_examples syslog_shared syslog_install syslog_sourceinstall syslog_exampleinstall syslog_distinstall syslog_zipinstall syslog_zipsourceinstall syslog_zipexampleinstall syslog_zipdistinstall syslog_clean syslog_distclean syslog_cleanall syslog_info syslog
 endif
 ifdef TARGET_DIRS_INET
 inet_all:
 	$(MAKE) -C inet all
 inet_debug:
 	$(MAKE) -C inet debug
-inet_examples:
-	$(MAKE) -C inet examples
 inet_smart:
 	$(MAKE) -C inet smart
+inet_examples:
+	$(MAKE) -C inet examples
 inet_shared:
 	$(MAKE) -C inet shared
 inet_install:
@@ -1066,17 +999,17 @@ inet_info:
 	$(MAKE) -C inet info
 inet:
 	$(MAKE) -C inet all
-.PHONY: inet_all inet_debug inet_examples inet_smart inet_shared inet_install inet_sourceinstall inet_exampleinstall inet_distinstall inet_zipinstall inet_zipsourceinstall inet_zipexampleinstall inet_zipdistinstall inet_clean inet_distclean inet_cleanall inet_info inet
+.PHONY: inet_all inet_debug inet_smart inet_examples inet_shared inet_install inet_sourceinstall inet_exampleinstall inet_distinstall inet_zipinstall inet_zipsourceinstall inet_zipexampleinstall inet_zipdistinstall inet_clean inet_distclean inet_cleanall inet_info inet
 endif
 ifdef TARGET_DIRS_UNCGI
 uncgi_all:
 	$(MAKE) -C uncgi all
 uncgi_debug:
 	$(MAKE) -C uncgi debug
-uncgi_examples:
-	$(MAKE) -C uncgi examples
 uncgi_smart:
 	$(MAKE) -C uncgi smart
+uncgi_examples:
+	$(MAKE) -C uncgi examples
 uncgi_shared:
 	$(MAKE) -C uncgi shared
 uncgi_install:
@@ -1105,17 +1038,17 @@ uncgi_info:
 	$(MAKE) -C uncgi info
 uncgi:
 	$(MAKE) -C uncgi all
-.PHONY: uncgi_all uncgi_debug uncgi_examples uncgi_smart uncgi_shared uncgi_install uncgi_sourceinstall uncgi_exampleinstall uncgi_distinstall uncgi_zipinstall uncgi_zipsourceinstall uncgi_zipexampleinstall uncgi_zipdistinstall uncgi_clean uncgi_distclean uncgi_cleanall uncgi_info uncgi
+.PHONY: uncgi_all uncgi_debug uncgi_smart uncgi_examples uncgi_shared uncgi_install uncgi_sourceinstall uncgi_exampleinstall uncgi_distinstall uncgi_zipinstall uncgi_zipsourceinstall uncgi_zipexampleinstall uncgi_zipdistinstall uncgi_clean uncgi_distclean uncgi_cleanall uncgi_info uncgi
 endif
 ifdef TARGET_DIRS_MYSQL
 mysql_all:
 	$(MAKE) -C mysql all
 mysql_debug:
 	$(MAKE) -C mysql debug
-mysql_examples:
-	$(MAKE) -C mysql examples
 mysql_smart:
 	$(MAKE) -C mysql smart
+mysql_examples:
+	$(MAKE) -C mysql examples
 mysql_shared:
 	$(MAKE) -C mysql shared
 mysql_install:
@@ -1144,17 +1077,17 @@ mysql_info:
 	$(MAKE) -C mysql info
 mysql:
 	$(MAKE) -C mysql all
-.PHONY: mysql_all mysql_debug mysql_examples mysql_smart mysql_shared mysql_install mysql_sourceinstall mysql_exampleinstall mysql_distinstall mysql_zipinstall mysql_zipsourceinstall mysql_zipexampleinstall mysql_zipdistinstall mysql_clean mysql_distclean mysql_cleanall mysql_info mysql
+.PHONY: mysql_all mysql_debug mysql_smart mysql_examples mysql_shared mysql_install mysql_sourceinstall mysql_exampleinstall mysql_distinstall mysql_zipinstall mysql_zipsourceinstall mysql_zipexampleinstall mysql_zipdistinstall mysql_clean mysql_distclean mysql_cleanall mysql_info mysql
 endif
 ifdef TARGET_DIRS_IBASE
 ibase_all:
 	$(MAKE) -C ibase all
 ibase_debug:
 	$(MAKE) -C ibase debug
-ibase_examples:
-	$(MAKE) -C ibase examples
 ibase_smart:
 	$(MAKE) -C ibase smart
+ibase_examples:
+	$(MAKE) -C ibase examples
 ibase_shared:
 	$(MAKE) -C ibase shared
 ibase_install:
@@ -1183,17 +1116,17 @@ ibase_info:
 	$(MAKE) -C ibase info
 ibase:
 	$(MAKE) -C ibase all
-.PHONY: ibase_all ibase_debug ibase_examples ibase_smart ibase_shared ibase_install ibase_sourceinstall ibase_exampleinstall ibase_distinstall ibase_zipinstall ibase_zipsourceinstall ibase_zipexampleinstall ibase_zipdistinstall ibase_clean ibase_distclean ibase_cleanall ibase_info ibase
+.PHONY: ibase_all ibase_debug ibase_smart ibase_examples ibase_shared ibase_install ibase_sourceinstall ibase_exampleinstall ibase_distinstall ibase_zipinstall ibase_zipsourceinstall ibase_zipexampleinstall ibase_zipdistinstall ibase_clean ibase_distclean ibase_cleanall ibase_info ibase
 endif
 ifdef TARGET_DIRS_POSTGRES
 postgres_all:
 	$(MAKE) -C postgres all
 postgres_debug:
 	$(MAKE) -C postgres debug
-postgres_examples:
-	$(MAKE) -C postgres examples
 postgres_smart:
 	$(MAKE) -C postgres smart
+postgres_examples:
+	$(MAKE) -C postgres examples
 postgres_shared:
 	$(MAKE) -C postgres shared
 postgres_install:
@@ -1222,17 +1155,17 @@ postgres_info:
 	$(MAKE) -C postgres info
 postgres:
 	$(MAKE) -C postgres all
-.PHONY: postgres_all postgres_debug postgres_examples postgres_smart postgres_shared postgres_install postgres_sourceinstall postgres_exampleinstall postgres_distinstall postgres_zipinstall postgres_zipsourceinstall postgres_zipexampleinstall postgres_zipdistinstall postgres_clean postgres_distclean postgres_cleanall postgres_info postgres
+.PHONY: postgres_all postgres_debug postgres_smart postgres_examples postgres_shared postgres_install postgres_sourceinstall postgres_exampleinstall postgres_distinstall postgres_zipinstall postgres_zipsourceinstall postgres_zipexampleinstall postgres_zipdistinstall postgres_clean postgres_distclean postgres_cleanall postgres_info postgres
 endif
 ifdef TARGET_DIRS_ORACLE
 oracle_all:
 	$(MAKE) -C oracle all
 oracle_debug:
 	$(MAKE) -C oracle debug
-oracle_examples:
-	$(MAKE) -C oracle examples
 oracle_smart:
 	$(MAKE) -C oracle smart
+oracle_examples:
+	$(MAKE) -C oracle examples
 oracle_shared:
 	$(MAKE) -C oracle shared
 oracle_install:
@@ -1261,17 +1194,17 @@ oracle_info:
 	$(MAKE) -C oracle info
 oracle:
 	$(MAKE) -C oracle all
-.PHONY: oracle_all oracle_debug oracle_examples oracle_smart oracle_shared oracle_install oracle_sourceinstall oracle_exampleinstall oracle_distinstall oracle_zipinstall oracle_zipsourceinstall oracle_zipexampleinstall oracle_zipdistinstall oracle_clean oracle_distclean oracle_cleanall oracle_info oracle
+.PHONY: oracle_all oracle_debug oracle_smart oracle_examples oracle_shared oracle_install oracle_sourceinstall oracle_exampleinstall oracle_distinstall oracle_zipinstall oracle_zipsourceinstall oracle_zipexampleinstall oracle_zipdistinstall oracle_clean oracle_distclean oracle_cleanall oracle_info oracle
 endif
 ifdef TARGET_DIRS_OPENGL
 opengl_all:
 	$(MAKE) -C opengl all
 opengl_debug:
 	$(MAKE) -C opengl debug
-opengl_examples:
-	$(MAKE) -C opengl examples
 opengl_smart:
 	$(MAKE) -C opengl smart
+opengl_examples:
+	$(MAKE) -C opengl examples
 opengl_shared:
 	$(MAKE) -C opengl shared
 opengl_install:
@@ -1300,17 +1233,17 @@ opengl_info:
 	$(MAKE) -C opengl info
 opengl:
 	$(MAKE) -C opengl all
-.PHONY: opengl_all opengl_debug opengl_examples opengl_smart opengl_shared opengl_install opengl_sourceinstall opengl_exampleinstall opengl_distinstall opengl_zipinstall opengl_zipsourceinstall opengl_zipexampleinstall opengl_zipdistinstall opengl_clean opengl_distclean opengl_cleanall opengl_info opengl
+.PHONY: opengl_all opengl_debug opengl_smart opengl_examples opengl_shared opengl_install opengl_sourceinstall opengl_exampleinstall opengl_distinstall opengl_zipinstall opengl_zipsourceinstall opengl_zipexampleinstall opengl_zipdistinstall opengl_clean opengl_distclean opengl_cleanall opengl_info opengl
 endif
 ifdef TARGET_DIRS_FORMS
 forms_all:
 	$(MAKE) -C forms all
 forms_debug:
 	$(MAKE) -C forms debug
-forms_examples:
-	$(MAKE) -C forms examples
 forms_smart:
 	$(MAKE) -C forms smart
+forms_examples:
+	$(MAKE) -C forms examples
 forms_shared:
 	$(MAKE) -C forms shared
 forms_install:
@@ -1339,17 +1272,17 @@ forms_info:
 	$(MAKE) -C forms info
 forms:
 	$(MAKE) -C forms all
-.PHONY: forms_all forms_debug forms_examples forms_smart forms_shared forms_install forms_sourceinstall forms_exampleinstall forms_distinstall forms_zipinstall forms_zipsourceinstall forms_zipexampleinstall forms_zipdistinstall forms_clean forms_distclean forms_cleanall forms_info forms
+.PHONY: forms_all forms_debug forms_smart forms_examples forms_shared forms_install forms_sourceinstall forms_exampleinstall forms_distinstall forms_zipinstall forms_zipsourceinstall forms_zipexampleinstall forms_zipdistinstall forms_clean forms_distclean forms_cleanall forms_info forms
 endif
 ifdef TARGET_DIRS_SVGALIB
 svgalib_all:
 	$(MAKE) -C svgalib all
 svgalib_debug:
 	$(MAKE) -C svgalib debug
-svgalib_examples:
-	$(MAKE) -C svgalib examples
 svgalib_smart:
 	$(MAKE) -C svgalib smart
+svgalib_examples:
+	$(MAKE) -C svgalib examples
 svgalib_shared:
 	$(MAKE) -C svgalib shared
 svgalib_install:
@@ -1378,17 +1311,17 @@ svgalib_info:
 	$(MAKE) -C svgalib info
 svgalib:
 	$(MAKE) -C svgalib all
-.PHONY: svgalib_all svgalib_debug svgalib_examples svgalib_smart svgalib_shared svgalib_install svgalib_sourceinstall svgalib_exampleinstall svgalib_distinstall svgalib_zipinstall svgalib_zipsourceinstall svgalib_zipexampleinstall svgalib_zipdistinstall svgalib_clean svgalib_distclean svgalib_cleanall svgalib_info svgalib
+.PHONY: svgalib_all svgalib_debug svgalib_smart svgalib_examples svgalib_shared svgalib_install svgalib_sourceinstall svgalib_exampleinstall svgalib_distinstall svgalib_zipinstall svgalib_zipsourceinstall svgalib_zipexampleinstall svgalib_zipdistinstall svgalib_clean svgalib_distclean svgalib_cleanall svgalib_info svgalib
 endif
 ifdef TARGET_DIRS_GGI
 ggi_all:
 	$(MAKE) -C ggi all
 ggi_debug:
 	$(MAKE) -C ggi debug
-ggi_examples:
-	$(MAKE) -C ggi examples
 ggi_smart:
 	$(MAKE) -C ggi smart
+ggi_examples:
+	$(MAKE) -C ggi examples
 ggi_shared:
 	$(MAKE) -C ggi shared
 ggi_install:
@@ -1417,17 +1350,17 @@ ggi_info:
 	$(MAKE) -C ggi info
 ggi:
 	$(MAKE) -C ggi all
-.PHONY: ggi_all ggi_debug ggi_examples ggi_smart ggi_shared ggi_install ggi_sourceinstall ggi_exampleinstall ggi_distinstall ggi_zipinstall ggi_zipsourceinstall ggi_zipexampleinstall ggi_zipdistinstall ggi_clean ggi_distclean ggi_cleanall ggi_info ggi
+.PHONY: ggi_all ggi_debug ggi_smart ggi_examples ggi_shared ggi_install ggi_sourceinstall ggi_exampleinstall ggi_distinstall ggi_zipinstall ggi_zipsourceinstall ggi_zipexampleinstall ggi_zipdistinstall ggi_clean ggi_distclean ggi_cleanall ggi_info ggi
 endif
 ifdef TARGET_DIRS_LIBPNG
 libpng_all:
 	$(MAKE) -C libpng all
 libpng_debug:
 	$(MAKE) -C libpng debug
-libpng_examples:
-	$(MAKE) -C libpng examples
 libpng_smart:
 	$(MAKE) -C libpng smart
+libpng_examples:
+	$(MAKE) -C libpng examples
 libpng_shared:
 	$(MAKE) -C libpng shared
 libpng_install:
@@ -1456,17 +1389,17 @@ libpng_info:
 	$(MAKE) -C libpng info
 libpng:
 	$(MAKE) -C libpng all
-.PHONY: libpng_all libpng_debug libpng_examples libpng_smart libpng_shared libpng_install libpng_sourceinstall libpng_exampleinstall libpng_distinstall libpng_zipinstall libpng_zipsourceinstall libpng_zipexampleinstall libpng_zipdistinstall libpng_clean libpng_distclean libpng_cleanall libpng_info libpng
+.PHONY: libpng_all libpng_debug libpng_smart libpng_examples libpng_shared libpng_install libpng_sourceinstall libpng_exampleinstall libpng_distinstall libpng_zipinstall libpng_zipsourceinstall libpng_zipexampleinstall libpng_zipdistinstall libpng_clean libpng_distclean libpng_cleanall libpng_info libpng
 endif
 ifdef TARGET_DIRS_LIBGD
 libgd_all:
 	$(MAKE) -C libgd all
 libgd_debug:
 	$(MAKE) -C libgd debug
-libgd_examples:
-	$(MAKE) -C libgd examples
 libgd_smart:
 	$(MAKE) -C libgd smart
+libgd_examples:
+	$(MAKE) -C libgd examples
 libgd_shared:
 	$(MAKE) -C libgd shared
 libgd_install:
@@ -1495,17 +1428,17 @@ libgd_info:
 	$(MAKE) -C libgd info
 libgd:
 	$(MAKE) -C libgd all
-.PHONY: libgd_all libgd_debug libgd_examples libgd_smart libgd_shared libgd_install libgd_sourceinstall libgd_exampleinstall libgd_distinstall libgd_zipinstall libgd_zipsourceinstall libgd_zipexampleinstall libgd_zipdistinstall libgd_clean libgd_distclean libgd_cleanall libgd_info libgd
+.PHONY: libgd_all libgd_debug libgd_smart libgd_examples libgd_shared libgd_install libgd_sourceinstall libgd_exampleinstall libgd_distinstall libgd_zipinstall libgd_zipsourceinstall libgd_zipexampleinstall libgd_zipdistinstall libgd_clean libgd_distclean libgd_cleanall libgd_info libgd
 endif
 ifdef TARGET_DIRS_UTMP
 utmp_all:
 	$(MAKE) -C utmp all
 utmp_debug:
 	$(MAKE) -C utmp debug
-utmp_examples:
-	$(MAKE) -C utmp examples
 utmp_smart:
 	$(MAKE) -C utmp smart
+utmp_examples:
+	$(MAKE) -C utmp examples
 utmp_shared:
 	$(MAKE) -C utmp shared
 utmp_install:
@@ -1534,17 +1467,17 @@ utmp_info:
 	$(MAKE) -C utmp info
 utmp:
 	$(MAKE) -C utmp all
-.PHONY: utmp_all utmp_debug utmp_examples utmp_smart utmp_shared utmp_install utmp_sourceinstall utmp_exampleinstall utmp_distinstall utmp_zipinstall utmp_zipsourceinstall utmp_zipexampleinstall utmp_zipdistinstall utmp_clean utmp_distclean utmp_cleanall utmp_info utmp
+.PHONY: utmp_all utmp_debug utmp_smart utmp_examples utmp_shared utmp_install utmp_sourceinstall utmp_exampleinstall utmp_distinstall utmp_zipinstall utmp_zipsourceinstall utmp_zipexampleinstall utmp_zipdistinstall utmp_clean utmp_distclean utmp_cleanall utmp_info utmp
 endif
 ifdef TARGET_DIRS_PASZLIB
 paszlib_all:
 	$(MAKE) -C paszlib all
 paszlib_debug:
 	$(MAKE) -C paszlib debug
-paszlib_examples:
-	$(MAKE) -C paszlib examples
 paszlib_smart:
 	$(MAKE) -C paszlib smart
+paszlib_examples:
+	$(MAKE) -C paszlib examples
 paszlib_shared:
 	$(MAKE) -C paszlib shared
 paszlib_install:
@@ -1573,17 +1506,17 @@ paszlib_info:
 	$(MAKE) -C paszlib info
 paszlib:
 	$(MAKE) -C paszlib all
-.PHONY: paszlib_all paszlib_debug paszlib_examples paszlib_smart paszlib_shared paszlib_install paszlib_sourceinstall paszlib_exampleinstall paszlib_distinstall paszlib_zipinstall paszlib_zipsourceinstall paszlib_zipexampleinstall paszlib_zipdistinstall paszlib_clean paszlib_distclean paszlib_cleanall paszlib_info paszlib
+.PHONY: paszlib_all paszlib_debug paszlib_smart paszlib_examples paszlib_shared paszlib_install paszlib_sourceinstall paszlib_exampleinstall paszlib_distinstall paszlib_zipinstall paszlib_zipsourceinstall paszlib_zipexampleinstall paszlib_zipdistinstall paszlib_clean paszlib_distclean paszlib_cleanall paszlib_info paszlib
 endif
 ifdef TARGET_DIRS_GDBINT
 gdbint_all:
 	$(MAKE) -C gdbint all
 gdbint_debug:
 	$(MAKE) -C gdbint debug
-gdbint_examples:
-	$(MAKE) -C gdbint examples
 gdbint_smart:
 	$(MAKE) -C gdbint smart
+gdbint_examples:
+	$(MAKE) -C gdbint examples
 gdbint_shared:
 	$(MAKE) -C gdbint shared
 gdbint_install:
@@ -1612,17 +1545,17 @@ gdbint_info:
 	$(MAKE) -C gdbint info
 gdbint:
 	$(MAKE) -C gdbint all
-.PHONY: gdbint_all gdbint_debug gdbint_examples gdbint_smart gdbint_shared gdbint_install gdbint_sourceinstall gdbint_exampleinstall gdbint_distinstall gdbint_zipinstall gdbint_zipsourceinstall gdbint_zipexampleinstall gdbint_zipdistinstall gdbint_clean gdbint_distclean gdbint_cleanall gdbint_info gdbint
+.PHONY: gdbint_all gdbint_debug gdbint_smart gdbint_examples gdbint_shared gdbint_install gdbint_sourceinstall gdbint_exampleinstall gdbint_distinstall gdbint_zipinstall gdbint_zipsourceinstall gdbint_zipexampleinstall gdbint_zipdistinstall gdbint_clean gdbint_distclean gdbint_cleanall gdbint_info gdbint
 endif
 ifdef TARGET_DIRS_CMEM
 cmem_all:
 	$(MAKE) -C cmem all
 cmem_debug:
 	$(MAKE) -C cmem debug
-cmem_examples:
-	$(MAKE) -C cmem examples
 cmem_smart:
 	$(MAKE) -C cmem smart
+cmem_examples:
+	$(MAKE) -C cmem examples
 cmem_shared:
 	$(MAKE) -C cmem shared
 cmem_install:
@@ -1651,17 +1584,17 @@ cmem_info:
 	$(MAKE) -C cmem info
 cmem:
 	$(MAKE) -C cmem all
-.PHONY: cmem_all cmem_debug cmem_examples cmem_smart cmem_shared cmem_install cmem_sourceinstall cmem_exampleinstall cmem_distinstall cmem_zipinstall cmem_zipsourceinstall cmem_zipexampleinstall cmem_zipdistinstall cmem_clean cmem_distclean cmem_cleanall cmem_info cmem
+.PHONY: cmem_all cmem_debug cmem_smart cmem_examples cmem_shared cmem_install cmem_sourceinstall cmem_exampleinstall cmem_distinstall cmem_zipinstall cmem_zipsourceinstall cmem_zipexampleinstall cmem_zipdistinstall cmem_clean cmem_distclean cmem_cleanall cmem_info cmem
 endif
 ifdef TARGET_DIRS_REGEXPR
 regexpr_all:
 	$(MAKE) -C regexpr all
 regexpr_debug:
 	$(MAKE) -C regexpr debug
-regexpr_examples:
-	$(MAKE) -C regexpr examples
 regexpr_smart:
 	$(MAKE) -C regexpr smart
+regexpr_examples:
+	$(MAKE) -C regexpr examples
 regexpr_shared:
 	$(MAKE) -C regexpr shared
 regexpr_install:
@@ -1690,17 +1623,17 @@ regexpr_info:
 	$(MAKE) -C regexpr info
 regexpr:
 	$(MAKE) -C regexpr all
-.PHONY: regexpr_all regexpr_debug regexpr_examples regexpr_smart regexpr_shared regexpr_install regexpr_sourceinstall regexpr_exampleinstall regexpr_distinstall regexpr_zipinstall regexpr_zipsourceinstall regexpr_zipexampleinstall regexpr_zipdistinstall regexpr_clean regexpr_distclean regexpr_cleanall regexpr_info regexpr
+.PHONY: regexpr_all regexpr_debug regexpr_smart regexpr_examples regexpr_shared regexpr_install regexpr_sourceinstall regexpr_exampleinstall regexpr_distinstall regexpr_zipinstall regexpr_zipsourceinstall regexpr_zipexampleinstall regexpr_zipdistinstall regexpr_clean regexpr_distclean regexpr_cleanall regexpr_info regexpr
 endif
 ifdef TARGET_DIRS_UNZIP
 unzip_all:
 	$(MAKE) -C unzip all
 unzip_debug:
 	$(MAKE) -C unzip debug
-unzip_examples:
-	$(MAKE) -C unzip examples
 unzip_smart:
 	$(MAKE) -C unzip smart
+unzip_examples:
+	$(MAKE) -C unzip examples
 unzip_shared:
 	$(MAKE) -C unzip shared
 unzip_install:
@@ -1729,26 +1662,26 @@ unzip_info:
 	$(MAKE) -C unzip info
 unzip:
 	$(MAKE) -C unzip all
-.PHONY: unzip_all unzip_debug unzip_examples unzip_smart unzip_shared unzip_install unzip_sourceinstall unzip_exampleinstall unzip_distinstall unzip_zipinstall unzip_zipsourceinstall unzip_zipexampleinstall unzip_zipdistinstall unzip_clean unzip_distclean unzip_cleanall unzip_info unzip
-endif
-all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
-install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
-sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
+.PHONY: unzip_all unzip_debug unzip_smart unzip_examples unzip_shared unzip_install unzip_sourceinstall unzip_exampleinstall unzip_distinstall unzip_zipinstall unzip_zipsourceinstall unzip_zipexampleinstall unzip_zipdistinstall unzip_clean unzip_distclean unzip_cleanall unzip_info unzip
+endif
+all: $(addsuffix _all,$(TARGET_DIRS))
+debug:
+smart:
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
+install: $(addsuffix _install,$(TARGET_DIRS))
+sourceinstall: $(addsuffix _sourceinstall,$(TARGET_DIRS))
+exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
+distinstall:
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS))
-clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
-distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+clean: $(addsuffix _clean,$(TARGET_DIRS))
+distclean: $(addsuffix _distclean,$(TARGET_DIRS))
+cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,7 +613,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -850,9 +866,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -892,9 +909,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -907,7 +924,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 27 - 9
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -480,6 +489,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_X11=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -661,7 +674,11 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -910,9 +927,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -956,10 +974,10 @@ demo_all:
 	$(MAKE) -C demo all
 demo_debug:
 	$(MAKE) -C demo debug
-demo_examples:
-	$(MAKE) -C demo examples
 demo_smart:
 	$(MAKE) -C demo smart
+demo_examples:
+	$(MAKE) -C demo examples
 demo_shared:
 	$(MAKE) -C demo shared
 demo_install:
@@ -988,13 +1006,13 @@ demo_info:
 	$(MAKE) -C demo info
 demo:
 	$(MAKE) -C demo all
-.PHONY: demo_all demo_debug demo_examples demo_smart demo_shared demo_install demo_sourceinstall demo_exampleinstall demo_distinstall demo_zipinstall demo_zipsourceinstall demo_zipexampleinstall demo_zipdistinstall demo_clean demo_distclean demo_cleanall demo_info demo
+.PHONY: demo_all demo_debug demo_smart demo_examples demo_shared demo_install demo_sourceinstall demo_exampleinstall demo_distinstall demo_zipinstall demo_zipsourceinstall demo_zipexampleinstall demo_zipdistinstall demo_clean demo_distclean demo_cleanall demo_info demo
 endif
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -1007,7 +1025,7 @@ clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 5
packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -184,6 +184,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -481,6 +490,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_FORMS=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_X11=1
+REQUIRE_PACKAGES_FORMS=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -681,6 +695,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -842,9 +860,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -884,9 +903,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -899,7 +918,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -189,6 +189,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -476,6 +485,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -618,7 +630,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -867,9 +883,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -909,9 +926,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -924,7 +941,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 93
packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -174,6 +174,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -537,86 +546,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
@@ -698,9 +630,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -738,23 +671,23 @@ fpc_info:
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
-debug: fpc_debug
-examples: fpc_examples
-smart: fpc_smart
-shared: fpc_shared
-install: fpc_install
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall
+debug:
+smart:
+examples:
+shared:
+install:
+sourceinstall:
+exampleinstall:
 distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:
 zipdistinstall:
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+clean:
+distclean:
+cleanall:
 info: fpc_info
-.PHONY: debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 27 - 94
packages/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -175,6 +175,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -538,86 +547,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
@@ -699,9 +631,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -739,24 +672,24 @@ fpc_info:
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
-all: fpc_all
-debug: fpc_debug
-examples: fpc_examples
-smart: fpc_smart
-shared: fpc_shared
-install: fpc_install
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall
+all:
+debug:
+smart:
+examples:
+shared:
+install:
+sourceinstall:
+exampleinstall:
 distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:
 zipdistinstall:
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+clean:
+distclean:
+cleanall:
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 32 - 14
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -190,6 +190,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -483,6 +492,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -679,7 +692,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -928,9 +945,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -974,10 +992,10 @@ gtkgl_all:
 	$(MAKE) -C gtkgl all
 gtkgl_debug:
 	$(MAKE) -C gtkgl debug
-gtkgl_examples:
-	$(MAKE) -C gtkgl examples
 gtkgl_smart:
 	$(MAKE) -C gtkgl smart
+gtkgl_examples:
+	$(MAKE) -C gtkgl examples
 gtkgl_shared:
 	$(MAKE) -C gtkgl shared
 gtkgl_install:
@@ -1006,7 +1024,7 @@ gtkgl_info:
 	$(MAKE) -C gtkgl info
 gtkgl:
 	$(MAKE) -C gtkgl all
-.PHONY: gtkgl_all gtkgl_debug gtkgl_examples gtkgl_smart gtkgl_shared gtkgl_install gtkgl_sourceinstall gtkgl_exampleinstall gtkgl_distinstall gtkgl_zipinstall gtkgl_zipsourceinstall gtkgl_zipexampleinstall gtkgl_zipdistinstall gtkgl_clean gtkgl_distclean gtkgl_cleanall gtkgl_info gtkgl
+.PHONY: gtkgl_all gtkgl_debug gtkgl_smart gtkgl_examples gtkgl_shared gtkgl_install gtkgl_sourceinstall gtkgl_exampleinstall gtkgl_distinstall gtkgl_zipinstall gtkgl_zipsourceinstall gtkgl_zipexampleinstall gtkgl_zipdistinstall gtkgl_clean gtkgl_distclean gtkgl_cleanall gtkgl_info gtkgl
 endif
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 ifdef TARGET_EXAMPLEDIRS_EXAMPLES
@@ -1014,10 +1032,10 @@ examples_all:
 	$(MAKE) -C examples all
 examples_debug:
 	$(MAKE) -C examples debug
-examples_examples:
-	$(MAKE) -C examples examples
 examples_smart:
 	$(MAKE) -C examples smart
+examples_examples:
+	$(MAKE) -C examples examples
 examples_shared:
 	$(MAKE) -C examples shared
 examples_install:
@@ -1046,13 +1064,13 @@ examples_info:
 	$(MAKE) -C examples info
 examples:
 	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_examples examples_smart examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples
+.PHONY: examples_all examples_debug examples_smart examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples
 endif
 all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
+debug: fpc_debug
+smart: fpc_smart
 examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+shared:
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
@@ -1064,8 +1082,8 @@ zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
 clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS)) $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 31 - 12
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -186,6 +186,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -484,6 +493,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -711,6 +725,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -872,9 +890,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -918,10 +937,10 @@ tutorial_all:
 	$(MAKE) -C tutorial all
 tutorial_debug:
 	$(MAKE) -C tutorial debug
-tutorial_examples:
-	$(MAKE) -C tutorial examples
 tutorial_smart:
 	$(MAKE) -C tutorial smart
+tutorial_examples:
+	$(MAKE) -C tutorial examples
 tutorial_shared:
 	$(MAKE) -C tutorial shared
 tutorial_install:
@@ -950,17 +969,17 @@ tutorial_info:
 	$(MAKE) -C tutorial info
 tutorial:
 	$(MAKE) -C tutorial all
-.PHONY: tutorial_all tutorial_debug tutorial_examples tutorial_smart tutorial_shared tutorial_install tutorial_sourceinstall tutorial_exampleinstall tutorial_distinstall tutorial_zipinstall tutorial_zipsourceinstall tutorial_zipexampleinstall tutorial_zipdistinstall tutorial_clean tutorial_distclean tutorial_cleanall tutorial_info tutorial
+.PHONY: tutorial_all tutorial_debug tutorial_smart tutorial_examples tutorial_shared tutorial_install tutorial_sourceinstall tutorial_exampleinstall tutorial_distinstall tutorial_zipinstall tutorial_zipsourceinstall tutorial_zipexampleinstall tutorial_zipdistinstall tutorial_clean tutorial_distclean tutorial_cleanall tutorial_info tutorial
 endif
 all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+debug: fpc_debug
+smart: fpc_smart
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(TARGET_DIRS))
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
-distinstall: $(addsuffix _distinstall,$(TARGET_DIRS))
+distinstall:
 zipinstall: $(addsuffix _zipinstall,$(TARGET_DIRS))
 zipsourceinstall: $(addsuffix _zipsourceinstall,$(TARGET_DIRS))
 zipexampleinstall: $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
@@ -968,8 +987,8 @@ zipdistinstall: $(addsuffix _zipdistinstall,$(TARGET_DIRS))
 clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
 distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 31 - 94
packages/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -183,6 +183,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -476,6 +485,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_GTK=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_GTK=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifdef REQUIRE_PACKAGES_GTK
 PACKAGEDIR_GTK:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /gtk/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_GTK),)
@@ -664,86 +677,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
@@ -825,9 +761,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -865,24 +802,24 @@ fpc_info:
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
-all: fpc_all
-debug: fpc_debug
-examples: fpc_examples
-smart: fpc_smart
-shared: fpc_shared
-install: fpc_install
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall
+all:
+debug:
+smart:
+examples:
+shared:
+install:
+sourceinstall:
+exampleinstall:
 distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:
 zipdistinstall:
-clean: fpc_clean
-distclean: fpc_distclean
-cleanall: fpc_cleanall
+clean:
+distclean:
+cleanall:
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 6
packages/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -480,6 +489,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -676,7 +689,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -852,9 +869,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -894,9 +912,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -909,7 +927,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,7 +613,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -850,9 +866,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -892,9 +909,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -907,7 +924,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 5
packages/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -186,6 +186,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -478,6 +487,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_ZLIB=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_ZLIB=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -647,6 +660,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -881,9 +898,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -923,9 +941,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -938,7 +956,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 9
packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -195,6 +195,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -483,6 +492,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -652,7 +664,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -901,9 +917,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -947,10 +964,10 @@ examples_all:
 	$(MAKE) -C examples all
 examples_debug:
 	$(MAKE) -C examples debug
-examples_examples:
-	$(MAKE) -C examples examples
 examples_smart:
 	$(MAKE) -C examples smart
+examples_examples:
+	$(MAKE) -C examples examples
 examples_shared:
 	$(MAKE) -C examples shared
 examples_install:
@@ -979,13 +996,13 @@ examples_info:
 	$(MAKE) -C examples info
 examples:
 	$(MAKE) -C examples all
-.PHONY: examples_all examples_debug examples_examples examples_smart examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples
+.PHONY: examples_all examples_debug examples_smart examples_examples examples_shared examples_install examples_sourceinstall examples_exampleinstall examples_distinstall examples_zipinstall examples_zipsourceinstall examples_zipexampleinstall examples_zipdistinstall examples_clean examples_distclean examples_cleanall examples_info examples
 endif
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -998,7 +1015,7 @@ clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 5
packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -487,6 +496,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -776,6 +790,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -937,9 +955,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -979,9 +998,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -994,7 +1013,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 5
packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -184,6 +184,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -477,6 +486,10 @@ ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_OPENGL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -677,6 +690,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -838,9 +855,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -880,9 +898,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -895,7 +913,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 9
packages/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -911,10 +928,10 @@ example_all:
 	$(MAKE) -C example all
 example_debug:
 	$(MAKE) -C example debug
-example_examples:
-	$(MAKE) -C example examples
 example_smart:
 	$(MAKE) -C example smart
+example_examples:
+	$(MAKE) -C example examples
 example_shared:
 	$(MAKE) -C example shared
 example_install:
@@ -943,13 +960,13 @@ example_info:
 	$(MAKE) -C example info
 example:
 	$(MAKE) -C example all
-.PHONY: example_all example_debug example_examples example_smart example_shared example_install example_sourceinstall example_exampleinstall example_distinstall example_zipinstall example_zipsourceinstall example_zipexampleinstall example_zipdistinstall example_clean example_distclean example_cleanall example_info example
+.PHONY: example_all example_debug example_smart example_examples example_shared example_install example_sourceinstall example_exampleinstall example_distinstall example_zipinstall example_zipsourceinstall example_zipexampleinstall example_zipdistinstall example_clean example_distclean example_cleanall example_info example
 endif
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -962,7 +979,7 @@ clean: fpc_clean $(addsuffix _clean,$(TARGET_EXAMPLEDIRS))
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 26 - 6
packages/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -492,6 +501,12 @@ REQUIRE_PACKAGES_ORACLE=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_ORACLE=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -796,7 +811,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -972,9 +991,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -1014,9 +1034,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -1029,7 +1049,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,7 +613,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -850,9 +866,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -892,9 +909,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -907,7 +924,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -466,6 +475,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -602,7 +614,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -851,9 +867,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -893,9 +910,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -908,7 +925,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -474,6 +483,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -616,7 +628,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -865,9 +881,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -907,9 +924,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -922,7 +939,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,7 +613,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -850,9 +866,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -892,9 +909,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 distinstall: fpc_distinstall
@@ -906,7 +923,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
packages/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -189,6 +189,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -467,6 +476,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -837,9 +853,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -879,9 +896,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -894,7 +911,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 23 - 6
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -601,7 +613,11 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
-.PHONY: fpc_examples fpc_test
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+.PHONY: fpc_examples
 ifdef TARGET_EXAMPLES
 HASEXAMPLES=1
 override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))
@@ -850,9 +866,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -892,9 +909,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples: fpc_examples
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -907,7 +924,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -186,6 +186,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -473,6 +482,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -615,6 +627,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -849,9 +865,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -891,9 +908,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -906,7 +923,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -186,6 +186,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -473,6 +482,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -615,6 +627,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -849,9 +865,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -891,9 +908,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -906,7 +923,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 47 - 114
rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/02]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -203,6 +203,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -566,86 +575,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
@@ -800,9 +732,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -863,10 +796,10 @@ linux_all:
 	$(MAKE) -C linux all
 linux_debug:
 	$(MAKE) -C linux debug
-linux_examples:
-	$(MAKE) -C linux examples
 linux_smart:
 	$(MAKE) -C linux smart
+linux_examples:
+	$(MAKE) -C linux examples
 linux_shared:
 	$(MAKE) -C linux shared
 linux_install:
@@ -895,17 +828,17 @@ linux_info:
 	$(MAKE) -C linux info
 linux:
 	$(MAKE) -C linux all
-.PHONY: linux_all linux_debug linux_examples linux_smart linux_shared linux_install linux_sourceinstall linux_exampleinstall linux_distinstall linux_zipinstall linux_zipsourceinstall linux_zipexampleinstall linux_zipdistinstall linux_clean linux_distclean linux_cleanall linux_info linux
+.PHONY: linux_all linux_debug linux_smart linux_examples linux_shared linux_install linux_sourceinstall linux_exampleinstall linux_distinstall linux_zipinstall linux_zipsourceinstall linux_zipexampleinstall linux_zipdistinstall linux_clean linux_distclean linux_cleanall linux_info linux
 endif
 ifdef TARGET_DIRS_GO32V2
 go32v2_all:
 	$(MAKE) -C go32v2 all
 go32v2_debug:
 	$(MAKE) -C go32v2 debug
-go32v2_examples:
-	$(MAKE) -C go32v2 examples
 go32v2_smart:
 	$(MAKE) -C go32v2 smart
+go32v2_examples:
+	$(MAKE) -C go32v2 examples
 go32v2_shared:
 	$(MAKE) -C go32v2 shared
 go32v2_install:
@@ -934,17 +867,17 @@ go32v2_info:
 	$(MAKE) -C go32v2 info
 go32v2:
 	$(MAKE) -C go32v2 all
-.PHONY: go32v2_all go32v2_debug go32v2_examples go32v2_smart go32v2_shared go32v2_install go32v2_sourceinstall go32v2_exampleinstall go32v2_distinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_zipexampleinstall go32v2_zipdistinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_info go32v2
+.PHONY: go32v2_all go32v2_debug go32v2_smart go32v2_examples go32v2_shared go32v2_install go32v2_sourceinstall go32v2_exampleinstall go32v2_distinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_zipexampleinstall go32v2_zipdistinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_info go32v2
 endif
 ifdef TARGET_DIRS_WIN32
 win32_all:
 	$(MAKE) -C win32 all
 win32_debug:
 	$(MAKE) -C win32 debug
-win32_examples:
-	$(MAKE) -C win32 examples
 win32_smart:
 	$(MAKE) -C win32 smart
+win32_examples:
+	$(MAKE) -C win32 examples
 win32_shared:
 	$(MAKE) -C win32 shared
 win32_install:
@@ -973,17 +906,17 @@ win32_info:
 	$(MAKE) -C win32 info
 win32:
 	$(MAKE) -C win32 all
-.PHONY: win32_all win32_debug win32_examples win32_smart win32_shared win32_install win32_sourceinstall win32_exampleinstall win32_distinstall win32_zipinstall win32_zipsourceinstall win32_zipexampleinstall win32_zipdistinstall win32_clean win32_distclean win32_cleanall win32_info win32
+.PHONY: win32_all win32_debug win32_smart win32_examples win32_shared win32_install win32_sourceinstall win32_exampleinstall win32_distinstall win32_zipinstall win32_zipsourceinstall win32_zipexampleinstall win32_zipdistinstall win32_clean win32_distclean win32_cleanall win32_info win32
 endif
 ifdef TARGET_DIRS_OS2
 os2_all:
 	$(MAKE) -C os2 all
 os2_debug:
 	$(MAKE) -C os2 debug
-os2_examples:
-	$(MAKE) -C os2 examples
 os2_smart:
 	$(MAKE) -C os2 smart
+os2_examples:
+	$(MAKE) -C os2 examples
 os2_shared:
 	$(MAKE) -C os2 shared
 os2_install:
@@ -1012,17 +945,17 @@ os2_info:
 	$(MAKE) -C os2 info
 os2:
 	$(MAKE) -C os2 all
-.PHONY: os2_all os2_debug os2_examples os2_smart os2_shared os2_install os2_sourceinstall os2_exampleinstall os2_distinstall os2_zipinstall os2_zipsourceinstall os2_zipexampleinstall os2_zipdistinstall os2_clean os2_distclean os2_cleanall os2_info os2
+.PHONY: os2_all os2_debug os2_smart os2_examples os2_shared os2_install os2_sourceinstall os2_exampleinstall os2_distinstall os2_zipinstall os2_zipsourceinstall os2_zipexampleinstall os2_zipdistinstall os2_clean os2_distclean os2_cleanall os2_info os2
 endif
 ifdef TARGET_DIRS_FREEBSD
 freebsd_all:
 	$(MAKE) -C freebsd all
 freebsd_debug:
 	$(MAKE) -C freebsd debug
-freebsd_examples:
-	$(MAKE) -C freebsd examples
 freebsd_smart:
 	$(MAKE) -C freebsd smart
+freebsd_examples:
+	$(MAKE) -C freebsd examples
 freebsd_shared:
 	$(MAKE) -C freebsd shared
 freebsd_install:
@@ -1051,17 +984,17 @@ freebsd_info:
 	$(MAKE) -C freebsd info
 freebsd:
 	$(MAKE) -C freebsd all
-.PHONY: freebsd_all freebsd_debug freebsd_examples freebsd_smart freebsd_shared freebsd_install freebsd_sourceinstall freebsd_exampleinstall freebsd_distinstall freebsd_zipinstall freebsd_zipsourceinstall freebsd_zipexampleinstall freebsd_zipdistinstall freebsd_clean freebsd_distclean freebsd_cleanall freebsd_info freebsd
+.PHONY: freebsd_all freebsd_debug freebsd_smart freebsd_examples freebsd_shared freebsd_install freebsd_sourceinstall freebsd_exampleinstall freebsd_distinstall freebsd_zipinstall freebsd_zipsourceinstall freebsd_zipexampleinstall freebsd_zipdistinstall freebsd_clean freebsd_distclean freebsd_cleanall freebsd_info freebsd
 endif
 ifdef TARGET_DIRS_BEOS
 beos_all:
 	$(MAKE) -C beos all
 beos_debug:
 	$(MAKE) -C beos debug
-beos_examples:
-	$(MAKE) -C beos examples
 beos_smart:
 	$(MAKE) -C beos smart
+beos_examples:
+	$(MAKE) -C beos examples
 beos_shared:
 	$(MAKE) -C beos shared
 beos_install:
@@ -1090,26 +1023,26 @@ beos_info:
 	$(MAKE) -C beos info
 beos:
 	$(MAKE) -C beos all
-.PHONY: beos_all beos_debug beos_examples beos_smart beos_shared beos_install beos_sourceinstall beos_exampleinstall beos_distinstall beos_zipinstall beos_zipsourceinstall beos_zipexampleinstall beos_zipdistinstall beos_clean beos_distclean beos_cleanall beos_info beos
-endif
-all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
-install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
+.PHONY: beos_all beos_debug beos_smart beos_examples beos_shared beos_install beos_sourceinstall beos_exampleinstall beos_distinstall beos_zipinstall beos_zipsourceinstall beos_zipexampleinstall beos_zipdistinstall beos_clean beos_distclean beos_cleanall beos_info beos
+endif
+all: $(addsuffix _all,$(TARGET_DIRS))
+debug:
+smart:
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
+install: $(addsuffix _install,$(TARGET_DIRS))
+sourceinstall:
+exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
 zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
-clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
-distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+clean: $(addsuffix _clean,$(TARGET_DIRS))
+distclean: $(addsuffix _distclean,$(TARGET_DIRS))
+cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 15 - 5
rtl/beos/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/02]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -199,6 +199,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -750,9 +759,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -792,9 +802,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -807,7 +817,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 15 - 5
rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -212,6 +212,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -763,9 +772,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -805,9 +815,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -820,7 +830,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 19 - 5
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -197,6 +197,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -583,6 +592,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -744,9 +757,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -786,9 +800,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -801,7 +815,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 15 - 5
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -204,6 +204,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -755,9 +764,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -797,9 +807,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -812,7 +822,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 15 - 5
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/02]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -213,6 +213,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -764,9 +773,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +816,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +831,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 15 - 5
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -203,6 +203,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -754,9 +763,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -796,9 +806,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -811,7 +821,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 15 - 5
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -208,6 +208,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -759,9 +768,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -801,9 +811,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -816,7 +826,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 24 - 91
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: allexectests
 override PATH:=$(subst \,/,$(PATH))
@@ -183,6 +183,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -546,86 +555,9 @@ ifeq ($(OS_SOURCE),$(OS_TARGET))
 EXECPPAS:=@$(PPAS)
 endif
 endif
-.PHONY: fpc_packages fpc_all fpc_smart fpc_debug
-$(FPCMADE): $(ALLTARGET)
-	@$(ECHO) Compiled > $(FPCMADE)
-fpc_packages: $(COMPILEPACKAGES)
-fpc_all: fpc_packages $(FPCMADE)
-fpc_smart:
-	$(MAKE) all LINKSMART=1 CREATESMART=1
-fpc_debug:
-	$(MAKE) all DEBUG=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp
-%$(PPUEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(PPUEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pp
-	$(COMPILER) $<
-	$(EXECPPAS)
-%$(EXEEXT): %.pas
-	$(COMPILER) $<
-	$(EXECPPAS)
-vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
-.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
-ifdef INSTALL_UNITS
-override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
-endif
-ifdef INSTALLPPUFILES
-ifdef PPUFILES
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES)))
-else
-override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
-override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
-override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
-endif
-endif
-ifdef INSTALLEXEFILES
-override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
-endif
-fpc_install: $(INSTALLTARGET)
-ifdef INSTALLEXEFILES
-	$(MKDIR) $(INSTALL_BINDIR)
-ifdef UPXPROG
-	-$(UPXPROG) $(INSTALLEXEFILES)
-endif
-	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
-endif
-ifdef INSTALLPPUFILES
-	$(MKDIR) $(INSTALL_UNITDIR)
-	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
-ifneq ($(INSTALLPPULINKFILES),)
-	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
-endif
-ifneq ($(wildcard $(LIB_FULLNAME)),)
-	$(MKDIR) $(INSTALL_LIBDIR)
-	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
-ifdef inUnix
-	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
-endif
-endif
-endif
-ifdef INSTALL_FILES
-	$(MKDIR) $(INSTALL_DATADIR)
-	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
-endif
-fpc_sourceinstall: distclean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
-fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
-ifdef HASEXAMPLES
-	$(MKDIR) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef EXAMPLESOURCEFILES
-	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
-endif
-ifdef TARGET_EXAMPLEDIRS
-	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_clean fpc_cleanall fpc_distclean
 ifdef EXEFILES
@@ -707,9 +639,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -747,20 +680,20 @@ fpc_info:
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
-debug: fpc_debug
-examples: fpc_examples
-smart: fpc_smart
-shared: fpc_shared
-install: fpc_install
-sourceinstall: fpc_sourceinstall
-exampleinstall: fpc_exampleinstall
+debug:
+smart:
+examples:
+shared:
+install:
+sourceinstall:
+exampleinstall:
 distinstall:
 zipinstall:
 zipsourceinstall:
 zipexampleinstall:
 zipdistinstall:
-cleanall: fpc_cleanall
-.PHONY: debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall
+cleanall:
+.PHONY: debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall cleanall
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -184,6 +184,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -462,6 +471,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -598,6 +610,10 @@ override INSTALLPPUFILES+=$(UNITPPUFILES)
 override CLEANPPUFILES+=$(UNITPPUFILES)
 endif
 fpc_units: $(UNITPPUFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -759,9 +775,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -801,9 +818,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -815,7 +832,7 @@ zipdistinstall:
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 39 - 20
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -188,6 +188,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -490,6 +499,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_PASZLIB=1
 REQUIRE_PACKAGES_FCL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_PASZLIB=1
+REQUIRE_PACKAGES_FCL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -771,6 +785,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -1005,9 +1023,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -1054,10 +1073,10 @@ fpcm_all:
 	$(MAKE) -C fpcm all
 fpcm_debug:
 	$(MAKE) -C fpcm debug
-fpcm_examples:
-	$(MAKE) -C fpcm examples
 fpcm_smart:
 	$(MAKE) -C fpcm smart
+fpcm_examples:
+	$(MAKE) -C fpcm examples
 fpcm_shared:
 	$(MAKE) -C fpcm shared
 fpcm_install:
@@ -1086,17 +1105,17 @@ fpcm_info:
 	$(MAKE) -C fpcm info
 fpcm:
 	$(MAKE) -C fpcm all
-.PHONY: fpcm_all fpcm_debug fpcm_examples fpcm_smart fpcm_shared fpcm_install fpcm_sourceinstall fpcm_exampleinstall fpcm_distinstall fpcm_zipinstall fpcm_zipsourceinstall fpcm_zipexampleinstall fpcm_zipdistinstall fpcm_clean fpcm_distclean fpcm_cleanall fpcm_info fpcm
+.PHONY: fpcm_all fpcm_debug fpcm_smart fpcm_examples fpcm_shared fpcm_install fpcm_sourceinstall fpcm_exampleinstall fpcm_distinstall fpcm_zipinstall fpcm_zipsourceinstall fpcm_zipexampleinstall fpcm_zipdistinstall fpcm_clean fpcm_distclean fpcm_cleanall fpcm_info fpcm
 endif
 ifdef TARGET_DIRS_TPLY
 tply_all:
 	$(MAKE) -C tply all
 tply_debug:
 	$(MAKE) -C tply debug
-tply_examples:
-	$(MAKE) -C tply examples
 tply_smart:
 	$(MAKE) -C tply smart
+tply_examples:
+	$(MAKE) -C tply examples
 tply_shared:
 	$(MAKE) -C tply shared
 tply_install:
@@ -1125,17 +1144,17 @@ tply_info:
 	$(MAKE) -C tply info
 tply:
 	$(MAKE) -C tply all
-.PHONY: tply_all tply_debug tply_examples tply_smart tply_shared tply_install tply_sourceinstall tply_exampleinstall tply_distinstall tply_zipinstall tply_zipsourceinstall tply_zipexampleinstall tply_zipdistinstall tply_clean tply_distclean tply_cleanall tply_info tply
+.PHONY: tply_all tply_debug tply_smart tply_examples tply_shared tply_install tply_sourceinstall tply_exampleinstall tply_distinstall tply_zipinstall tply_zipsourceinstall tply_zipexampleinstall tply_zipdistinstall tply_clean tply_distclean tply_cleanall tply_info tply
 endif
 ifdef TARGET_DIRS_H2PAS
 h2pas_all:
 	$(MAKE) -C h2pas all
 h2pas_debug:
 	$(MAKE) -C h2pas debug
-h2pas_examples:
-	$(MAKE) -C h2pas examples
 h2pas_smart:
 	$(MAKE) -C h2pas smart
+h2pas_examples:
+	$(MAKE) -C h2pas examples
 h2pas_shared:
 	$(MAKE) -C h2pas shared
 h2pas_install:
@@ -1164,17 +1183,17 @@ h2pas_info:
 	$(MAKE) -C h2pas info
 h2pas:
 	$(MAKE) -C h2pas all
-.PHONY: h2pas_all h2pas_debug h2pas_examples h2pas_smart h2pas_shared h2pas_install h2pas_sourceinstall h2pas_exampleinstall h2pas_distinstall h2pas_zipinstall h2pas_zipsourceinstall h2pas_zipexampleinstall h2pas_zipdistinstall h2pas_clean h2pas_distclean h2pas_cleanall h2pas_info h2pas
+.PHONY: h2pas_all h2pas_debug h2pas_smart h2pas_examples h2pas_shared h2pas_install h2pas_sourceinstall h2pas_exampleinstall h2pas_distinstall h2pas_zipinstall h2pas_zipsourceinstall h2pas_zipexampleinstall h2pas_zipdistinstall h2pas_clean h2pas_distclean h2pas_cleanall h2pas_info h2pas
 endif
 ifdef TARGET_DIRS_FPRCP
 fprcp_all:
 	$(MAKE) -C fprcp all
 fprcp_debug:
 	$(MAKE) -C fprcp debug
-fprcp_examples:
-	$(MAKE) -C fprcp examples
 fprcp_smart:
 	$(MAKE) -C fprcp smart
+fprcp_examples:
+	$(MAKE) -C fprcp examples
 fprcp_shared:
 	$(MAKE) -C fprcp shared
 fprcp_install:
@@ -1203,13 +1222,13 @@ fprcp_info:
 	$(MAKE) -C fprcp info
 fprcp:
 	$(MAKE) -C fprcp all
-.PHONY: fprcp_all fprcp_debug fprcp_examples fprcp_smart fprcp_shared fprcp_install fprcp_sourceinstall fprcp_exampleinstall fprcp_distinstall fprcp_zipinstall fprcp_zipsourceinstall fprcp_zipexampleinstall fprcp_zipdistinstall fprcp_clean fprcp_distclean fprcp_cleanall fprcp_info fprcp
+.PHONY: fprcp_all fprcp_debug fprcp_smart fprcp_examples fprcp_shared fprcp_install fprcp_sourceinstall fprcp_exampleinstall fprcp_distinstall fprcp_zipinstall fprcp_zipsourceinstall fprcp_zipexampleinstall fprcp_zipdistinstall fprcp_clean fprcp_distclean fprcp_cleanall fprcp_info fprcp
 endif
 all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
-debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
-examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
-smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
-shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+debug: fpc_debug
+smart: fpc_smart
+examples: $(addsuffix _examples,$(TARGET_DIRS))
+shared:
 install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
@@ -1221,8 +1240,8 @@ zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
 clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
 distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
-info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+info: fpc_info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -463,6 +472,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -764,9 +780,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +823,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +838,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -186,6 +186,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -464,6 +473,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -604,6 +616,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -765,9 +781,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -807,9 +824,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -822,7 +839,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -185,6 +185,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -463,6 +472,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -603,6 +615,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -764,9 +780,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -806,9 +823,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 install: fpc_install
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
@@ -821,7 +838,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif

+ 22 - 5
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/04]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -187,6 +187,15 @@ LDCONFIG=ldconfig
 else
 LDCONFIG=
 endif
+ifndef FPCMAKE
+FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(FPCMAKE),)
+FPCMAKE=
+else
+FPCMAKE:=$(firstword $(FPCMAKE))
+endif
+endif
+export FPCMAKE
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
@@ -465,6 +474,9 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
 endif
+ifeq ($(OS_TARGET),beos)
+REQUIRE_PACKAGES_RTL=1
+endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -613,6 +625,10 @@ override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
 endif
 endif
 fpc_exes: $(EXEFILES)
+ifdef TARGET_RSTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
+override CLEANRSTFILES+=$(RSTFILES)
+endif
 .PHONY: fpc_packages fpc_all fpc_smart fpc_debug
 $(FPCMADE): $(ALLTARGET)
 	@$(ECHO) Compiled > $(FPCMADE)
@@ -774,9 +790,10 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  Pwd....... $(PWD)
 	@$(ECHO)  Echo...... $(ECHO)
+	@$(ECHO)  Date...... $(DATE)
+	@$(ECHO)  FPCMake... $(FPCMAKE)
 	@$(ECHO)  PPUMove... $(PPUMOVE)
 	@$(ECHO)  PPUFiles.. $(PPUFILES)
-	@$(ECHO)  Date...... $(DATE)
 	@$(ECHO)  Upx....... $(UPXPROG)
 	@$(ECHO)  Zip....... $(ZIPPROG)
 	@$(ECHO)
@@ -816,9 +833,9 @@ fpc_info:
 	@$(ECHO)
 all: fpc_all
 debug: fpc_debug
-examples: fpc_examples
 smart: fpc_smart
-shared: fpc_shared
+examples:
+shared:
 sourceinstall: fpc_sourceinstall
 exampleinstall: fpc_exampleinstall
 distinstall:
@@ -830,7 +847,7 @@ clean: fpc_clean
 distclean: fpc_distclean
 cleanall: fpc_cleanall
 info: fpc_info
-.PHONY: all debug examples smart shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
+.PHONY: all debug smart examples shared sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif