Browse Source

* added extra ifdef to check if there are some objects else some
targets aren't added anymore

peter 25 years ago
parent
commit
6ea5534991
73 changed files with 407 additions and 306 deletions
  1. 1 1
      api/Makefile
  2. 3 1
      api/go32v2/Makefile
  3. 3 1
      api/linux/Makefile
  4. 3 1
      api/win32/Makefile
  5. 1 1
      base/Makefile
  6. 1 1
      compiler/Makefile
  7. 1 1
      compiler/new/Makefile
  8. 1 1
      fcl/Makefile
  9. 3 1
      fcl/db/Makefile
  10. 1 1
      fcl/go32v2/Makefile
  11. 12 1
      fcl/linux/Makefile
  12. 1 0
      fcl/linux/Makefile.fpc
  13. 1 1
      fcl/os2/Makefile
  14. 3 1
      fcl/shedit/gtk/Makefile
  15. 15 1
      fcl/tests/Makefile
  16. 1 1
      fcl/win32/Makefile
  17. 1 1
      ide/Makefile
  18. 1 1
      ide/fake/Makefile
  19. 1 1
      ide/fake/compiler/Makefile
  20. 1 1
      ide/fake/gdb/Makefile
  21. 3 1
      ide/text/Makefile
  22. 99 107
      install/demo/Makefile
  23. 4 11
      install/demo/Makefile.fpc
  24. 3 1
      install/demo/graph/Makefile
  25. 3 1
      install/demo/modex/Makefile
  26. 3 1
      install/demo/text/Makefile
  27. 3 1
      install/demo/win32/Makefile
  28. 11 9
      install/fpc-0.99.15.spec
  29. 3 3
      install/fpc-docs-0.99.15.spec
  30. 3 1
      install/fpinst/Makefile
  31. 1 1
      packages/Makefile
  32. 3 1
      packages/cmem/Makefile
  33. 3 1
      packages/forms/Makefile
  34. 3 1
      packages/forms/demo/Makefile
  35. 3 1
      packages/gdbint/Makefile
  36. 1 1
      packages/gdbint/libgdb/Makefile
  37. 3 1
      packages/ggi/Makefile
  38. 1 1
      packages/gtk/Makefile
  39. 3 1
      packages/gtk/examples/Makefile
  40. 3 1
      packages/gtk/tutorial/Makefile
  41. 3 1
      packages/ibase/Makefile
  42. 3 1
      packages/inet/Makefile
  43. 3 1
      packages/mysql/Makefile
  44. 3 1
      packages/ncurses/Makefile
  45. 1 1
      packages/opengl/Makefile
  46. 3 1
      packages/opengl/build/Makefile
  47. 3 1
      packages/opengl/examples/Makefile
  48. 1 1
      packages/opengl/linux/Makefile
  49. 3 1
      packages/paszlib/Makefile
  50. 3 1
      packages/postgres/Makefile
  51. 3 1
      packages/regexpr/Makefile
  52. 3 1
      packages/svgalib/Makefile
  53. 3 1
      packages/syslog/Makefile
  54. 3 1
      packages/uncgi/Makefile
  55. 3 1
      packages/utmp/Makefile
  56. 1 1
      packages/x11/Makefile
  57. 1 1
      packages/zip/Makefile
  58. 1 1
      packages/zlib/Makefile
  59. 1 1
      rtl/Makefile
  60. 1 1
      rtl/go32v1/Makefile
  61. 1 1
      rtl/go32v2/Makefile
  62. 1 1
      rtl/linux/Makefile
  63. 1 1
      rtl/os2/Makefile
  64. 1 1
      rtl/win32/Makefile
  65. 1 1
      tests/Makefile
  66. 3 1
      utils/Makefile
  67. 114 108
      utils/fpcmake.inc
  68. 6 0
      utils/fpcmake.ini
  69. 7 3
      utils/fpcmake.pp
  70. 3 1
      utils/fprcp/Makefile
  71. 3 1
      utils/h2pas/Makefile
  72. 3 1
      utils/simulator/Makefile
  73. 3 1
      utils/tply/Makefile

+ 1 - 1
api/Makefile

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

+ 3 - 1
api/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/29]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -832,10 +832,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
api/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/29]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -832,10 +832,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
api/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/29]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -832,10 +832,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 1 - 1
base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/24]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: help

+ 1 - 1
compiler/Makefile

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

+ 1 - 1
compiler/new/Makefile

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

+ 1 - 1
fcl/Makefile

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

+ 3 - 1
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -890,10 +890,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 1 - 1
fcl/go32v2/Makefile

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

+ 12 - 1
fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/24]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -205,6 +205,7 @@ endif
 # Targets
 
 override UNITOBJECTS+=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process asyncio ssockets
+override RSTOBJECTS+=ssockets
 
 # Clean
 
@@ -889,6 +890,16 @@ override CLEANPPUFILES+=$(UNITPPUFILES)
 
 fpc_units: $(UNITPPUFILES)
 
+#####################################################################
+# Resource strings
+#####################################################################
+
+ifdef RSTOBJECTS
+override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
+
+override CLEANRSTFILES+=$(RSTFILES)
+endif
+
 #####################################################################
 # General compile rules
 #####################################################################

+ 1 - 0
fcl/linux/Makefile.fpc

@@ -4,6 +4,7 @@
 
 [targets]
 units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process asyncio ssockets
+rst=ssockets
 
 [defaults]
 defaulttarget=linux

