Browse Source

* smart,shared lib including for rpm/deb

peter 25 years ago
parent
commit
8e4522215a
87 changed files with 839 additions and 594 deletions
  1. 1 1
      api/Makefile
  2. 10 5
      api/go32v2/Makefile
  3. 11 6
      api/linux/Makefile
  4. 1 1
      api/linux/Makefile.fpc
  5. 10 5
      api/win32/Makefile
  6. 13 41
      base/Makefile
  7. 10 5
      compiler/Makefile
  8. 10 5
      compiler/new/Makefile
  9. 1 1
      fcl/Makefile
  10. 10 5
      fcl/db/Makefile
  11. 10 5
      fcl/go32v2/Makefile
  12. 7 5
      fcl/linux/Makefile
  13. 10 5
      fcl/os2/Makefile
  14. 10 5
      fcl/shedit/gtk/Makefile
  15. 10 5
      fcl/tests/Makefile
  16. 10 5
      fcl/win32/Makefile
  17. 1 1
      ide/Makefile
  18. 1 1
      ide/fake/Makefile
  19. 10 5
      ide/fake/compiler/Makefile
  20. 10 5
      ide/fake/gdb/Makefile
  21. 10 5
      ide/text/Makefile
  22. 12 12
      install/debian/control
  23. 2 2
      install/debian/copyright
  24. 1 0
      install/debian/fp-units-api.files.in
  25. 5 0
      install/debian/fp-units-base.files.in
  26. 6 0
      install/debian/fp-units-db.files.in
  27. 1 0
      install/debian/fp-units-fcl.files.in
  28. 5 0
      install/debian/fp-units-gfx.files.in
  29. 5 0
      install/debian/fp-units-gtk.files.in
  30. 24 0
      install/debian/fp-units-misc.files.in
  31. 2 1
      install/debian/fp-units-net.files.in
  32. 1 0
      install/debian/fp-units-rtl.files.in
  33. 5 4
      install/debian/rules
  34. 18 42
      install/demo/Makefile
  35. 13 22
      install/demo/graph/Makefile
  36. 13 22
      install/demo/linux/Makefile
  37. 13 22
      install/demo/modex/Makefile
  38. 13 22
      install/demo/text/Makefile
  39. 13 22
      install/demo/win32/Makefile
  40. 9 6
      install/fpc-0.99.15.spec
  41. 10 5
      install/fpinst/Makefile
  42. 1 1
      packages/Makefile
  43. 10 5
      packages/cmem/Makefile
  44. 10 5
      packages/forms/Makefile
  45. 10 5
      packages/forms/demo/Makefile
  46. 10 5
      packages/gdbint/Makefile
  47. 1 1
      packages/gdbint/libgdb/Makefile
  48. 10 5
      packages/ggi/Makefile
  49. 11 6
      packages/gtk/Makefile
  50. 1 1
      packages/gtk/Makefile.fpc
  51. 10 5
      packages/gtk/examples/Makefile
  52. 10 5
      packages/gtk/tutorial/Makefile
  53. 10 5
      packages/ibase/Makefile
  54. 10 5
      packages/inet/Makefile
  55. 10 5
      packages/mysql/Makefile
  56. 10 5
      packages/ncurses/Makefile
  57. 1 1
      packages/opengl/Makefile
  58. 10 5
      packages/opengl/build/Makefile
  59. 12 5
      packages/opengl/build2/Makefile
  60. 10 5
      packages/opengl/examples/Makefile
  61. 10 5
      packages/opengl/linux/Makefile
  62. 10 5
      packages/paszlib/Makefile
  63. 10 5
      packages/postgres/Makefile
  64. 10 5
      packages/regexpr/Makefile
  65. 10 5
      packages/svgalib/Makefile
  66. 10 5
      packages/syslog/Makefile
  67. 10 5
      packages/uncgi/Makefile
  68. 10 5
      packages/utmp/Makefile
  69. 10 5
      packages/x11/Makefile
  70. 10 5
      packages/zip/Makefile
  71. 10 5
      packages/zlib/Makefile
  72. 1 1
      rtl/Makefile
  73. 33 12
      rtl/bsd/Makefile
  74. 10 5
      rtl/go32v1/Makefile
  75. 10 5
      rtl/go32v2/Makefile
  76. 10 5
      rtl/linux/Makefile
  77. 10 5
      rtl/os2/Makefile
  78. 10 5
      rtl/win32/Makefile
  79. 1 1
      tests/Makefile
  80. 10 5
      tests/units/Makefile
  81. 10 5
      utils/Makefile
  82. 84 82
      utils/fpcmake.inc
  83. 6 4
      utils/fpcmake.ini
  84. 10 5
      utils/fprcp/Makefile
  85. 10 5
      utils/h2pas/Makefile
  86. 10 5
      utils/simulator/Makefile
  87. 10 5
      utils/tply/Makefile

+ 1 - 1
api/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 10 - 5
api/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -689,12 +689,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -918,7 +918,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1078,6 +1080,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 11 - 6
api/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -230,7 +230,7 @@ override PACKAGES+=rtl
 
 
 # Libraries
 # Libraries
 
 
-LIBNAME=fpapi
+LIBNAME=libfpapi.so.1.0
 
 
 # Info
 # Info
 
 
@@ -689,12 +689,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -918,7 +918,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1078,6 +1080,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
api/linux/Makefile.fpc

@@ -14,7 +14,7 @@ unitsubdir=api
 packagename=api
 packagename=api
 
 
 [libs]
 [libs]
-libname=fpapi
+libname=libfpapi.so.1.0
 
 
 [dirs]
 [dirs]
 fpcdir=../..
 fpcdir=../..

+ 10 - 5
api/win32/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -689,12 +689,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -918,7 +918,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1078,6 +1080,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 13 - 41
base/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: help
 defaultrule: help
@@ -637,11 +637,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -691,15 +686,13 @@ showinstall: $(addsuffix _showinstall,$(DIROBJECTS))
 
 
 sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS))
 sourceinstall: $(addsuffix _sourceinstall,$(DIROBJECTS))
 
 
-exampleinstall: $(addsuffix _exampleinstall,$(DIROBJECTS))
-
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
 
 
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(DIROBJECTS))
 cleanall: fpc_cleanall $(addsuffix _cleanall,$(DIROBJECTS))
 
 
 require: $(addsuffix _require,$(DIROBJECTS))
 require: $(addsuffix _require,$(DIROBJECTS))
 
 
-.PHONY:  debug examples test smart shared showinstall sourceinstall exampleinstall zipsourceinstall cleanall require
+.PHONY:  debug examples test smart shared showinstall sourceinstall zipsourceinstall cleanall require
 
 
 #####################################################################
 #####################################################################
 # Zip
 # Zip
@@ -790,6 +783,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 
@@ -819,7 +815,7 @@ OBJECTDIRIDE=1
 # Dir compiler
 # Dir compiler
 
 
 ifdef OBJECTDIRCOMPILER
 ifdef OBJECTDIRCOMPILER
-.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_exampleinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_distclean compiler_cleanall compiler_require compiler_info
+.PHONY:  compiler_all compiler_debug compiler_examples compiler_test compiler_smart compiler_shared compiler_showinstall compiler_install compiler_sourceinstall compiler_zipinstall compiler_zipsourceinstall compiler_clean compiler_distclean compiler_cleanall compiler_require compiler_info
 
 
 compiler_all:
 compiler_all:
 	$(MAKE) -C compiler all
 	$(MAKE) -C compiler all
@@ -848,9 +844,6 @@ compiler_install:
 compiler_sourceinstall:
 compiler_sourceinstall:
 	$(MAKE) -C compiler sourceinstall
 	$(MAKE) -C compiler sourceinstall
 
 
-compiler_exampleinstall:
-	$(MAKE) -C compiler exampleinstall
-
 compiler_zipinstall:
 compiler_zipinstall:
 	$(MAKE) -C compiler zipinstall
 	$(MAKE) -C compiler zipinstall
 
 
@@ -876,7 +869,7 @@ endif
 # Dir rtl
 # Dir rtl
 
 
 ifdef OBJECTDIRRTL
 ifdef OBJECTDIRRTL
-.PHONY:  rtl_all rtl_debug rtl_examples rtl_test rtl_smart rtl_shared rtl_showinstall rtl_install rtl_sourceinstall rtl_exampleinstall rtl_zipinstall rtl_zipsourceinstall rtl_clean rtl_distclean rtl_cleanall rtl_require rtl_info
+.PHONY:  rtl_all rtl_debug rtl_examples rtl_test rtl_smart rtl_shared rtl_showinstall rtl_install rtl_sourceinstall rtl_zipinstall rtl_zipsourceinstall rtl_clean rtl_distclean rtl_cleanall rtl_require rtl_info
 
 
 rtl_all:
 rtl_all:
 	$(MAKE) -C rtl all
 	$(MAKE) -C rtl all
@@ -905,9 +898,6 @@ rtl_install:
 rtl_sourceinstall:
 rtl_sourceinstall:
 	$(MAKE) -C rtl sourceinstall
 	$(MAKE) -C rtl sourceinstall
 
 
-rtl_exampleinstall:
-	$(MAKE) -C rtl exampleinstall
-
 rtl_zipinstall:
 rtl_zipinstall:
 	$(MAKE) -C rtl zipinstall
 	$(MAKE) -C rtl zipinstall
 
 
@@ -933,7 +923,7 @@ endif
 # Dir utils
 # Dir utils
 
 
 ifdef OBJECTDIRUTILS
 ifdef OBJECTDIRUTILS
-.PHONY:  utils_all utils_debug utils_examples utils_test utils_smart utils_shared utils_showinstall utils_install utils_sourceinstall utils_exampleinstall utils_zipinstall utils_zipsourceinstall utils_clean utils_distclean utils_cleanall utils_require utils_info
+.PHONY:  utils_all utils_debug utils_examples utils_test utils_smart utils_shared utils_showinstall utils_install utils_sourceinstall utils_zipinstall utils_zipsourceinstall utils_clean utils_distclean utils_cleanall utils_require utils_info
 
 
 utils_all:
 utils_all:
 	$(MAKE) -C utils all
 	$(MAKE) -C utils all
@@ -962,9 +952,6 @@ utils_install:
 utils_sourceinstall:
 utils_sourceinstall:
 	$(MAKE) -C utils sourceinstall
 	$(MAKE) -C utils sourceinstall
 
 
-utils_exampleinstall:
-	$(MAKE) -C utils exampleinstall
-
 utils_zipinstall:
 utils_zipinstall:
 	$(MAKE) -C utils zipinstall
 	$(MAKE) -C utils zipinstall
 
 