+ 1 - 1
fcl/os2/Makefile

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

+ 3 - 1
fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -853,12 +853,14 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 15 - 1
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/08]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -796,6 +796,16 @@ override FPCOPT+=-Xs -OG2p3 -n
 endif
 endif
 
+# Strip
+ifdef STRIP
+override FPCOPT+=-Xs
+endif
+
+# Optimizer
+ifdef OPTIMIZE
+override FPCOPT+=-OG2p3
+endif
+
 # Verbose settings (warning,note,info)
 ifdef VERBOSE
 override FPCOPT+=-vwni
@@ -888,12 +898,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 
@@ -901,9 +913,11 @@ fpc_exes: $(EXEFILES)
 # Resource strings
 #####################################################################
 
+ifdef RSTOBJECTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
 
 override CLEANRSTFILES+=$(RSTFILES)
+endif
 
 #####################################################################
 # General compile rules

+ 1 - 1
fcl/win32/Makefile

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

+ 1 - 1
ide/Makefile

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

+ 1 - 1
ide/fake/Makefile

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

+ 1 - 1
ide/fake/compiler/Makefile

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

+ 1 - 1
ide/fake/gdb/Makefile

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

+ 3 - 1
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -928,12 +928,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 99 - 107
install/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/24]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -169,10 +169,13 @@ endif
 
 # Targets
 
-override DIROBJECTS+=$(wildcard text graph modex)
+override DIROBJECTS+=$(wildcard text graph)
 ifeq ($(OS_TARGET),linux)
 override DIROBJECTS+=$(wildcard linux)
 endif
+ifeq ($(OS_TARGET),go32v2)
+override DIROBJECTS+=$(wildcard modex)
+endif
 ifeq ($(OS_TARGET),win32)
 override DIROBJECTS+=$(wildcard win32)
 endif
@@ -196,7 +199,6 @@ endif
 
 # Packages
 
-override PACKAGES+=api
 
 # Libraries
 
@@ -474,41 +476,6 @@ endif
 
 
 
-# PACKAGESDIR packages
-
-PACKAGEAPI=1
-
-ifdef PACKAGEAPI
-ifneq ($(wildcard $(FPCDIR)/api),)
-ifneq ($(wildcard $(FPCDIR)/api/$(OS_TARGET)),)
-PACKAGEDIR_API=$(FPCDIR)/api/$(OS_TARGET)
-else
-PACKAGEDIR_API=$(FPCDIR)/api
-endif
-ifeq ($(wildcard $(PACKAGEDIR_API)/$(FPCMADE)),)
-override COMPILEPACKAGES+=package_api
-package_api:
-	$(MAKE) -C $(PACKAGEDIR_API) all
-endif
-UNITDIR_API=$(PACKAGEDIR_API)
-else
-PACKAGEDIR_API=
-ifneq ($(wildcard $(UNITSDIR)/api),)
-ifneq ($(wildcard $(UNITSDIR)/api/$(OS_TARGET)),)
-UNITDIR_API=$(UNITSDIR)/api/$(OS_TARGET)
-else
-UNITDIR_API=$(UNITSDIR)/api
-endif
-else
-UNITDIR_API=
-endif
-endif
-ifdef UNITDIR_API
-override NEEDUNITDIR+=$(UNITDIR_API)
-endif
-endif
-
-
 #####################################################################
 # Default Directories
 #####################################################################
@@ -580,6 +547,11 @@ SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)
 endif
 endif
 
+# Where the example files will be stored
+ifndef EXAMPLEINSTALLDIR
+EXAMPLEINSTALLDIR=$(SOURCEINSTALLDIR)
+endif
+
 # Where the doc files will be stored
 ifndef DOCINSTALLDIR
 ifdef inlinux
@@ -624,10 +596,6 @@ ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
 
-ifdef NEEDUNITDIR
-override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))
-endif
-
 ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
@@ -748,6 +716,8 @@ install: fpc_install $(addsuffix _install,$(DIROBJECTS))
 
 sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(DIROBJECTS))
 
+exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(DIROBJECTS))
+
 zipinstall: fpc_zipinstall
 
 zipsourceinstall: fpc_zipsourceinstall
@@ -760,7 +730,7 @@ cleanall: fpc_cleanall $(addsuffix _cleanall,$(DIROBJECTS))
 
 require: $(addsuffix _require,$(DIROBJECTS))
 
-.PHONY:  all debug examples test smart shared showinstall install sourceinstall zipinstall zipsourceinstall clean distclean cleanall require
+.PHONY:  all debug examples test smart shared showinstall install sourceinstall exampleinstall zipinstall zipsourceinstall clean distclean cleanall require
 
 #####################################################################
 # General compile rules
@@ -893,7 +863,7 @@ endif
 # SourceInstall rules
 #####################################################################
 
-.PHONY: fpc_sourceinstall
+.PHONY: fpc_sourceinstall fpc_exampleinstall
 
 ifndef SOURCETOPDIR
 SOURCETOPDIR=$(BASEDIR)
@@ -903,6 +873,10 @@ fpc_sourceinstall: clean
 	$(MKDIR) $(SOURCEINSTALLDIR)
 	$(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)
 
+fpc_exampleinstall: clean
+	$(MKDIR) $(EXAMPLEINSTALLDIR)
+	$(COPYTREE) $(EXAMPLESRC) $(EXAMPLEINSTALLDIR)
+
 #####################################################################
 # Zip
 #####################################################################
@@ -959,11 +933,14 @@ endif
 	$(DELTREE) $(PACKDIR)
 endif
 
-.PHONY:  fpc_zipsourceinstall
+.PHONY:  fpc_zipexampleinstall
 
 fpc_zipsourceinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=src
 
+fpc_zipexampleinstall:
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall PACKAGESUFFIX=exm
+
 #####################################################################
 # Clean rules
 #####################################################################
@@ -1078,10 +1055,12 @@ endif
 
 OBJECTDIRTEXT=1
 OBJECTDIRGRAPH=1
-OBJECTDIRMODEX=1
 ifeq ($(OS_TARGET),linux)
 OBJECTDIRLINUX=1
 endif
+ifeq ($(OS_TARGET),go32v2)
+OBJECTDIRMODEX=1
+endif
 ifeq ($(OS_TARGET),win32)
 OBJECTDIRWIN32=1
 endif
@@ -1089,7 +1068,7 @@ endif
 # Dir text
 
 ifdef OBJECTDIRTEXT
-.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
+.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
 
 text_all:
 	$(MAKE) -C text all
@@ -1118,6 +1097,9 @@ text_install:
 text_sourceinstall:
 	$(MAKE) -C text sourceinstall
 
+text_exampleinstall:
+	$(MAKE) -C text exampleinstall
+
 text_zipinstall:
 	$(MAKE) -C text zipinstall
 
@@ -1143,7 +1125,7 @@ endif
 # Dir graph
 
 ifdef OBJECTDIRGRAPH
-.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
+.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
 
 graph_all:
 	$(MAKE) -C graph all
@@ -1172,6 +1154,9 @@ graph_install:
 graph_sourceinstall:
 	$(MAKE) -C graph sourceinstall
 
+graph_exampleinstall:
+	$(MAKE) -C graph exampleinstall
+
 graph_zipinstall:
 	$(MAKE) -C graph zipinstall
 
@@ -1194,64 +1179,10 @@ graph_info:
 	$(MAKE) -C graph info
 endif
 
-# Dir modex
-
-ifdef OBJECTDIRMODEX
-.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:
-	$(MAKE) -C modex all
-
-modex_debug:
-	$(MAKE) -C modex debug
-
-modex_examples:
-	$(MAKE) -C modex examples
-
-modex_test:
-	$(MAKE) -C modex test
-
-modex_smart:
-	$(MAKE) -C modex smart
-
-modex_shared:
-	$(MAKE) -C modex shared
-
-modex_showinstall:
-	$(MAKE) -C modex showinstall
-
-modex_install:
-	$(MAKE) -C modex install
-
-modex_sourceinstall:
-	$(MAKE) -C modex sourceinstall
-
-modex_zipinstall:
-	$(MAKE) -C modex zipinstall
-
-modex_zipsourceinstall:
-	$(MAKE) -C modex zipsourceinstall
-
-modex_clean:
-	$(MAKE) -C modex clean
-
-modex_distclean:
-	$(MAKE) -C modex distclean
-
-modex_cleanall:
-	$(MAKE) -C modex cleanall
-
-modex_require:
-	$(MAKE) -C modex require
-
-modex_info:
-	$(MAKE) -C modex info
-endif
-
 # Dir linux
 
 ifdef OBJECTDIRLINUX
-.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
+.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
 
 linux_all:
 	$(MAKE) -C linux all
@@ -1280,6 +1211,9 @@ linux_install:
 linux_sourceinstall:
 	$(MAKE) -C linux sourceinstall
 
+linux_exampleinstall:
+	$(MAKE) -C linux exampleinstall
+
 linux_zipinstall:
 	$(MAKE) -C linux zipinstall
 
@@ -1302,10 +1236,67 @@ linux_info:
 	$(MAKE) -C linux info
 endif
 
+# Dir modex
+
+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
+
+modex_all:
+	$(MAKE) -C modex all
+
+modex_debug:
+	$(MAKE) -C modex debug
+
+modex_examples:
+	$(MAKE) -C modex examples
+
+modex_test:
+	$(MAKE) -C modex test
+
+modex_smart:
+	$(MAKE) -C modex smart
+
+modex_shared:
+	$(MAKE) -C modex shared
+
+modex_showinstall:
+	$(MAKE) -C modex showinstall
+
+modex_install:
+	$(MAKE) -C modex install
+
+modex_sourceinstall:
+	$(MAKE) -C modex sourceinstall
+
+modex_exampleinstall:
+	$(MAKE) -C modex exampleinstall
+
+modex_zipinstall:
+	$(MAKE) -C modex zipinstall
+
+modex_zipsourceinstall:
+	$(MAKE) -C modex zipsourceinstall
+
+modex_clean:
+	$(MAKE) -C modex clean
+
+modex_distclean:
+	$(MAKE) -C modex distclean
+
+modex_cleanall:
+	$(MAKE) -C modex cleanall
+
+modex_require:
+	$(MAKE) -C modex require
+
+modex_info:
+	$(MAKE) -C modex info
+endif
+
 # Dir win32
 
 ifdef OBJECTDIRWIN32
-.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
+.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
 
 win32_all:
 	$(MAKE) -C win32 all
@@ -1334,6 +1325,9 @@ win32_install:
 win32_sourceinstall:
 	$(MAKE) -C win32 sourceinstall
 
+win32_exampleinstall:
+	$(MAKE) -C win32 exampleinstall
+
 win32_zipinstall:
 	$(MAKE) -C win32 zipinstall
 