@@ -990,7 +977,7 @@ endif
 # Dir fcl
 # Dir fcl
 
 
 ifdef OBJECTDIRFCL
 ifdef OBJECTDIRFCL
-.PHONY:  fcl_all fcl_debug fcl_examples fcl_test fcl_smart fcl_shared fcl_showinstall fcl_install fcl_sourceinstall fcl_exampleinstall fcl_zipinstall fcl_zipsourceinstall fcl_clean fcl_distclean fcl_cleanall fcl_require fcl_info
+.PHONY:  fcl_all fcl_debug fcl_examples fcl_test fcl_smart fcl_shared fcl_showinstall fcl_install fcl_sourceinstall fcl_zipinstall fcl_zipsourceinstall fcl_clean fcl_distclean fcl_cleanall fcl_require fcl_info
 
 
 fcl_all:
 fcl_all:
 	$(MAKE) -C fcl all
 	$(MAKE) -C fcl all
@@ -1019,9 +1006,6 @@ fcl_install:
 fcl_sourceinstall:
 fcl_sourceinstall:
 	$(MAKE) -C fcl sourceinstall
 	$(MAKE) -C fcl sourceinstall
 
 
-fcl_exampleinstall:
-	$(MAKE) -C fcl exampleinstall
-
 fcl_zipinstall:
 fcl_zipinstall:
 	$(MAKE) -C fcl zipinstall
 	$(MAKE) -C fcl zipinstall
 
 
@@ -1047,7 +1031,7 @@ endif
 # Dir api
 # Dir api
 
 
 ifdef OBJECTDIRAPI
 ifdef OBJECTDIRAPI
-.PHONY:  api_all api_debug api_examples api_test api_smart api_shared api_showinstall api_install api_sourceinstall api_exampleinstall api_zipinstall api_zipsourceinstall api_clean api_distclean api_cleanall api_require api_info
+.PHONY:  api_all api_debug api_examples api_test api_smart api_shared api_showinstall api_install api_sourceinstall api_zipinstall api_zipsourceinstall api_clean api_distclean api_cleanall api_require api_info
 
 
 api_all:
 api_all:
 	$(MAKE) -C api all
 	$(MAKE) -C api all
@@ -1076,9 +1060,6 @@ api_install:
 api_sourceinstall:
 api_sourceinstall:
 	$(MAKE) -C api sourceinstall
 	$(MAKE) -C api sourceinstall
 
 
-api_exampleinstall:
-	$(MAKE) -C api exampleinstall
-
 api_zipinstall:
 api_zipinstall:
 	$(MAKE) -C api zipinstall
 	$(MAKE) -C api zipinstall
 
 
@@ -1104,7 +1085,7 @@ endif
 # Dir fv
 # Dir fv
 
 
 ifdef OBJECTDIRFV
 ifdef OBJECTDIRFV
-.PHONY:  fv_all fv_debug fv_examples fv_test fv_smart fv_shared fv_showinstall fv_install fv_sourceinstall fv_exampleinstall fv_zipinstall fv_zipsourceinstall fv_clean fv_distclean fv_cleanall fv_require fv_info
+.PHONY:  fv_all fv_debug fv_examples fv_test fv_smart fv_shared fv_showinstall fv_install fv_sourceinstall fv_zipinstall fv_zipsourceinstall fv_clean fv_distclean fv_cleanall fv_require fv_info
 
 
 fv_all:
 fv_all:
 	$(MAKE) -C fv all
 	$(MAKE) -C fv all
@@ -1133,9 +1114,6 @@ fv_install:
 fv_sourceinstall:
 fv_sourceinstall:
 	$(MAKE) -C fv sourceinstall
 	$(MAKE) -C fv sourceinstall
 
 
-fv_exampleinstall:
-	$(MAKE) -C fv exampleinstall
-
 fv_zipinstall:
 fv_zipinstall:
 	$(MAKE) -C fv zipinstall
 	$(MAKE) -C fv zipinstall
 
 
@@ -1161,7 +1139,7 @@ endif
 # Dir packages
 # Dir packages
 
 
 ifdef OBJECTDIRPACKAGES
 ifdef OBJECTDIRPACKAGES
-.PHONY:  packages_all packages_debug packages_examples packages_test packages_smart packages_shared packages_showinstall packages_install packages_sourceinstall packages_exampleinstall packages_zipinstall packages_zipsourceinstall packages_clean packages_distclean packages_cleanall packages_require packages_info
+.PHONY:  packages_all packages_debug packages_examples packages_test packages_smart packages_shared packages_showinstall packages_install packages_sourceinstall packages_zipinstall packages_zipsourceinstall packages_clean packages_distclean packages_cleanall packages_require packages_info
 
 
 packages_all:
 packages_all:
 	$(MAKE) -C packages all
 	$(MAKE) -C packages all
@@ -1190,9 +1168,6 @@ packages_install:
 packages_sourceinstall:
 packages_sourceinstall:
 	$(MAKE) -C packages sourceinstall
 	$(MAKE) -C packages sourceinstall
 
 
-packages_exampleinstall:
-	$(MAKE) -C packages exampleinstall
-
 packages_zipinstall:
 packages_zipinstall:
 	$(MAKE) -C packages zipinstall
 	$(MAKE) -C packages zipinstall
 
 
@@ -1218,7 +1193,7 @@ endif
 # Dir ide
 # Dir ide
 
 
 ifdef OBJECTDIRIDE
 ifdef OBJECTDIRIDE
-.PHONY:  ide_all ide_debug ide_examples ide_test ide_smart ide_shared ide_showinstall ide_install ide_sourceinstall ide_exampleinstall ide_zipinstall ide_zipsourceinstall ide_clean ide_distclean ide_cleanall ide_require ide_info
+.PHONY:  ide_all ide_debug ide_examples ide_test ide_smart ide_shared ide_showinstall ide_install ide_sourceinstall ide_zipinstall ide_zipsourceinstall ide_clean ide_distclean ide_cleanall ide_require ide_info
 
 
 ide_all:
 ide_all:
 	$(MAKE) -C ide all
 	$(MAKE) -C ide all
@@ -1247,9 +1222,6 @@ ide_install:
 ide_sourceinstall:
 ide_sourceinstall:
 	$(MAKE) -C ide sourceinstall
 	$(MAKE) -C ide sourceinstall
 
 
-ide_exampleinstall:
-	$(MAKE) -C ide exampleinstall
-
 ide_zipinstall:
 ide_zipinstall:
 	$(MAKE) -C ide zipinstall
 	$(MAKE) -C ide zipinstall
 
 

+ 10 - 5
compiler/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -783,12 +783,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -969,7 +969,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1129,6 +1131,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -807,12 +807,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -993,7 +993,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1153,6 +1155,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
fcl/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 10 - 5
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -747,12 +747,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -976,7 +976,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1136,6 +1138,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
fcl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -726,12 +726,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -934,7 +934,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1094,6 +1096,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 7 - 5
fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/05/17]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -757,12 +757,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -975,7 +975,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif

+ 10 - 5
fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -726,12 +726,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -934,7 +934,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1094,6 +1096,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -714,12 +714,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -939,7 +939,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1099,6 +1101,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -773,12 +773,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -994,7 +994,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1154,6 +1156,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
fcl/win32/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -726,12 +726,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -934,7 +934,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1094,6 +1096,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
ide/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 1 - 1
ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 10 - 5
ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -643,12 +643,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -851,7 +851,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1011,6 +1013,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -643,12 +643,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -851,7 +851,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1011,6 +1013,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -809,12 +809,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -1014,7 +1014,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1174,6 +1176,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 12 - 12
install/debian/control

@@ -7,8 +7,8 @@ Standards-Version: 3.1.1
 
 
 Package: fp-compiler
 Package: fp-compiler
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
-Suggests: fp-utils, fp-docs (>= 0.99.14)
+Depends: fp-units-rtl (= 0.99.15-0)
+Suggests: fp-utils, fp-docs (>= 0.99.15)
 Replaces: fpc
 Replaces: fpc
 Description: Free Pascal Compiler
 Description: Free Pascal Compiler
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
@@ -21,7 +21,7 @@ Description: Free Pascal Compiler
 
 
 Package: fp-utils
 Package: fp-utils
 Architecture: i386
 Architecture: i386
-Recommends: fp-compiler (= 0.99.14-0)
+Recommends: fp-compiler (= 0.99.15-0)
 Replaces: fpc
 Replaces: fpc
 Description: Free Pascal Utils
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
  This package contains some handy utils for usage with the Free Pascal
@@ -45,14 +45,14 @@ Description: Free Pascal Documentation
 
 
 Package: fp-units-rtl
 Package: fp-units-rtl
 Architecture: i386
 Architecture: i386
-Recommends: fp-compiler (= 0.99.14-0)
+Recommends: fp-compiler (= 0.99.15-0)
 Replaces: fpc, fp-rtl
 Replaces: fpc, fp-rtl
 Description: Free Pascal Runtime Library
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
  Runtime Libraries for the Free Pascal Compiler.
 
 
 Package: fp-units-base
 Package: fp-units-base
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0)
 Description: Free Pascal base units
 Description: Free Pascal base units
  Free Pascal units for common libraries, some of these units are also
  Free Pascal units for common libraries, some of these units are also
  required by the Free Component Library :
  required by the Free Component Library :
@@ -62,28 +62,28 @@ Description: Free Pascal base units
 
 
 Package: fp-units-fcl
 Package: fp-units-fcl
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0), fp-units-base (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0), fp-units-base (= 0.99.15-0)
 Replaces: fp-fcl
 Replaces: fp-fcl
 Description: Free Pascal Free Component Library
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
  Free Component Library for the Free Pascal Compiler.
 
 
 Package: fp-units-api
 Package: fp-units-api
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0)
 Replaces: fp-api
 Replaces: fp-api
 Description: Free Pascal API units
 Description: Free Pascal API units
  Free Pascal units for console keyboard,mouse,video and file handling.
  Free Pascal units for console keyboard,mouse,video and file handling.
 
 
 Package: fp-units-gtk
 Package: fp-units-gtk
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0)
 Replaces: fp-gtk
 Replaces: fp-gtk
 Description: Free Pascal units for GTK 1.2.x
 Description: Free Pascal units for GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
 
 
 Package: fp-units-db
 Package: fp-units-db
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0)
 Description: Free Pascal units for some database libraries
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
  Free Pascal units with bindings for:
   - Mysql
   - Mysql
@@ -92,7 +92,7 @@ Description: Free Pascal units for some database libraries
 
 
 Package: fp-units-gfx
 Package: fp-units-gfx
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0), fp-units-base (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0), fp-units-base (= 0.99.15-0)
 Description: Free Pascal units for some graphics libraries
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
  Free Pascal units with bindings for:
   - Forms 0.88
   - Forms 0.88
@@ -102,7 +102,7 @@ Description: Free Pascal units for some graphics libraries
 
 
 Package: fp-units-net
 Package: fp-units-net
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0)
 Description: Free Pascal units for networking
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
  Free Pascal units for creating network tools:
   - Inet unit for easier tcp/ip handling
   - Inet unit for easier tcp/ip handling
@@ -110,7 +110,7 @@ Description: Free Pascal units for networking
 
 
 Package: fp-units-misc
 Package: fp-units-misc
 Architecture: i386
 Architecture: i386
-Depends: fp-units-rtl (= 0.99.14-0)
+Depends: fp-units-rtl (= 0.99.15-0)
 Description: Free Pascal miscellaneous units
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
  Free Pascal miscellaneous units for:
   - Utmp
   - Utmp

+ 2 - 2
install/debian/copyright

@@ -1,8 +1,8 @@
 The package was originally put together by:
 The package was originally put together by:
-  Peter Vreman <p[email protected]>
+  Peter Vreman <p[email protected]>
 
 
 From sources obtained from:
 From sources obtained from:
-  ftp://tflily.fys.kuleuven.ac.be/pub/fpc/dist/linux/fpc-0.99.13.tar.gz
+  ftp://ftp.freepascal.org/pub/fpc/dist/linux/fpc-0.99.15.tar.gz
 
 
 The files and libraries are released under the terms of the GNU Library
 The files and libraries are released under the terms of the GNU Library
 General Public License, which can be found in the file
 General Public License, which can be found in the file

+ 1 - 0
install/debian/fp-units-api.files.in

@@ -1 +1,2 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/api
 /usr/lib/fpc/%{fpcversion}/units/linux/api
+/usr/lib/libfpapi.so.*

+ 5 - 0
install/debian/fp-units-base.files.in

@@ -1,6 +1,7 @@
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/zlib.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/zlib.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libzlib.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/zlib.o
 /usr/lib/fpc/%{fpcversion}/units/linux/zlib.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/ncurses.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ncurses.ppu 
@@ -8,8 +9,11 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/ncrt.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ncrt.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ocrt.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/ocrt.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libocrt.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/ocrt.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/ocrt.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libncrt.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/ncrt.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/ncrt.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libncurses.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/ncurses.o
 /usr/lib/fpc/%{fpcversion}/units/linux/ncurses.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/x.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/x.ppu 
@@ -19,4 +23,5 @@
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/regexpr.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/regexpr.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libregexpr.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/regexpr.o
 /usr/lib/fpc/%{fpcversion}/units/linux/regexpr.o

+ 6 - 0
install/debian/fp-units-db.files.in

@@ -3,17 +3,23 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libmysql.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libmysql_version.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libmysql_com.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.o
 /usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/ibase40.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ibase40.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ibase60.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/ibase60.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libibase40.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/ibase40.o
 /usr/lib/fpc/%{fpcversion}/units/linux/ibase40.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/dllist.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/dllist.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/postgres.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/postgres.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libpostgres.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/postgres.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/postgres.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libdllist.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/dllist.o
 /usr/lib/fpc/%{fpcversion}/units/linux/dllist.o

+ 1 - 0
install/debian/fp-units-fcl.files.in

@@ -1 +1,2 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/fcl
 /usr/lib/fpc/%{fpcversion}/units/linux/fcl
+/usr/lib/libfpfcl.so.*

+ 5 - 0
install/debian/fp-units-gfx.files.in

@@ -2,22 +2,27 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/gl.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/gl.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/glut.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/glut.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libglut.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/glut.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/glut.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libgl.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/gl.o
 /usr/lib/fpc/%{fpcversion}/units/linux/gl.o
 
 
 /usr/bin/fd2pascal
 /usr/bin/fd2pascal
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/forms.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/forms.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libforms.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/forms.o
 /usr/lib/fpc/%{fpcversion}/units/linux/forms.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/svgalib.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/svgalib.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/vgamouse.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/vgamouse.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libsvgalib.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/svgalib.o
 /usr/lib/fpc/%{fpcversion}/units/linux/svgalib.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/gii.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/gii.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ggi.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ggi.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ggi2d.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/ggi2d.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libggi.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/ggi.o
 /usr/lib/fpc/%{fpcversion}/units/linux/ggi.o

+ 5 - 0
install/debian/fp-units-gtk.files.in

@@ -5,7 +5,12 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/gtk.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/gtk.ppu
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/glib.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/glib.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libglib.a
 /usr/lib/fpc/%{fpcversion}/units/linux/gdk.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdk.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libgdk.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/gtk.o
 /usr/lib/fpc/%{fpcversion}/units/linux/gtk.o
+/usr/lib/fpc/%{fpcversion}/units/linux/libgtk.a
+
+/usr/lib/libfpgtk.so.*
 
 
 /usr/share/doc/fp-units-gtk/
 /usr/share/doc/fp-units-gtk/

+ 24 - 0
install/debian/fp-units-misc.files.in

@@ -1,16 +1,20 @@
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/utmp.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/utmp.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libutmp.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/utmp.o
 /usr/lib/fpc/%{fpcversion}/units/linux/utmp.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/systemlog.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/systemlog.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libsystemlog.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/systemlog.o
 /usr/lib/fpc/%{fpcversion}/units/linux/systemlog.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbint.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbint.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libgdbcon.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libgdbint.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbint.o
 /usr/lib/fpc/%{fpcversion}/units/linux/gdbint.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu 
@@ -32,27 +36,47 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzutil.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzuncompr.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzbase.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzinflate.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzdeflate.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzcompres.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libtrees.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libstrutils.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfutil.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinftrees.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinffast.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfcodes.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfblock.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzio.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libcrcasm.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libcrc.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libadler.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libpaszlib.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.o
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/unzip.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/unzip.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libunzip.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/unzip.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/unzip.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/libziptypes.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.o
 /usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.o

+ 2 - 1
install/debian/fp-units-net.files.in

@@ -1,8 +1,9 @@
-
 /usr/lib/fpc/%{fpcversion}/units/linux/inet.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/inet.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libinet.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/inet.o
 /usr/lib/fpc/%{fpcversion}/units/linux/inet.o
 
 
 /usr/lib/fpc/%{fpcversion}/units/linux/uncgi.ppu
 /usr/lib/fpc/%{fpcversion}/units/linux/uncgi.ppu
 
 
+/usr/lib/fpc/%{fpcversion}/units/linux/libuncgi.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/uncgi.o
 /usr/lib/fpc/%{fpcversion}/units/linux/uncgi.o

+ 1 - 0
install/debian/fp-units-rtl.files.in

@@ -1 +1,2 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/rtl
 /usr/lib/fpc/%{fpcversion}/units/linux/rtl
+/usr/lib/libfprtl.so.*

+ 5 - 4
install/debian/rules

@@ -75,9 +75,10 @@ build-arch-stamp: debian-files-stamp
 
 
 # First make a new Compiler and RTL using a make cycle
 # First make a new Compiler and RTL using a make cycle
 	$(MAKE) compiler_cycle
 	$(MAKE) compiler_cycle
-	$(MAKE) fcl_all $(BUILDOPTS)
-	$(MAKE) api_all $(BUILDOPTS)
-	$(MAKE) packages_all $(BUILDOPTS)
+	$(MAKE) rtl_clean rtl_smart rtl_shared $(BUILDOPTS)
+	$(MAKE) fcl_smart fcl_shared $(BUILDOPTS)
+	$(MAKE) api_smart api_shared $(BUILDOPTS)
+	$(MAKE) packages_smart packages_shared $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
 
 
 	touch build-arch-stamp
 	touch build-arch-stamp
@@ -192,7 +193,7 @@ binary-arch: build-arch arrange-arch debian-files
 	dh_compress -a
 	dh_compress -a
 	dh_fixperms -a
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_installdeb -a
-#	dh_shlibdeps -a
+	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_md5sums -a
 	dh_builddeb -a
 	dh_builddeb -a

+ 18 - 42
install/demo/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -543,11 +543,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -603,12 +598,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -712,8 +707,6 @@ install: fpc_install $(addsuffix _install,$(DIROBJECTS))
 
 
 sourceinstall: fpc_sourceinstall
 sourceinstall: fpc_sourceinstall
 
 
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(DIROBJECTS))
-
 zipinstall: fpc_zipinstall
 zipinstall: fpc_zipinstall
 
 
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -726,7 +719,7 @@ cleanall: fpc_cleanall $(addsuffix _cleanall,$(DIROBJECTS))
 
 
 require: $(addsuffix _require,$(DIROBJECTS))
 require: $(addsuffix _require,$(DIROBJECTS))
 
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall require
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 
 #####################################################################
 #####################################################################
 # General compile rules
 # General compile rules
@@ -803,7 +796,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -859,7 +854,7 @@ endif
 # SourceInstall rules
 # SourceInstall rules
 #####################################################################
 #####################################################################
 
 
-.PHONY: fpc_sourceinstall fpc_exampleinstall
+.PHONY: fpc_sourceinstall
 
 
 ifndef SOURCETOPDIR
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
 SOURCETOPDIR=$(BASEDIR)
@@ -869,10 +864,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
 
-fpc_exampleinstall: clean
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
-
 #####################################################################
 #####################################################################
 # Zip
 # Zip
 #####################################################################
 #####################################################################
@@ -929,14 +920,11 @@ endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
 
 
-.PHONY:  fpc_zipexampleinstall
+.PHONY:  fpc_zipsourceinstall
 
 
 fpc_zipsourceinstall:
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 #####################################################################
 # Clean rules
 # Clean rules
 #####################################################################
 #####################################################################
@@ -970,6 +958,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 
@@ -1002,7 +993,7 @@ endif
 # Dir text
 # Dir text
 
 
 ifdef OBJECTDIRTEXT
 ifdef OBJECTDIRTEXT
-.PHONY:  text_all text_debug text_examples text_test text_smart text_shared text_showinstall text_install text_sourceinstall text_exampleinstall text_zipinstall text_zipsourceinstall text_clean text_distclean text_cleanall text_require text_info
+.PHONY:  text_all text_debug text_examples text_test text_smart text_shared text_showinstall text_install text_sourceinstall text_zipinstall text_zipsourceinstall text_clean text_distclean text_cleanall text_require text_info
 
 
 text_all:
 text_all:
 	$(MAKE) -C text all
 	$(MAKE) -C text all