@@ -1368,10 +1362,8 @@ endif
 # Users rules
 #####################################################################
 
-.PHONY: text graph modex win32
-
 info:
-	@echo makfeile targets are
+	@echo Makefile targets are
 	@echo - all
 	@echo - text
 	@echo - graph

+ 4 - 11
install/demo/Makefile.fpc

@@ -3,16 +3,14 @@
 #
 
 [targets]
-dirs=text graph modex
+dirs=text graph
+dirs_go32v2=modex
 dirs_win32=win32
 dirs_linux=linux
 
-[require]
-# Not always necessary, but saves a lot of trouble
-packages=api
-
 [install]
 packagename=demo
+sourcesubdir=0
 
 [defaults]
 defaultrule=all
@@ -21,16 +19,11 @@ defaultrule=all
 fpcdir=..
 targetdir=.
 
-[postsettings]
-
 [rules]
-.PHONY: text graph modex win32
-
 info:
-        @echo makfeile targets are
+        @echo Makefile targets are
         @echo - all
         @echo - text
         @echo - graph
         @echo - modex
         @echo - win32
-

+ 3 - 1
install/demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/23]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: both
@@ -847,12 +847,14 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
install/demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/23]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -816,12 +816,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
install/demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/23]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -814,12 +814,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
install/demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/23]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -816,12 +816,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 11 - 9
install/fpc-0.99.14.spec → install/fpc-0.99.15.spec

@@ -1,15 +1,15 @@
 Name: fpc
-Version: 0.99.14
+Version: 0.99.15
 Release: 1
 ExclusiveArch: i386
 Copyright: GPL
 Group: Development/Languages
-Source: fpc-0.99.14-src.tar.gz
+Source: fpc-0.99.15-src.tar.gz
 Summary: Free Pascal Compiler
 Packager: Peter Vreman ([email protected])
 URL: http://www.freepascal.org/
 
-%define fpcversion 0.99.14
+%define fpcversion 0.99.15
 %define fpcdir /usr/lib/fpc/%{fpcversion}
 %define docdir /usr/doc/fpc-%{fpcversion}
 
@@ -27,6 +27,7 @@ mysql,postgres,ibase bindings.
 %setup -c
 
 %build
+export FPCDIR=
 NEWPP=`pwd`/compiler/ppc386
 	make compiler_cycle
 	make fcl_all PP=${NEWPP}
@@ -35,6 +36,7 @@ NEWPP=`pwd`/compiler/ppc386
 	make utils_all PP=${NEWPP}
 
 %install
+export FPCDIR=
 NEWPP=`pwd`/compiler/ppc386
 NEWPPUFILES=`pwd`/utils/ppufiles
 	make compiler_install PP=${NEWPP} PPUFILES=${NEWPPUFILES}
@@ -49,12 +51,12 @@ NEWPPUFILES=`pwd`/utils/ppufiles
 	make man_install PP=${NEWPP}
 	
 %clean
-	make compiler_distclean
-	make rtl_distclean
-	make fcl_distclean
-	make api_distclean
-	make packages_distclean
-	make utils_distclean
+	make compiler_clean
+	make rtl_clean
+	make fcl_clean
+	make api_clean
+	make packages_clean
+	make utils_clean
 
 %post
 FPCDIR=%{fpcdir}

+ 3 - 3
install/fpc-docs-0.99.14.spec → install/fpc-docs-0.99.15.spec

@@ -1,15 +1,15 @@
 Name: fpc-docs
-Version: 0.99.14
+Version: 0.99.15
 Release: 1
 ExclusiveArch: i386
 Copyright: GPL
 Group: Development/Languages
-Source: fpc-docs-0.99.14-src.tar.gz
+Source: fpc-docs-0.99.15-src.tar.gz
 Summary: Free Pascal Compiler Documentation
 Packager: Peter Vreman ([email protected])
 URL: http://www.freepascal.org/
 
-%define fpcversion 0.99.14
+%define fpcversion 0.99.15
 %define fpcdir /usr/lib/fpc/%{fpcversion}
 %define docdir /usr/doc/fpc-%{fpcversion}
 

+ 3 - 1
install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -865,12 +865,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 1 - 1
packages/Makefile

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

+ 3 - 1
packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/03/31]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -823,12 +823,14 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -852,12 +852,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -827,10 +827,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 1 - 1
packages/gdbint/libgdb/Makefile

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

+ 3 - 1
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 1 - 1
packages/gtk/Makefile

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

+ 3 - 1
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -845,12 +845,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -844,12 +844,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/03/22]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 1 - 1
packages/opengl/Makefile

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

+ 3 - 1
packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -823,12 +823,14 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -852,12 +852,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 1 - 1
packages/opengl/linux/Makefile

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

+ 3 - 1
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -798,10 +798,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/23]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 3 - 1
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -797,10 +797,12 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 1 - 1
packages/x11/Makefile

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

+ 1 - 1
packages/zip/Makefile

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

+ 1 - 1
packages/zlib/Makefile

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

+ 1 - 1
rtl/Makefile

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

+ 1 - 1
rtl/go32v1/Makefile

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

+ 1 - 1
rtl/go32v2/Makefile

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

+ 1 - 1
rtl/linux/Makefile

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

+ 1 - 1
rtl/os2/Makefile

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

+ 1 - 1
rtl/win32/Makefile

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

+ 1 - 1
tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/03/22]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: info