@@ -1031,9 +1022,6 @@ text_install:
 text_sourceinstall:
 text_sourceinstall:
 	$(MAKE) -C text sourceinstall
 	$(MAKE) -C text sourceinstall
 
 
-text_exampleinstall:
-	$(MAKE) -C text exampleinstall
-
 text_zipinstall:
 text_zipinstall:
 	$(MAKE) -C text zipinstall
 	$(MAKE) -C text zipinstall
 
 
@@ -1059,7 +1047,7 @@ endif
 # Dir graph
 # Dir graph
 
 
 ifdef OBJECTDIRGRAPH
 ifdef OBJECTDIRGRAPH
-.PHONY:  graph_all graph_debug graph_examples graph_test graph_smart graph_shared graph_showinstall graph_install graph_sourceinstall graph_exampleinstall graph_zipinstall graph_zipsourceinstall graph_clean graph_distclean graph_cleanall graph_require graph_info
+.PHONY:  graph_all graph_debug graph_examples graph_test graph_smart graph_shared graph_showinstall graph_install graph_sourceinstall graph_zipinstall graph_zipsourceinstall graph_clean graph_distclean graph_cleanall graph_require graph_info
 
 
 graph_all:
 graph_all:
 	$(MAKE) -C graph all
 	$(MAKE) -C graph all
@@ -1088,9 +1076,6 @@ graph_install:
 graph_sourceinstall:
 graph_sourceinstall:
 	$(MAKE) -C graph sourceinstall
 	$(MAKE) -C graph sourceinstall
 
 
-graph_exampleinstall:
-	$(MAKE) -C graph exampleinstall
-
 graph_zipinstall:
 graph_zipinstall:
 	$(MAKE) -C graph zipinstall
 	$(MAKE) -C graph zipinstall
 
 
@@ -1116,7 +1101,7 @@ endif
 # Dir linux
 # Dir linux
 
 
 ifdef OBJECTDIRLINUX
 ifdef OBJECTDIRLINUX
-.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_exampleinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_distclean linux_cleanall linux_require linux_info
+.PHONY:  linux_all linux_debug linux_examples linux_test linux_smart linux_shared linux_showinstall linux_install linux_sourceinstall linux_zipinstall linux_zipsourceinstall linux_clean linux_distclean linux_cleanall linux_require linux_info
 
 
 linux_all:
 linux_all:
 	$(MAKE) -C linux all
 	$(MAKE) -C linux all
@@ -1145,9 +1130,6 @@ linux_install:
 linux_sourceinstall:
 linux_sourceinstall:
 	$(MAKE) -C linux sourceinstall
 	$(MAKE) -C linux sourceinstall
 
 
-linux_exampleinstall:
-	$(MAKE) -C linux exampleinstall
-
 linux_zipinstall:
 linux_zipinstall:
 	$(MAKE) -C linux zipinstall
 	$(MAKE) -C linux zipinstall
 
 
@@ -1173,7 +1155,7 @@ endif
 # Dir modex
 # Dir modex
 
 
 ifdef OBJECTDIRMODEX
 ifdef OBJECTDIRMODEX
-.PHONY:  modex_all modex_debug modex_examples modex_test modex_smart modex_shared modex_showinstall modex_install modex_sourceinstall modex_exampleinstall modex_zipinstall modex_zipsourceinstall modex_clean modex_distclean modex_cleanall modex_require modex_info
+.PHONY:  modex_all modex_debug modex_examples modex_test modex_smart modex_shared modex_showinstall modex_install modex_sourceinstall modex_zipinstall modex_zipsourceinstall modex_clean modex_distclean modex_cleanall modex_require modex_info
 
 
 modex_all:
 modex_all:
 	$(MAKE) -C modex all
 	$(MAKE) -C modex all
@@ -1202,9 +1184,6 @@ modex_install:
 modex_sourceinstall:
 modex_sourceinstall:
 	$(MAKE) -C modex sourceinstall
 	$(MAKE) -C modex sourceinstall
 
 
-modex_exampleinstall:
-	$(MAKE) -C modex exampleinstall
-
 modex_zipinstall:
 modex_zipinstall:
 	$(MAKE) -C modex zipinstall
 	$(MAKE) -C modex zipinstall
 
 
@@ -1230,7 +1209,7 @@ endif
 # Dir win32
 # Dir win32
 
 
 ifdef OBJECTDIRWIN32
 ifdef OBJECTDIRWIN32
-.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_exampleinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_distclean win32_cleanall win32_require win32_info
+.PHONY:  win32_all win32_debug win32_examples win32_test win32_smart win32_shared win32_showinstall win32_install win32_sourceinstall win32_zipinstall win32_zipsourceinstall win32_clean win32_distclean win32_cleanall win32_require win32_info
 
 
 win32_all:
 win32_all:
 	$(MAKE) -C win32 all
 	$(MAKE) -C win32 all
@@ -1259,9 +1238,6 @@ win32_install:
 win32_sourceinstall:
 win32_sourceinstall:
 	$(MAKE) -C win32 sourceinstall
 	$(MAKE) -C win32 sourceinstall
 
 
-win32_exampleinstall:
-	$(MAKE) -C win32 exampleinstall
-
 win32_zipinstall:
 win32_zipinstall:
 	$(MAKE) -C win32 zipinstall
 	$(MAKE) -C win32 zipinstall
 
 

+ 13 - 22
install/demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -642,11 +642,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -706,12 +701,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -809,8 +804,6 @@ install: fpc_install
 
 
 sourceinstall: fpc_sourceinstall
 sourceinstall: fpc_sourceinstall
 
 
-exampleinstall: fpc_exampleinstall
-
 zipinstall: fpc_zipinstall
 zipinstall: fpc_zipinstall
 
 
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -821,7 +814,7 @@ cleanall: fpc_cleanall
 
 
 info: fpc_info
 info: fpc_info
 
 
-.PHONY:  debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall distclean cleanall info
+.PHONY:  debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall distclean cleanall info
 
 
 #####################################################################
 #####################################################################
 # Units
 # Units
@@ -929,7 +922,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -985,7 +980,7 @@ endif
 # SourceInstall rules
 # SourceInstall rules
 #####################################################################
 #####################################################################
 
 
-.PHONY: fpc_sourceinstall fpc_exampleinstall
+.PHONY: fpc_sourceinstall
 
 
 ifndef SOURCETOPDIR
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
 SOURCETOPDIR=$(BASEDIR)
@@ -995,10 +990,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
 
-fpc_exampleinstall: clean
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
-
 #####################################################################
 #####################################################################
 # Zip
 # Zip
 #####################################################################
 #####################################################################
@@ -1055,14 +1046,11 @@ endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
 
 
-.PHONY:  fpc_zipexampleinstall
+.PHONY:  fpc_zipsourceinstall
 
 
 fpc_zipsourceinstall:
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 #####################################################################
 # Clean rules
 # Clean rules
 #####################################################################
 #####################################################################
@@ -1096,6 +1084,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 13 - 22
install/demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -604,11 +604,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -668,12 +663,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -773,8 +768,6 @@ install: fpc_install
 
 
 sourceinstall: fpc_sourceinstall
 sourceinstall: fpc_sourceinstall
 
 
-exampleinstall: fpc_exampleinstall
-
 zipinstall: fpc_zipinstall
 zipinstall: fpc_zipinstall
 
 
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -787,7 +780,7 @@ cleanall: fpc_cleanall
 
 
 info: fpc_info
 info: fpc_info
 
 
-.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 
 #####################################################################
 #####################################################################
 # Exes
 # Exes
@@ -881,7 +874,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -937,7 +932,7 @@ endif
 # SourceInstall rules
 # SourceInstall rules
 #####################################################################
 #####################################################################
 
 
-.PHONY: fpc_sourceinstall fpc_exampleinstall
+.PHONY: fpc_sourceinstall
 
 
 ifndef SOURCETOPDIR
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
 SOURCETOPDIR=$(BASEDIR)
@@ -947,10 +942,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
 
-fpc_exampleinstall: clean
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
-
 #####################################################################
 #####################################################################
 # Zip
 # Zip
 #####################################################################
 #####################################################################
@@ -1007,14 +998,11 @@ endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
 
 
-.PHONY:  fpc_zipexampleinstall
+.PHONY:  fpc_zipsourceinstall
 
 
 fpc_zipsourceinstall:
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 #####################################################################
 # Clean rules
 # Clean rules
 #####################################################################
 #####################################################################
@@ -1048,6 +1036,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 13 - 22
install/demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -604,11 +604,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -668,12 +663,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -773,8 +768,6 @@ install: fpc_install
 
 
 sourceinstall: fpc_sourceinstall
 sourceinstall: fpc_sourceinstall
 
 
-exampleinstall: fpc_exampleinstall
-
 zipinstall: fpc_zipinstall
 zipinstall: fpc_zipinstall
 
 
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -787,7 +780,7 @@ cleanall: fpc_cleanall
 
 
 info: fpc_info
 info: fpc_info
 
 
-.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 
 #####################################################################
 #####################################################################
 # Exes
 # Exes
@@ -881,7 +874,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -937,7 +932,7 @@ endif
 # SourceInstall rules
 # SourceInstall rules
 #####################################################################
 #####################################################################
 
 
-.PHONY: fpc_sourceinstall fpc_exampleinstall
+.PHONY: fpc_sourceinstall
 
 
 ifndef SOURCETOPDIR
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
 SOURCETOPDIR=$(BASEDIR)
@@ -947,10 +942,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
 
-fpc_exampleinstall: clean
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
-
 #####################################################################
 #####################################################################
 # Zip
 # Zip
 #####################################################################
 #####################################################################
@@ -1007,14 +998,11 @@ endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
 
 
-.PHONY:  fpc_zipexampleinstall
+.PHONY:  fpc_zipsourceinstall
 
 
 fpc_zipsourceinstall:
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 #####################################################################
 # Clean rules
 # Clean rules
 #####################################################################
 #####################################################################
@@ -1048,6 +1036,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 13 - 22
install/demo/text/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -602,11 +602,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -666,12 +661,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -771,8 +766,6 @@ install: fpc_install
 
 
 sourceinstall: fpc_sourceinstall
 sourceinstall: fpc_sourceinstall
 
 
-exampleinstall: fpc_exampleinstall
-
 zipinstall: fpc_zipinstall
 zipinstall: fpc_zipinstall
 
 
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -785,7 +778,7 @@ cleanall: fpc_cleanall
 
 
 info: fpc_info
 info: fpc_info
 
 
-.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 
 #####################################################################
 #####################################################################
 # Exes
 # Exes
@@ -879,7 +872,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -935,7 +930,7 @@ endif
 # SourceInstall rules
 # SourceInstall rules
 #####################################################################
 #####################################################################
 
 
-.PHONY: fpc_sourceinstall fpc_exampleinstall
+.PHONY: fpc_sourceinstall
 
 
 ifndef SOURCETOPDIR
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
 SOURCETOPDIR=$(BASEDIR)
@@ -945,10 +940,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
 
-fpc_exampleinstall: clean
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
-
 #####################################################################
 #####################################################################
 # Zip
 # Zip
 #####################################################################
 #####################################################################
@@ -1005,14 +996,11 @@ endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
 
 
-.PHONY:  fpc_zipexampleinstall
+.PHONY:  fpc_zipsourceinstall
 
 
 fpc_zipsourceinstall:
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 #####################################################################
 # Clean rules
 # Clean rules
 #####################################################################
 #####################################################################
@@ -1046,6 +1034,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 13 - 22
install/demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -604,11 +604,6 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 endif
 endif
 
 
-# Where the example files will be stored
-ifndef EXAMPLEINSTALLDIR
-EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
-endif
-
 # Where the doc files will be stored
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifndef DOCINSTALLDIR
 ifdef inlinux
 ifdef inlinux
@@ -668,12 +663,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -773,8 +768,6 @@ install: fpc_install
 
 
 sourceinstall: fpc_sourceinstall
 sourceinstall: fpc_sourceinstall
 
 
-exampleinstall: fpc_exampleinstall
-
 zipinstall: fpc_zipinstall
 zipinstall: fpc_zipinstall
 
 
 zipsourceinstall: fpc_zipsourceinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -787,7 +780,7 @@ cleanall: fpc_cleanall
 
 
 info: fpc_info
 info: fpc_info
 
 
-.PHONY:  all debug smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall info
+.PHONY:  all debug smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall info
 
 
 #####################################################################
 #####################################################################
 # Exes
 # Exes
@@ -881,7 +874,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -937,7 +932,7 @@ endif
 # SourceInstall rules
 # SourceInstall rules
 #####################################################################
 #####################################################################
 
 
-.PHONY: fpc_sourceinstall fpc_exampleinstall
+.PHONY: fpc_sourceinstall
 
 
 ifndef SOURCETOPDIR
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
 SOURCETOPDIR=$(BASEDIR)
@@ -947,10 +942,6 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
 
-fpc_exampleinstall: clean
-	$(MKDIR) $(EXAMPLEINSTALLDIR)
-	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
-
 #####################################################################
 #####################################################################
 # Zip
 # Zip
 #####################################################################
 #####################################################################
@@ -1007,14 +998,11 @@ endif
 	$(DELTREE) $(PACKDIR)
 	$(DELTREE) $(PACKDIR)
 endif
 endif
 
 
-.PHONY:  fpc_zipexampleinstall
+.PHONY:  fpc_zipsourceinstall
 
 
 fpc_zipsourceinstall:
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
 
-fpc_zipexampleinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
-
 #####################################################################
 #####################################################################
 # Clean rules
 # Clean rules
 #####################################################################
 #####################################################################
@@ -1048,6 +1036,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 9 - 6
install/fpc-0.99.15.spec

@@ -27,19 +27,18 @@ mysql,postgres,ibase bindings.
 %setup -c
 %setup -c
 
 
 %build
 %build
-export FPCDIR=
 NEWPP=`pwd`/compiler/ppc386
 NEWPP=`pwd`/compiler/ppc386
 	make compiler_cycle
 	make compiler_cycle
-	make fcl_all PP=${NEWPP}
-	make api_all PP=${NEWPP}
-	make packages_all PP=${NEWPP}
+	make rtl_clean rtl_smart rtl_shared PP=${NEWPP}
+	make fcl_smart fcl_shared PP=${NEWPP}
+	make api_smart api_shared PP=${NEWPP}
+	make packages_smart packages_shared PP=${NEWPP}
 	make utils_all PP=${NEWPP}
 	make utils_all PP=${NEWPP}
 
 
 %install
 %install
-export FPCDIR=
 NEWPP=`pwd`/compiler/ppc386
 NEWPP=`pwd`/compiler/ppc386
 NEWPPUFILES=`pwd`/utils/ppufiles
 NEWPPUFILES=`pwd`/utils/ppufiles
-INSTALLOPTS=PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr
+INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr"
 	make compiler_install ${INSTALLOPTS}
 	make compiler_install ${INSTALLOPTS}
 	make rtl_install ${INSTALLOPTS}
 	make rtl_install ${INSTALLOPTS}
 	make fcl_install ${INSTALLOPTS}
 	make fcl_install ${INSTALLOPTS}
@@ -87,6 +86,10 @@ ldconfig
 /usr/bin/h2pas
 /usr/bin/h2pas
 /usr/bin/fprcp
 /usr/bin/fprcp
 %{fpcdir}
 %{fpcdir}
+/usr/lib/libfprtl.so.*
+/usr/lib/libfpfcl.so.*
+/usr/lib/libfpgtk.so.*
+/usr/lib/libfpapi.so.*
 /usr/lib/fpc/lexyacc/yylex.cod 
 /usr/lib/fpc/lexyacc/yylex.cod 
 /usr/lib/fpc/lexyacc/yyparse.cod
 /usr/lib/fpc/lexyacc/yyparse.cod
 /usr/man/man1/delp.1
 /usr/man/man1/delp.1

+ 10 - 5
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -740,12 +740,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -951,7 +951,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1111,6 +1113,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
packages/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 10 - 5
packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -684,12 +684,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -909,7 +909,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1069,6 +1071,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -727,12 +727,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -938,7 +938,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1098,6 +1100,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -686,12 +686,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -913,7 +913,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1073,6 +1075,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 10 - 5
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 11 - 6
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -209,7 +209,7 @@ override PACKAGES+=rtl
 
 
 # Libraries
 # Libraries
 
 
-LIBNAME=fpgtk
+LIBNAME=libfpgtk.so.1.0
 
 
 # Info
 # Info
 
 
@@ -663,12 +663,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -869,7 +869,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1029,6 +1031,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
packages/gtk/Makefile.fpc

@@ -11,7 +11,7 @@ sourcesdir=glib gdk gtk
 targetdir=.
 targetdir=.
 
 
 [libs]
 [libs]
-libname=fpgtk
+libname=libfpgtk.so.1.0
 
 
 
 
 [rules]
 [rules]

+ 10 - 5
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -720,12 +720,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -931,7 +931,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1091,6 +1093,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -719,12 +719,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -930,7 +930,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1090,6 +1092,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 10 - 5
packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -684,12 +684,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -909,7 +909,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1069,6 +1071,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 12 - 5
packages/opengl/build2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/23]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all_units
 defaultrule: all_units
@@ -684,12 +684,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -823,12 +823,14 @@ fpc_units: $(UNITPPUFILES)
 
 
 .PHONY: fpc_exes
 .PHONY: fpc_exes
 
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 
 override ALLTARGET+=fpc_exes
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 
 fpc_exes: $(EXEFILES)
 fpc_exes: $(EXEFILES)
 
 
@@ -907,7 +909,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1067,6 +1071,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -727,12 +727,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -938,7 +938,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1098,6 +1100,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/opengl/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -689,12 +689,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -897,7 +897,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1057,6 +1059,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -655,12 +655,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -884,7 +884,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1044,6 +1046,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -883,7 +883,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1043,6 +1045,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -653,12 +653,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -861,7 +861,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1021,6 +1023,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/zip/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -656,12 +656,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -864,7 +864,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1024,6 +1026,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -653,12 +653,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -861,7 +861,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1021,6 +1023,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
rtl/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all

+ 33 - 12
rtl/bsd/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -132,6 +132,9 @@ UNITPREFIX=rtl
 
 
 # Paths
 # Paths
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
+GRAPHDIR=$(INC)/graph
+LINUXDIR=$(RTL)/linux
+
 
 
 # Define Go32v2 Units
 # Define Go32v2 Units
 SYSTEMUNIT=syslinux
 SYSTEMUNIT=syslinux
@@ -141,6 +144,9 @@ SYSTEMUNIT=syslinux
 # Use LibGGI ?
 # Use LibGGI ?
 # Use
 # Use
 #
 #
+ifndef USELIBGGI
+USELIBGGI=NO
+endif
 #####################################################################
 #####################################################################
 # FPCDIR Setting
 # FPCDIR Setting
 #####################################################################
 #####################################################################
@@ -197,8 +203,8 @@ endif
 
 
 # Targets
 # Targets
 
 
-override LOADEROBJECTS+=prt0 cprt0
-override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings linux  initc dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc lineinfo errors sockets gpm 
+override LOADEROBJECTS+=prt0 cprt0 gprt0 cprt21 gprt21
+override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings linux initc dos crt objects printer graph ggigraph sysutils typinfo math cpu mmx getopts heaptrc lineinfo errors gpm
 
 
 # Clean
 # Clean
 
 
@@ -224,7 +230,7 @@ endif
 # Libraries
 # Libraries
 
 
 LIBNAME=fprtl
 LIBNAME=fprtl
-SHAREDLIBUNITOBJECTS=$(SYSTEMUNIT) objpas strings linux dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors sockets 
+SHAREDLIBUNITOBJECTS=$(SYSTEMUNIT) objpas strings linux dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc errors
 
 
 # Info
 # Info
 
 
@@ -651,12 +657,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -887,7 +893,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1047,6 +1055,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 
@@ -1175,9 +1186,10 @@ strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc\
 # System Dependent Units
 # System Dependent Units
 #
 #
 
 
-linux$(PPUEXT) : linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
+linux$(PPUEXT) : $(LINUXDIR)/linux.pp strings$(PPUEXT) $(INC)/textrec.inc $(INC)/filerec.inc \
 		 syscalls.inc systypes.inc sysconst.inc timezone.inc $(SYSTEMPPU)
 		 syscalls.inc systypes.inc sysconst.inc timezone.inc $(SYSTEMPPU)
 
 
+ports$(PPUEXT) : ports.pp linux$(PPUEXT) objpas$(PPUEXT)
 
 
 #
 #
 # TP7 Compatible RTL Units
 # TP7 Compatible RTL Units
@@ -1195,6 +1207,16 @@ printer$(PPUEXT) : printer.pp $(INC)/textrec.inc linux$(PPUEXT) $(SYSTEMPPU)
 #
 #
 # Graph
 # Graph
 #
 #