+ 3 - 1
utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -918,12 +918,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 114 - 108
utils/fpcmake.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..120] of string[240]=(
+const fpcmakeini : array[0..121] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..120,1..240] of char=(
+const fpcmakeini : array[0..121,1..240] of char=(
 {$endif Delphi}
   ';'#010+
   '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@@ -966,12 +966,14 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   '.PHONY: fpc_exes'#010+
   #010+
+  'ifdef EXEOBJECTS'#010+
   'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))'#010+
   'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
-  'override INSTALLEXEFILES+=$(EXEFILES)'#010+
-  'override CLEANE','XEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
+  'override INSTALLEXEFILES+=$(EXEFILES',')'#010+
+  'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
+  'endif'#010+
   #010+
   'fpc_exes: $(EXEFILES)'#010+
   #010+
@@ -979,27 +981,32 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '[rstrules]'#010+
   '#####################################################################'#010+
   '# Resource strings'#010+
-  '#####################################################################'#010+
+  '##########################################################','##########'+
+  '#'#010+
   #010+
-  'override R','STFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+
+  'ifdef RSTOBJECTS'#010+
+  'override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+
   #010+
   'override CLEANRSTFILES+=$(RSTFILES)'#010+
+  'endif'#010+
   #010+
   #010+
   '[examplerules]'#010+
   '#####################################################################'#010+
   '# Examples'#010+
-  '############################################################','########'+
+  '##############','######################################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_examples fpc_test'#010+
   #010+
+  'ifdef EXAMPLEOBJECTS'#010+
   'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
   'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
   #010+
-  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
+  'ove','rride CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
+  'endif'#010+
   #010+
-  'fpc_examples',': all $(EXAMPLEFILES)'#010+
+  'fpc_examples: all $(EXAMPLEFILES)'#010+
   #010+
   'fpc_test: examples'#010+
   #010+
@@ -1007,9 +1014,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '[compilerules]'#010+
   '#####################################################################'#010+
   '# General compile rules'#010+
-  '#####################################################################'#010+
+  '##############','######################################################'+
+  '#'#010+
   #010+
-  '.PHONY: fpc_pack','ages fpc_all fpc_debug'#010+
+  '.PHONY: fpc_packages fpc_all fpc_debug'#010+
   #010+
   '$(FPCMADE): $(ALLTARGET)'#010+
   '        @$(ECHO) Compiled > $(FPCMADE)'#010+
@@ -1018,10 +1026,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   'fpc_all: fpc_packages $(FPCMADE)'#010+
   #010+
-  'fpc_debug:'#010+
+  'fpc_debug:',#010+
   '        $(MAKE) all DEBUG=1'#010+
   #010+
-  '# General compile rules, available for both',' possible PASEXT'#010+
+  '# General compile rules, available for both possible PASEXT'#010+
   #010+
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
   #010+
@@ -1030,11 +1038,11 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%$(PPUEXT): %.pas'#010+
-  '        $(COMPILER) $< $(REDIR)'#010+
+  '        $(CO','MPILER) $< $(REDIR)'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pp'#010+
-  '        $(COMPI','LER) $< $(REDIR)'#010+
+  '        $(COMPILER) $< $(REDIR)'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pas'#010+
@@ -1043,20 +1051,20 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   #010+
   '[libraryrules]'#010+
-  '#####################################################################'#010+
-  '# Library'#010+
-  '###################################','#################################'+
+  '##########################################','##########################'+
   '#'#010+
+  '# Library'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_smart fpc_shared'#010+
   #010+
   '# Default sharedlib units are all unit objects'#010+
   'ifndef SHAREDLIBUNITOBJECTS'#010+
-  'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+
+  'SHAREDLIBUNITOBJECTS:=$(UN','ITOBJECTS)'#010+
   'endif'#010+
   #010+
   'fpc_smart:'#010+
-  '        $(MAKE) all LINKSMART=1 CREATESMART=','1'#010+
+  '        $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
   #010+
   'fpc_shared: all'#010+
   'ifdef inlinux'#010+
@@ -1066,30 +1074,28 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
   'endif'#010+
   'else'#010+
-  '        @$(ECHO) "Shared Libraries not supported"'#010+
+  '        @$(E','CHO) "Shared Libraries not supported"'#010+
   'endif'#010+
   #010+
   #010+
   '[installrules]'#010+
-  '############','########################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Install rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_showinstall fpc_install'#010+
+  '.PHONY: fpc_showinstal','l fpc_install'#010+
   #010+
   'ifdef EXTRAINSTALLUNITS'#010+
-  'override INSTALLPPUFILES+=$(addsuf','fix $(PPUEXT),$(EXTRAINSTALLUNITS)'+
-  ')'#010+
+  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
   'endif'#010+
   #010+
   'ifdef INSTALLPPUFILES'#010+
   'ifdef PPUFILES'#010+
   'ifdef inlinux'#010+
   'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
-  'INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
+  'INSTAL','LPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
   'else'#010+
-  'INSTALLPPUL','INKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
+  'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
   'endif'#010+
   'else'#010+
   'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
@@ -1097,26 +1103,26 @@ const fpcmakeini : array[0..120,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+
+  'fpc_showinstal','l: $(SHOWINSTALLTARGET)'#010+
   'ifdef INSTALLEXEFILES'#010+
-  '        @$(ECHO) -e $(addpr','efix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFI'+
-  'LES))'#010+
+  '        @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
+  'S))'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
   'ES))'#010+
-  'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(I','NSTALLPPUL'+
-  'INKFILES))'#010+
+  'ifneq ($(INSTALLP','PULINKFILES),)'#010+
+  '        @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
+  'KFILES))'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
   '        @$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBF'+
   'ILES))'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef EXTRAINSTALLFILES'#010+
-  '        @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALL',
-  'FILES))'#010+
+  'ifdef EXTRAINSTALLFI','LES'#010+
+  '        @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
+  'ILES))'#010+
   'endif'#010+
   #010+
   'fpc_install: $(INSTALLTARGET)'#010+
@@ -1124,34 +1130,35 @@ const fpcmakeini : array[0..120,1..240] of char=(
   'ifdef INSTALLEXEFILES'#010+
   '        $(MKDIR) $(BININSTALLDIR)'#010+
   '# Compress the exes if upx is defined'#010+
-  'ifdef UPXPROG'#010+
+  'if','def UPXPROG'#010+
   '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
   'endif'#010+
-  '        $(INSTAL','LEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
+  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(UNITINSTALLDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
-  'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '        $(INSTALL) $(INSTALLPPULINKFILES) $(UNI','TINSTALLDIR)'#010+
+  'ifneq ','($(INSTALLPPULINKFILES),)'#010+
+  '        $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
   'endif'#010+
   'ifneq ($(INSTALLPPULIBFILES),)'#010+
   '        $(MKDIR) $(LIBINSTALLDIR)'#010+
   '        $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef EXTRAINSTALLFILES'#010+
+  'ifdef EXTRAIN','STALLFILES'#010+
   '        $(MKDIR) $(DATAINSTALLDIR)'#010+
-  '        $(INSTALL) $(EXTRAI','NSTALLFILES) $(DATAINSTALLDIR)'#010+
+  '        $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
   'endif'#010+
   #010+
   #010+
   '[sourceinstallrules]'#010+
   '#####################################################################'#010+
   '# SourceInstall rules'#010+
-  '#####################################################################'#010+
+  '###############','#####################################################'+
+  '#'#010+
   #010+
-  '.PHONY: fpc_sourc','einstall'#010+
+  '.PHONY: fpc_sourceinstall'#010+
   #010+
   'ifndef SOURCETOPDIR'#010+
   'SOURCETOPDIR=$(BASEDIR)'#010+
@@ -1159,22 +1166,21 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   'fpc_sourceinstall: clean'#010+
   '        $(MKDIR) $(SOURCEINSTALLDIR)'#010+
-  '        $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+
+  '        $(COPYTREE) $(SOURCETOPDIR) $(SOURCE','INSTALLDIR)'#010+
   #010+
   #010+
   '[zipinstallrules]'#010+
-  '#########################################','###########################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Zip'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_zipinstall'#010+
   #010+
   '# Create suffix to add'#010+
-  'ifndef PACKAGESUFFIX'#010+
+  'ifndef PACKAGE','SUFFIX'#010+
   'PACKAGESUFFIX=$(OS_TARGET)'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
-  'PACKAGESUFFI','X=go32'#010+
+  'PACKAGESUFFIX=go32'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),win32)'#010+
   'PACKAGESUFFIX=w32'#010+
@@ -1186,11 +1192,11 @@ const fpcmakeini : array[0..120,1..240] of char=(
   'ifndef inlinux'#010+
   'PACKDIR=$(BASEDIR)/pack_tmp'#010+
   'else'#010+
-  'PACKDIR=/tmp/fpc-pack'#010+
+  'PA','CKDIR=/tmp/fpc-pack'#010+
   'endif'#010+
   'endif'#010+
   #010+
-  '# Maybe create default zipname from pack','agename'#010+
+  '# Maybe create default zipname from packagename'#010+
   'ifndef ZIPNAME'#010+
   'ifdef PACKAGENAME'#010+
   'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)'#010+
@@ -1199,31 +1205,31 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   '# Use tar by default under linux'#010+
   'ifndef USEZIP'#010+
-  'ifdef inlinux'#010+
+  'ifdef inlin','ux'#010+
   'USETAR=1'#010+
   'endif'#010+
   'endif'#010+
   #010+
   'fpc_zipinstall:'#010+
   'ifndef ZIPNAME'#010+
-  '        @$(ECHO) ','"Please specify ZIPNAME!"'#010+
+  '        @$(ECHO) "Please specify ZIPNAME!"'#010+
   '        @exit 1'#010+
   'else'#010+
   '        $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
   'ifdef USETAR'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
-  '        cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+
-  'IPNA','ME)$(TAREXT) * ; cd $(BASEDIR)'#010+
+  ' ','       cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+
+  '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
   'else'#010+
   '        $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
   '        cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
-  'ME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+
+  'ME)$(ZIPEXT)',' * ; cd $(BASEDIR)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   'endif'#010+
   #010+
   #010+
-  '[zipsource','installrules]'#010+
+  '[zipsourceinstallrules]'#010+
   '.PHONY:  fpc_zipsourceinstall'#010+
   #010+
   'fpc_zipsourceinstall:'#010+
@@ -1232,19 +1238,19 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   #010+
   '[cleanrules]'#010+
-  '#####################################################################'#010+
-  '# Clean rules'#010+
-  '#','###################################################################'+
+  '############','########################################################'+
   '#'#010+
+  '# Clean rules'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
   #010+
   'ifdef EXTRACLEANUNITS'#010+
-  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
+  'override CLEANPPUFILES+=$(add','suffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
-  'ifdef PPU','FILES'#010+
+  'ifdef PPUFILES'#010+
   'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
   'else'#010+
   'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
@@ -1252,10 +1258,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  'fpc_clean: $(CLEANTARGET)'#010+
+  'fpc_clean: ','$(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
-  'endif',#010+
+  'endif'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
   'endif'#010+
@@ -1263,10 +1269,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(CLEANRSTFILES)'#010+
+  '        -$(DEL',') $(CLEANRSTFILES)'#010+
   'endif'#010+
   'ifdef EXTRACLEANFILES'#010+
-  '        -$(DEL) $(EXTRACLE','ANFILES)'#010+
+  '        -$(DEL) $(EXTRACLEANFILES)'#010+
   'endif'#010+
   '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
   #010+
@@ -1275,18 +1281,17 @@ const fpcmakeini : array[0..120,1..240] of char=(
   #010+
   'fpc_cleanall: $(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
-  '        -$(DEL) $(CLEANEXEFILES)'#010+
+  '     ','   -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
-  '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(','RSTEXT) *$(ASMEXT) *$(STATICL'+
-  'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
+  '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
+  'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
-  '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
+  '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)',
   #010+
   #010+
   #010+
   '[dependrules]'#010+
-  '########################################################','############'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Depend rules'#010+
   '#####################################################################'#010+
   #010+
@@ -1296,27 +1301,26 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        $(PPDEP) $(UNITOBJECTS)'#010+
   #010+
   #010+
-  '[inforules]'#010+
-  '##############################################################','######'+
-  '#'#010+
+  '[','inforules]'#010+
+  '#####################################################################'#010+
   '# Info rules'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+
-  'nfo \'#010+
+  'nfo \',#010+
   '        fpc_dirinfo'#010+
   #010+
   'fpc_info: $(INFOTARGET)'#010+
   #010+
   '[info_cfg]'#010+
   'fpc_infocfg:'#010+
-  '  ','      @$(ECHO)'#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  FPC....... $(FPC)'#010+
   '        @$(ECHO)  Version... $(FPC_VERSION)'#010+
-  '        @$(ECHO)  CPU....... $(CPU_TARGET)'#010+
-  '        @$(ECHO)  Source.... $(OS_SOURCE)'#010,
+  '        @$(E','CHO)  CPU....... $(CPU_TARGET)'#010+
+  '        @$(ECHO)  Source.... $(OS_SOURCE)'#010+
   '        @$(ECHO)  Target.... $(OS_TARGET)'#010+
   '        @$(ECHO)'#010+
   #010+
@@ -1325,18 +1329,18 @@ const fpcmakeini : array[0..120,1..240] of char=(
   'ifdef inlinux'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
-  '        @$(ECHO)'#010+
+  '        @$(','ECHO)'#010+
   'ifdef NEEDGCCLIB'#010+
   '        @$(ECHO)  GCC library is needed.'#010+
   'endif'#010+
-  'ifd','ef NEEDOTHERLIB'#010+
+  'ifdef NEEDOTHERLIB'#010+
   '        @$(ECHO)  Other library is needed.'#010+
   'endif'#010+
   '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
+  '        @$(ECHO)  GCC library..... $(GC','CLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
-  '        @$(ECH','O)'#010+
+  '        @$(ECHO)'#010+
   'endif'#010+
   #010+
   '[info_tools]'#010+
@@ -1345,23 +1349,23 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Pwd....... $(PWD)'#010+
-  '        @$(ECHO)  Echo...... $(ECHO)'#010+
+  '        @$(ECHO)  Echo..','.... $(ECHO)'#010+
   'ifdef PPDEP'#010+
   '        @$(ECHO)  PPDep..... $(PPDEP)'#010+
   'endif'#010+
-  'ifde','f PPUMOVE'#010+
+  'ifdef PPUMOVE'#010+
   '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
   'endif'#010+
   'ifdef PPUFILES'#010+
   '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
   'endif'#010+
   'ifdef DATA2INC'#010+
-  '        @$(ECHO)  Data2Inc.. $(DATA2INC)'#010+
+  '        @$(ECHO)  Data2Inc.. $(DAT','A2INC)'#010+
   'endif'#010+
   'ifdef SED'#010+
   '        @$(ECHO)  Sed....... $(SED)'#010+
   'endif'#010+
-  'ifdef DA','TE'#010+
+  'ifdef DATE'#010+
   '        @$(ECHO)  Date...... $(DATE)'#010+
   'endif'#010+
   'ifdef DIFF'#010+
@@ -1371,10 +1375,10 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        @$(ECHO)  Cmp....... $(CMP)'#010+
   'endif'#010+
   'ifdef UPXPROG'#010+
-  '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
+  ' ','       @$(ECHO)  Upx....... $(UPXPROG)'#010+
   'endif'#010+
   'ifdef ZIPPROG'#010+
-  '        @$(ECH','O)  Zip....... $(ZIPPROG)'#010+
+  '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
   'endif'#010+
   '        @$(ECHO)'#010+
   #010+
@@ -1383,64 +1387,66 @@ const fpcmakeini : array[0..120,1..240] of char=(
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Object info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)'#010+
-  '        @$(ECHO)  UnitObjects.....','.. $(UNITOBJECTS)'#010+
+  '        @$(ECHO',')  LoaderObjects..... $(LOADEROBJECTS)'#010+
+  '        @$(ECHO)  UnitObjects....... $(UNITOBJECTS)'#010+
   '        @$(ECHO)  ExeObjects........ $(EXEOBJECTS)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+
-  '        @$(ECHO)  ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
+  '        @$(ECHO)  ExtraCl','eanFiles... $(EXTRACLEANFILES)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  ExtraIn','stallUnits. $(EXTRAINSTALLUNITS)'#010+
+  '        @$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
   '        @$(ECHO)  ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[info_install]'#010+
   'fpc_infoinstall:'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Install info =='#010+
+  '        @','$(ECHO)  == Install info =='#010+
   '        @$(ECHO)'#010+
   'ifdef DATE'#010+
-  '        @$(ECHO) ',' DateStr.............. $(DATESTR)'#010+
+  '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
   'endif'#010+
   'ifdef PACKAGEPREFIX'#010+
   '        @$(ECHO)  PackagePrefix........ $(PACKAGEPREFIX)'#010+
   'endif'#010+
   'ifdef PACKAGENAME'#010+
-  '        @$(ECHO)  PackageName.......... $(PACKAGENAME)'#010+
+  '        @$(ECHO)  PackageN','ame.......... $(PACKAGENAME)'#010+
   'endif'#010+
-  '        @$(ECHO)  PackageSuffix.......','. $(PACKAGESUFFIX)'#010+
+  '        @$(ECHO)  PackageSuffix........ $(PACKAGESUFFIX)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  BaseInstallDir....... $(BASEINSTALLDIR)'#010+
   '        @$(ECHO)  BinInstallDir........ $(BININSTALLDIR)'#010+
-  '        @$(ECHO)  LibInstallDir........ $(LIBINSTALLDIR)'#010+
-  '        @$(ECHO)  UnitInstallDir','....... $(UNITINSTALLDIR)'#010+
+  '        @$(ECHO)','  LibInstallDir........ $(LIBINSTALLDIR)'#010+
+  '        @$(ECHO)  UnitInstallDir....... $(UNITINSTALLDIR)'#010+
   '        @$(ECHO)  SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
   '        @$(ECHO)  DocInstallDir........ $(DOCINSTALLDIR)'#010+
-  '        @$(ECHO)  DataInstallDir....... $(DATAINSTALLDIR)'#010+
+  '        @$(ECHO)  DataIn','stallDir....... $(DATAINSTALLDIR)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Dest','ZipDir........... $(DESTZIPDIR)'#010+
+  '        @$(ECHO)  DestZipDir........... $(DESTZIPDIR)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[directorytargets]'#010+
-  '#####################################################################'#010+
-  '# Directories'#010+
-  '####################################','################################'+
+  '###############################################','#####################'+
   '#'#010+
+  '# Directories'#010+
+  '#####################################################################'#010+
   #010+
   '[localmakefile]'#010+
   '#####################################################################'#010+
   '# Local Makefile'#010+
-  '#####################################################################'#010+
+  '#############################','#######################################'+
+  '#'#010+
   #010+
-  'ifneq ($(wildcard fpcmake.loc),',')'#010+
+  'ifneq ($(wildcard fpcmake.loc),)'#010+
   'include fpcmake.loc'#010+
   'endif'#010+
   #010+
   '[userrules]'#010+
   '#####################################################################'#010+
   '# Users rules'#010+
-  '#####################################################################'#010+
+  '##########################################','##########################'+
+  '#'#010+
   #010+
   #010+
   '[end]'#010

+ 6 - 0
utils/fpcmake.ini

@@ -930,12 +930,14 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 
@@ -945,9 +947,11 @@ fpc_exes: $(EXEFILES)
 # Resource strings
 #####################################################################
 
+ifdef RSTOBJECTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))
 
 override CLEANRSTFILES+=$(RSTFILES)
+endif
 
 
 [examplerules]
@@ -957,10 +961,12 @@ override CLEANRSTFILES+=$(RSTFILES)
 
 .PHONY: fpc_examples fpc_test
 
+ifdef EXAMPLEOBJECTS
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+endif
 
 fpc_examples: all $(EXAMPLEFILES)
 

+ 7 - 3
utils/fpcmake.pp

@@ -23,7 +23,7 @@ uses
   sysutils,classes,inifiles;
 
 const
-  Version='v0.99.13';
+  Version='v0.99.15';
   Title='fpcmake '+Version;
   TitleDate=Title+' ['+{$i %DATE}+']';
 
@@ -501,7 +501,7 @@ begin
      Verbose('Opening '+fn);
      result:=TIniFile.Create(fn);
    end;
-  result.Escapelinefeeds:=True; 
+  result.Escapelinefeeds:=True;
 end;
 
 
@@ -1305,7 +1305,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.33  2000-03-11 15:58:56  michael
+  Revision 1.34  2000-04-11 15:34:58  peter
+    * added extra ifdef to check if there are some objects else some
+      targets aren't added anymore
+
+  Revision 1.33  2000/03/11 15:58:56  michael
   + Added escapelinefeeds:=true after inifile.create
 
   Revision 1.32  2000/02/09 16:44:14  peter

+ 3 - 1
utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -779,12 +779,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/24]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -784,12 +784,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -779,12 +779,14 @@ info: fpc_info
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)
 

+ 3 - 1
utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.15 [2000/04/08]
 #
 
 defaultrule: all
@@ -810,12 +810,14 @@ fpc_units: $(UNITPPUFILES)
 
 .PHONY: fpc_exes
 
+ifdef EXEOBJECTS
 override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
 
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+endif
 
 fpc_exes: $(EXEFILES)