+include $(GRAPHDIR)/makefile.inc
+GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES))
+
+graph$(PPUEXT) : graph.pp linux$(PPUEXT) $(SYSTEMPPU) \
+		 $(GRAPHINCDEPS) vgagraph16.inc
+	$(COMPILER) -I$(GRAPHDIR) graph.pp $(REDIR)
+
+ggigraph$(PPUEXT) : ggigraph.pp linux$(PPUEXT) $(SYSTEMPPU) \
+		 $(GRAPHINCDEPS)
+	$(COMPILER) -I$(GRAPHDIR) ggigraph.pp $(REDIR)
 
 
 #
 #
 # Delphi Compatible Units
 # Delphi Compatible Units
@@ -1232,7 +1254,6 @@ lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMPPU)
 # Other system-dependent RTL Units
 # Other system-dependent RTL Units
 #
 #
 
 
-sockets$(PPUEXT) : sockets.pp $(INC)/textrec.inc $(INC)/filerec.inc \
-		   linux$(PPUEXT) $(SYSTEMPPU)
-
 errors$(PPUEXT) : errors.pp strings$(PPUEXT) $(SYSTEMPPU)
 errors$(PPUEXT) : errors.pp strings$(PPUEXT) $(SYSTEMPPU)
+
+ipc$(PPUEXT) : ipc.pp linux$(PPUEXT) $(SYSTEMPPU)

+ 10 - 5
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -644,12 +644,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -880,7 +880,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1040,6 +1042,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -890,7 +890,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1050,6 +1052,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/05/10]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -655,12 +655,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -891,7 +891,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1051,6 +1053,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -644,12 +644,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -880,7 +880,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1040,6 +1042,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -649,12 +649,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -885,7 +885,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1045,6 +1047,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 1 - 1
tests/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/05/17]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: info
 defaultrule: info

+ 10 - 5
tests/units/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/14]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: current
 defaultrule: current
@@ -573,12 +573,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -765,7 +765,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -925,6 +927,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
utils/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/05/11]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -787,12 +787,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -1004,7 +1004,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1164,6 +1166,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 84 - 82
utils/fpcmake.inc

@@ -794,18 +794,18 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[command_end]'#010+
   '[command_end]'#010+
   '# Smartlinking'#010+
   '# Smartlinking'#010+
   'ifdef LINKSMART'#010+
   'ifdef LINKSMART'#010+
-  'override FPCOPT+=-CX'#010+
+  'override FPCOPT+=-XX'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
-  '# Smartlinking'#010+
+  '# Smartlinking creation'#010+
   'ifdef CREATESMART'#010+
   'ifdef CREATESMART'#010+
-  'override FPCOPT+=-XX'#010+
+  'override FPCOPT+=-CX'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   '# Debug'#010+
   '# Debug'#010+
   'ifdef DEBUG'#010+
   'ifdef DEBUG'#010+
-  'override FPCOPT+=-g -dDEBUG'#010+
-  'en','dif'#010+
+  'override FPCOPT+=-g -','dDEBUG'#010+
+  'endif'#010+
   #010+
   #010+
   '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
   '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
   '# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+
   '# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+
@@ -813,8 +813,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifeq ($(FPC_VERSION),0.99.12)'#010+
   'ifeq ($(FPC_VERSION),0.99.12)'#010+
   'override FPCOPT+=-Xs -OGp3 -n'#010+
   'override FPCOPT+=-Xs -OGp3 -n'#010+
   'else'#010+
   'else'#010+
-  'override FPCOPT+=-Xs -OG2p3 -n'#010+
-  'e','ndif'#010+
+  'override FPCOPT+=-Xs -O','G2p3 -n'#010+
+  'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   '# Strip'#010+
   '# Strip'#010+
@@ -833,8 +833,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   '# Add commandline options'#010+
   '# Add commandline options'#010+
-  'ifdef OPT'#010+
-  'ove','rride FPCOPT+=$(OPT)'#010+
+  'ifde','f OPT'#010+
+  'override FPCOPT+=$(OPT)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef UNITDIR'#010+
   'ifdef UNITDIR'#010+
   'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
   'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
@@ -845,8 +845,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifdef OBJDIR'#010+
   'ifdef OBJDIR'#010+
   'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
   'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef INCDIR'#010+
-  'override ','FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
+  'ifdef INCDIR'#010,
+  'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   '# Add defines from FPCOPTDEF to FPCOPT'#010+
   '# Add defines from FPCOPTDEF to FPCOPT'#010+
@@ -859,8 +859,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'override FPCOPT+=-Fr$(ERRORFILE)'#010+
   'override FPCOPT+=-Fr$(ERRORFILE)'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
-  '# Was a config file specified ?'#010+
-  'ifd','ef CFGFILE'#010+
+  '# Was a config file specif','ied ?'#010+
+  'ifdef CFGFILE'#010+
   'override FPCOPT+=@$(CFGFILE)'#010+
   'override FPCOPT+=@$(CFGFILE)'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
@@ -871,7 +871,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'FPCEXTFILE=fpcext.cmd'#010+
   'FPCEXTFILE=fpcext.cmd'#010+
   'endif'#010+
   'endif'#010+
   'ifeq ($(OS_SOURCE),win32)'#010+
   'ifeq ($(OS_SOURCE),win32)'#010+
-  'override TMPVAR:=$(shell "$(DEL) $(FPCE','XTFILE)")'#010+
+  'override TMPVAR:=$(shell "$(DE','L) $(FPCEXTFILE)")'#010+
   'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+
   'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+
   'PCEXTFILE)"))'#010+
   'PCEXTFILE)"))'#010+
   'override FPCOPT:=@$(FPCEXTFILE)'#010+
   'override FPCOPT:=@$(FPCEXTFILE)'#010+
@@ -879,7 +879,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   '[command_win32env]'#010+
   '[command_win32env]'#010+
   '# For win32 the options are passed using the environment FPCEXTCMD'#010+
   '# For win32 the options are passed using the environment FPCEXTCMD'#010+
-  'ifeq ($(OS_SOURCE),wi','n32)'#010+
+  'ifeq ($(OS_S','OURCE),win32)'#010+
   'override FPCEXTCMD:=$(FPCOPT)'#010+
   'override FPCEXTCMD:=$(FPCOPT)'#010+
   'override FPCOPT:=!FPCEXTCMD'#010+
   'override FPCOPT:=!FPCEXTCMD'#010+
   'export FPCEXTCMD'#010+
   'export FPCEXTCMD'#010+
@@ -890,7 +890,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'override COMPILER:=$(FPC) $(FPCOPT)'#010+
   'override COMPILER:=$(FPC) $(FPCOPT)'#010+
   #010+
   #010+
   '# also call ppas if with command option -s'#010+
   '# also call ppas if with command option -s'#010+
-  'ifeq (,$(findstring -s ,$(COMPI','LER)))'#010+
+  'ifeq (,$(findstring -s',' ,$(COMPILER)))'#010+
   'EXECPPAS='#010+
   'EXECPPAS='#010+
   'else'#010+
   'else'#010+
   'EXECPPAS:=@$(PPAS)'#010+
   'EXECPPAS:=@$(PPAS)'#010+
@@ -902,14 +902,14 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '# Standard rules'#010+
   '# Standard rules'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
-  '[packagedependrul','es]'#010+
+  '[package','dependrules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   '# Package depends'#010+
   '# Package depends'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
   #010+
   #010+
   '[loaderrules]'#010+
   '[loaderrules]'#010+
-  '##############################################################','######'+
+  '#####################################################','###############'+
   '#'#010+
   '#'#010+
   '# Loaders'#010+
   '# Loaders'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
@@ -920,8 +920,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        $(AS) -o $*$(OEXT) $<'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
   #010+
   #010+
   'override ALLTARGET+=fpc_loaders'#010+
   'override ALLTARGET+=fpc_loaders'#010+
-  'override CLEANTARGET+=fpc_loaders_clean'#010+
-  'ove','rride SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
+  'override CLEANTARGET+=fpc_loaders_','clean'#010+
+  'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
   #010+
   'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
   'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
@@ -929,9 +929,9 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'fpc_loaders: $(LOADEROFILES)'#010+
   'fpc_loaders: $(LOADEROFILES)'#010+
   #010+
   #010+
   'fpc_loaders_clean:'#010+
   'fpc_loaders_clean:'#010+
-  '        -$(DEL) $(LOADEROFILES)'#010+
+  '        -$(DEL) $(LOADEROF','ILES)'#010+
   #010+
   #010+
-  'fp','c_loaders_showinstall:'#010+
+  'fpc_loaders_showinstall:'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+
   ')'#010+
   ')'#010+
   #010+
   #010+
@@ -941,7 +941,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   #010+
   #010+
   '[unitrules]'#010+
   '[unitrules]'#010+
-  '#####################','###############################################'+
+  '############','########################################################'+
   '#'#010+
   '#'#010+
   '# Units'#010+
   '# Units'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
@@ -950,8 +950,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   'override ALLTARGET+=fpc_units'#010+
   'override ALLTARGET+=fpc_units'#010+
   #010+
   #010+
-  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+
-  'ov','erride INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
+  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJ','ECTS))'#010+
+  'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
   #010+
   #010+
   'fpc_units: $(UNITPPUFILES)'#010+
   'fpc_units: $(UNITPPUFILES)'#010+
@@ -961,7 +961,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[exerules]'#010+
   '[exerules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   '# Exes'#010+
   '# Exes'#010+
-  '#########################################','###########################'+
+  '################################','####################################'+
   '#'#010+
   '#'#010+
   #010+
   #010+
   '.PHONY: fpc_exes'#010+
   '.PHONY: fpc_exes'#010+
@@ -971,7 +971,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
   'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
   #010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
   'override ALLTARGET+=fpc_exes'#010+
-  'override INSTALLEXEFILES+=$(EXEFILES',')'#010+
+  'override INSTALLEXEFILES+=$','(EXEFILES)'#010+
   'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
   'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
@@ -981,7 +981,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[rstrules]'#010+
   '[rstrules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   '# Resource strings'#010+
   '# Resource strings'#010+
-  '##########################################################','##########'+
+  '#################################################','###################'+
   '#'#010+
   '#'#010+
   #010+
   #010+
   'ifdef RSTOBJECTS'#010+
   'ifdef RSTOBJECTS'#010+
@@ -994,16 +994,16 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[examplerules]'#010+
   '[examplerules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   '# Examples'#010+
   '# Examples'#010+
-  '##############','######################################################'+
+  '#####','###############################################################'+
   '#'#010+
   '#'#010+
   #010+
   #010+
   '.PHONY: fpc_examples fpc_test'#010+
   '.PHONY: fpc_examples fpc_test'#010+
   #010+
   #010+
   'ifdef EXAMPLEOBJECTS'#010+
   'ifdef EXAMPLEOBJECTS'#010+
   'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
   'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
-  'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
+  'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJEC','TS))'#010+
   #010+
   #010+
-  'ove','rride CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
+  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   'fpc_examples: all $(EXAMPLEFILES)'#010+
   'fpc_examples: all $(EXAMPLEFILES)'#010+
@@ -1014,7 +1014,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[compilerules]'#010+
   '[compilerules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   '# General compile rules'#010+
   '# General compile rules'#010+
-  '##############','######################################################'+
+  '#####','###############################################################'+
   '#'#010+
   '#'#010+
   #010+
   #010+
   '.PHONY: fpc_packages fpc_all fpc_debug'#010+
   '.PHONY: fpc_packages fpc_all fpc_debug'#010+
@@ -1026,7 +1026,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   'fpc_all: fpc_packages $(FPCMADE)'#010+
   'fpc_all: fpc_packages $(FPCMADE)'#010+
   #010+
   #010+
-  'fpc_debug:',#010+
+  'f','pc_debug:'#010+
   '        $(MAKE) all DEBUG=1'#010+
   '        $(MAKE) all DEBUG=1'#010+
   #010+
   #010+
   '# General compile rules, available for both possible PASEXT'#010+
   '# General compile rules, available for both possible PASEXT'#010+
@@ -1038,7 +1038,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        $(EXECPPAS)'#010+
   '        $(EXECPPAS)'#010+
   #010+
   #010+
   '%$(PPUEXT): %.pas'#010+
   '%$(PPUEXT): %.pas'#010+
-  '        $(CO','MPILER) $< $(REDIR)'#010+
+  '   ','     $(COMPILER) $< $(REDIR)'#010+
   '        $(EXECPPAS)'#010+
   '        $(EXECPPAS)'#010+
   #010+
   #010+
   '%$(EXEEXT): %.pp'#010+
   '%$(EXEEXT): %.pp'#010+
@@ -1051,7 +1051,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   #010+
   #010+
   '[libraryrules]'#010+
   '[libraryrules]'#010+
-  '##########################################','##########################'+
+  '#################################','###################################'+
   '#'#010+
   '#'#010+
   '# Library'#010+
   '# Library'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
@@ -1060,7 +1060,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   '# Default sharedlib units are all unit objects'#010+
   '# Default sharedlib units are all unit objects'#010+
   'ifndef SHAREDLIBUNITOBJECTS'#010+
   'ifndef SHAREDLIBUNITOBJECTS'#010+
-  'SHAREDLIBUNITOBJECTS:=$(UN','ITOBJECTS)'#010+
+  'SHAREDLIBUNITOBJE','CTS:=$(UNITOBJECTS)'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   'fpc_smart:'#010+
   'fpc_smart:'#010+
@@ -1074,7 +1074,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
   '        $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
   'endif'#010+
   'endif'#010+
   'else'#010+
   'else'#010+
-  '        @$(E','CHO) "Shared Libraries not supported"'#010+
+  '   ','     @$(ECHO) "Shared Libraries not supported"'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   #010+
   #010+
@@ -1083,7 +1083,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '# Install rules'#010+
   '# Install rules'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
-  '.PHONY: fpc_showinstal','l fpc_install'#010+
+  '.PHONY: fpc_s','howinstall fpc_install'#010+
   #010+
   #010+
   'ifdef EXTRAINSTALLUNITS'#010+
   'ifdef EXTRAINSTALLUNITS'#010+
   'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
   'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
@@ -1092,8 +1092,10 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifdef INSTALLPPUFILES'#010+
   'ifdef INSTALLPPUFILES'#010+
   'ifdef PPUFILES'#010+
   'ifdef PPUFILES'#010+
   'ifdef inlinux'#010+
   'ifdef inlinux'#010+
-  'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
-  'INSTAL','LPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
+  'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES','))'#010+
+  'ifdef LIBNAME'#010+
+  'INSTALLPPULIBFILES=$(LIBNAME)'#010+
+  'endif'#010+
   'else'#010+
   'else'#010+
   'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
   'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
   'endif'#010+
   'endif'#010+
@@ -1103,7 +1105,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
-  'fpc_showinstal','l: $(SHOWINSTALLTARGET)'#010+
+  'fpc_showinstall: $','(SHOWINSTALLTARGET)'#010+
   'ifdef INSTALLEXEFILES'#010+
   'ifdef INSTALLEXEFILES'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
   '        @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
   'S))'#010+
   'S))'#010+
@@ -1111,7 +1113,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifdef INSTALLPPUFILES'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
   'ES))'#010+
   'ES))'#010+
-  'ifneq ($(INSTALLP','PULINKFILES),)'#010+
+  'ifneq ($(INSTALLPPULI','NKFILES),)'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
   'KFILES))'#010+
   'KFILES))'#010+
   'endif'#010+
   'endif'#010+
@@ -1120,7 +1122,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ILES))'#010+
   'ILES))'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef EXTRAINSTALLFI','LES'#010+
+  'ifdef EXTRAINSTALLFILES'#010,
   '        @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
   '        @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
   'ILES))'#010+
   'ILES))'#010+
   'endif'#010+
   'endif'#010+
@@ -1130,7 +1132,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifdef INSTALLEXEFILES'#010+
   'ifdef INSTALLEXEFILES'#010+
   '        $(MKDIR) $(BININSTALLDIR)'#010+
   '        $(MKDIR) $(BININSTALLDIR)'#010+
   '# Compress the exes if upx is defined'#010+
   '# Compress the exes if upx is defined'#010+
-  'if','def UPXPROG'#010+
+  'ifdef ','UPXPROG'#010+
   '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
   '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
   'endif'#010+
   'endif'#010+
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
@@ -1138,7 +1140,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifdef INSTALLPPUFILES'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(UNITINSTALLDIR)'#010+
   '        $(MKDIR) $(UNITINSTALLDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
-  'ifneq ','($(INSTALLPPULINKFILES),)'#010+
+  'ifneq ($(I','NSTALLPPULINKFILES),)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
   'endif'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
@@ -1146,7 +1148,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
   '        $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef EXTRAIN','STALLFILES'#010+
+  'ifdef EXTRAINSTAL','LFILES'#010+
   '        $(MKDIR) $(DATAINSTALLDIR)'#010+
   '        $(MKDIR) $(DATAINSTALLDIR)'#010+
   '        $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
   '        $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
   'endif'#010+
   'endif'#010+
@@ -1155,7 +1157,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[sourceinstallrules]'#010+
   '[sourceinstallrules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   '# SourceInstall rules'#010+
   '# SourceInstall rules'#010+
-  '###############','#####################################################'+
+  '###################','#################################################'+
   '#'#010+
   '#'#010+
   #010+
   #010+
   '.PHONY: fpc_sourceinstall'#010+
   '.PHONY: fpc_sourceinstall'#010+
@@ -1166,7 +1168,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   'fpc_sourceinstall: clean'#010+
   'fpc_sourceinstall: clean'#010+
   '        $(MKDIR) $(SOURCEINSTALLDIR)'#010+
   '        $(MKDIR) $(SOURCEINSTALLDIR)'#010+
-  '        $(COPYTREE) $(SOURCETOPDIR) $(SOURCE','INSTALLDIR)'#010+
+  '        $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINST','ALLDIR)'#010+
   #010+
   #010+
   #010+
   #010+
   '[zipinstallrules]'#010+
   '[zipinstallrules]'#010+
@@ -1177,7 +1179,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '.PHONY: fpc_zipinstall'#010+
   '.PHONY: fpc_zipinstall'#010+
   #010+
   #010+
   '# Create suffix to add'#010+
   '# Create suffix to add'#010+
-  'ifndef PACKAGE','SUFFIX'#010+
+  'ifndef PACKAGESUFF','IX'#010+
   'PACKAGESUFFIX=$(OS_TARGET)'#010+
   'PACKAGESUFFIX=$(OS_TARGET)'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
   'PACKAGESUFFIX=go32'#010+
   'PACKAGESUFFIX=go32'#010+
@@ -1192,7 +1194,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifndef inlinux'#010+
   'ifndef inlinux'#010+
   'PACKDIR=$(BASEDIR)/pack_tmp'#010+
   'PACKDIR=$(BASEDIR)/pack_tmp'#010+
   'else'#010+
   'else'#010+
-  'PA','CKDIR=/tmp/fpc-pack'#010+
+  'PACKDI','R=/tmp/fpc-pack'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
@@ -1205,8 +1207,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   '# Use tar by default under linux'#010+
   '# Use tar by default under linux'#010+
   'ifndef USEZIP'#010+
   'ifndef USEZIP'#010+
-  'ifdef inlin','ux'#010+
-  'USETAR=1'#010+
+  'ifdef inlinux'#010+
+  'U','SETAR=1'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
@@ -1218,12 +1220,12 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
   '        $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
   'ifdef USETAR'#010+
   'ifdef USETAR'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
-  ' ','       cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
+  '     ','   cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
   '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
   '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
   'else'#010+
   'else'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
   '        cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
   '        cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
-  'ME)$(ZIPEXT)',' * ; cd $(BASEDIR)'#010+
+  'ME)$(ZIPEXT) * ;',' cd $(BASEDIR)'#010+
   'endif'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   'endif'#010+
   'endif'#010+
@@ -1238,7 +1240,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   #010+
   #010+
   '[cleanrules]'#010+
   '[cleanrules]'#010+
-  '############','########################################################'+
+  '################','####################################################'+
   '#'#010+
   '#'#010+
   '# Clean rules'#010+
   '# Clean rules'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
@@ -1246,7 +1248,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
   #010+
   #010+
   'ifdef EXTRACLEANUNITS'#010+
   'ifdef EXTRACLEANUNITS'#010+
-  'override CLEANPPUFILES+=$(add','suffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
+  'override CLEANPPUFILES+=$(addsuff','ix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
   'ifdef CLEANPPUFILES'#010+
   'ifdef CLEANPPUFILES'#010+
@@ -1258,7 +1260,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
   #010+
-  'fpc_clean: ','$(CLEANTARGET)'#010+
+  'fpc_clean: $(CL','EANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'endif'#010+
@@ -1269,7 +1271,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL',') $(CLEANRSTFILES)'#010+
+  '        -$(DEL) $(','CLEANRSTFILES)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef EXTRACLEANFILES'#010+
   'ifdef EXTRACLEANFILES'#010+
   '        -$(DEL) $(EXTRACLEANFILES)'#010+
   '        -$(DEL) $(EXTRACLEANFILES)'#010+
@@ -1282,14 +1284,14 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   'fpc_distclean: fpc_clean'#010+
   'fpc_distclean: fpc_clean'#010+
   #010+
   #010+
-  'fpc_cle','anall: $(CLEANTARGET)'#010+
+  'fpc_cleanal','l: $(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'endif'#010+
   '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
   '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
   'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
   'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
-  '        -$(DEL) $(FPCMA','DE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+
+  '        -$(DEL) $(FPCMADE) ','$(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+
   'E)'#010+
   'E)'#010+
   #010+
   #010+
   #010+
   #010+
@@ -1299,8 +1301,8 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
   '.PHONY: fpc_depend'#010+
   '.PHONY: fpc_depend'#010+
-  #010,
-  'fpc_depend:'#010+
+  #010+
+  'fpc_','depend:'#010+
   '        $(PPDEP) $(UNITOBJECTS)'#010+
   '        $(PPDEP) $(UNITOBJECTS)'#010+
   #010+
   #010+
   #010+
   #010+
@@ -1309,7 +1311,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '# Info rules'#010+
   '# Info rules'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
-  '.PHONY: fpc_info fpc_cfginfo',' fpc_objectinfo fpc_toolsinfo fpc_instal'+
+  '.PHONY: fpc_info fpc_cfginfo fpc','_objectinfo fpc_toolsinfo fpc_instal'+
   'linfo \'#010+
   'linfo \'#010+
   '        fpc_dirinfo'#010+
   '        fpc_dirinfo'#010+
   #010+
   #010+
@@ -1321,7 +1323,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  FPC....... $(FPC)'#010+
   '        @$(ECHO)  FPC....... $(FPC)'#010+
-  '        @','$(ECHO)  Version... $(FPC_VERSION)'#010+
+  '        @$(EC','HO)  Version... $(FPC_VERSION)'#010+
   '        @$(ECHO)  CPU....... $(CPU_TARGET)'#010+
   '        @$(ECHO)  CPU....... $(CPU_TARGET)'#010+
   '        @$(ECHO)  Source.... $(OS_SOURCE)'#010+
   '        @$(ECHO)  Source.... $(OS_SOURCE)'#010+
   '        @$(ECHO)  Target.... $(OS_TARGET)'#010+
   '        @$(ECHO)  Target.... $(OS_TARGET)'#010+
@@ -1331,7 +1333,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'fpc_infodirs:'#010+
   'fpc_infodirs:'#010+
   'ifdef inlinux'#010+
   'ifdef inlinux'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
-  '   ','     @$(ECHO)  == Directory info =='#010+
+  '       ',' @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   'ifdef NEEDGCCLIB'#010+
   'ifdef NEEDGCCLIB'#010+
   '        @$(ECHO)  GCC library is needed.'#010+
   '        @$(ECHO)  GCC library is needed.'#010+
@@ -1340,7 +1342,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        @$(ECHO)  Other library is needed.'#010+
   '        @$(ECHO)  Other library is needed.'#010+
   'endif'#010+
   'endif'#010+
   '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
-  '        @','$(ECHO)'#010+
+  '        @$(EC','HO)'#010+
   '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
   '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
@@ -1351,7 +1353,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
-  '        @$(EC','HO)  Pwd....... $(PWD)'#010+
+  '        @$(ECHO) ',' Pwd....... $(PWD)'#010+
   '        @$(ECHO)  Echo...... $(ECHO)'#010+
   '        @$(ECHO)  Echo...... $(ECHO)'#010+
   'ifdef PPDEP'#010+
   'ifdef PPDEP'#010+
   '        @$(ECHO)  PPDep..... $(PPDEP)'#010+
   '        @$(ECHO)  PPDep..... $(PPDEP)'#010+
@@ -1362,7 +1364,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'ifdef PPUFILES'#010+
   'ifdef PPUFILES'#010+
   '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
   '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
   'endif'#010+
   'endif'#010+
-  'if','def DATA2INC'#010+
+  'ifdef ','DATA2INC'#010+
   '        @$(ECHO)  Data2Inc.. $(DATA2INC)'#010+
   '        @$(ECHO)  Data2Inc.. $(DATA2INC)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef SED'#010+
   'ifdef SED'#010+
@@ -1375,7 +1377,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '        @$(ECHO)  Diff...... $(DIFF)'#010+
   '        @$(ECHO)  Diff...... $(DIFF)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef CMP'#010+
   'ifdef CMP'#010+
-  '        @$','(ECHO)  Cmp....... $(CMP)'#010+
+  '        @$(ECH','O)  Cmp....... $(CMP)'#010+
   'endif'#010+
   'endif'#010+
   'ifdef UPXPROG'#010+
   'ifdef UPXPROG'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
@@ -1388,20 +1390,20 @@ const fpcmakeini : array[0..121,1..240] of char=(
   '[info_objects]'#010+
   '[info_objects]'#010+
   'fpc_infoobjects:'#010+
   'fpc_infoobjects:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  == ','Object info =='#010+
+  '        @$(ECHO)  == Obje','ct info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)'#010+
   '        @$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)'#010+
   '        @$(ECHO)  UnitObjects....... $(UNITOBJECTS)'#010+
   '        @$(ECHO)  UnitObjects....... $(UNITOBJECTS)'#010+
   '        @$(ECHO)  ExeObjects........ $(EXEOBJECTS)'#010+
   '        @$(ECHO)  ExeObjects........ $(EXEOBJECTS)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  ExtraCleanUnits.','.. $(EXTRACLEANUNITS)'#010+
+  '        @$(ECHO)  ExtraCleanUnits... $','(EXTRACLEANUNITS)'#010+
   '        @$(ECHO)  ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
   '        @$(ECHO)  ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
   '        @$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
   '        @$(ECHO)  ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
   '        @$(ECHO)  ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   #010+
   #010+
-  '[info_insta','ll]'#010+
+  '[info_install]'#010,
   'fpc_infoinstall:'#010+
   'fpc_infoinstall:'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Install info =='#010+
   '        @$(ECHO)  == Install info =='#010+
@@ -1411,33 +1413,33 @@ const fpcmakeini : array[0..121,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'ifdef PACKAGEPREFIX'#010+
   'ifdef PACKAGEPREFIX'#010+
   '        @$(ECHO)  PackagePrefix........ $(PACKAGEPREFIX)'#010+
   '        @$(ECHO)  PackagePrefix........ $(PACKAGEPREFIX)'#010+
-  'end','if'#010+
-  'ifdef PACKAGENAME'#010+
+  'endif'#010+
+  'i','fdef PACKAGENAME'#010+
   '        @$(ECHO)  PackageName.......... $(PACKAGENAME)'#010+
   '        @$(ECHO)  PackageName.......... $(PACKAGENAME)'#010+
   'endif'#010+
   'endif'#010+
   '        @$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)'#010+
   '        @$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  BaseInstallDir....... $(BASEINSTALLDIR)'#010+
   '        @$(ECHO)  BaseInstallDir....... $(BASEINSTALLDIR)'#010+
-  '        @$(ECHO)  BinInsta','llDir........ $(BININSTALLDIR)'#010+
+  '        @$(ECHO)  BinInstallDi','r........ $(BININSTALLDIR)'#010+
   '        @$(ECHO)  LibInstallDir........ $(LIBINSTALLDIR)'#010+
   '        @$(ECHO)  LibInstallDir........ $(LIBINSTALLDIR)'#010+
   '        @$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)'#010+
   '        @$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)'#010+
   '        @$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
   '        @$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
-  '        @$(ECHO)  DocInstallDir...','..... $(DOCINSTALLDIR)'#010+
+  '        @$(ECHO)  DocInstallDir.......','. $(DOCINSTALLDIR)'#010+
   '        @$(ECHO)  DataInstallDir....... $(DATAINSTALLDIR)'#010+
   '        @$(ECHO)  DataInstallDir....... $(DATAINSTALLDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  DestZipDir........... $(DESTZIPDIR)'#010+
   '        @$(ECHO)  DestZipDir........... $(DESTZIPDIR)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)'#010+
   #010+
   #010+
-  '[directorytargets]'#010,
-  '#####################################################################'#010+
+  '[directorytargets]'#010+
+  '####','################################################################'+
+  '#'#010+
   '# Directories'#010+
   '# Directories'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
   '[localmakefile]'#010+
   '[localmakefile]'#010+
-  '#####################################################################',
-  #010+
-  '# Local Makefile'#010+
+  '#####################################################################'#010+
+  '# L','ocal Makefile'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
   'ifneq ($(wildcard fpcmake.loc),)'#010+
   'ifneq ($(wildcard fpcmake.loc),)'#010+
@@ -1446,7 +1448,7 @@ const fpcmakeini : array[0..121,1..240] of char=(
   #010+
   #010+
   '[userrules]'#010+
   '[userrules]'#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
-  '# Users r','ules'#010+
+  '# Users rules',#010+
   '#####################################################################'#010+
   '#####################################################################'#010+
   #010+
   #010+
   #010+
   #010+

+ 6 - 4
utils/fpcmake.ini

@@ -763,12 +763,12 @@ endif
 [command_end]
 [command_end]
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -1053,7 +1053,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif

+ 10 - 5
utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -865,7 +865,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1025,6 +1027,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -659,12 +659,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -870,7 +870,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1030,6 +1032,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -654,12 +654,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -865,7 +865,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1025,6 +1027,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 
 

+ 10 - 5
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.15 [2000/04/08]
+# Makefile generated by fpcmake v0.99.15 [2000/05/26]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -671,12 +671,12 @@ endif
 
 
 # Smartlinking
 # Smartlinking
 ifdef LINKSMART
 ifdef LINKSMART
-override FPCOPT+=-CX
+override FPCOPT+=-XX
 endif
 endif
 
 
-# Smartlinking
+# Smartlinking creation
 ifdef CREATESMART
 ifdef CREATESMART
-override FPCOPT+=-XX
+override FPCOPT+=-CX
 endif
 endif
 
 
 # Debug
 # Debug
@@ -896,7 +896,9 @@ ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+ifdef LIBNAME
+INSTALLPPULIBFILES=$(LIBNAME)
+endif
 else
 else
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
@@ -1056,6 +1058,9 @@ ifdef CLEANRSTFILES
 endif
 endif
 ifdef EXTRACLEANFILES
 ifdef EXTRACLEANFILES
 	-$(DEL) $(EXTRACLEANFILES)
 	-$(DEL) $(EXTRACLEANFILES)
+endif
+ifdef LIBNAME
+	-$(DEL) $(LIBNAME)
 endif
 endif
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
 	-$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)