From 6ea5534991a9d9d88d5e3ad6fc391b4a5096481b Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 11 Apr 2000 15:34:47 +0000 Subject: [PATCH] * added extra ifdef to check if there are some objects else some targets aren't added anymore --- api/Makefile | 2 +- api/go32v2/Makefile | 4 +- api/linux/Makefile | 4 +- api/win32/Makefile | 4 +- base/Makefile | 2 +- compiler/Makefile | 2 +- compiler/new/Makefile | 2 +- fcl/Makefile | 2 +- fcl/db/Makefile | 4 +- fcl/go32v2/Makefile | 2 +- fcl/linux/Makefile | 13 +- fcl/linux/Makefile.fpc | 1 + fcl/os2/Makefile | 2 +- fcl/shedit/gtk/Makefile | 4 +- fcl/tests/Makefile | 16 +- fcl/win32/Makefile | 2 +- ide/Makefile | 2 +- ide/fake/Makefile | 2 +- ide/fake/compiler/Makefile | 2 +- ide/fake/gdb/Makefile | 2 +- ide/text/Makefile | 4 +- install/demo/Makefile | 206 ++++++++-------- install/demo/Makefile.fpc | 15 +- install/demo/graph/Makefile | 4 +- install/demo/modex/Makefile | 4 +- install/demo/text/Makefile | 4 +- install/demo/win32/Makefile | 4 +- .../{fpc-0.99.14.spec => fpc-0.99.15.spec} | 20 +- ...ocs-0.99.14.spec => fpc-docs-0.99.15.spec} | 6 +- install/fpinst/Makefile | 4 +- packages/Makefile | 2 +- packages/cmem/Makefile | 4 +- packages/forms/Makefile | 4 +- packages/forms/demo/Makefile | 4 +- packages/gdbint/Makefile | 4 +- packages/gdbint/libgdb/Makefile | 2 +- packages/ggi/Makefile | 4 +- packages/gtk/Makefile | 2 +- packages/gtk/examples/Makefile | 4 +- packages/gtk/tutorial/Makefile | 4 +- packages/ibase/Makefile | 4 +- packages/inet/Makefile | 4 +- packages/mysql/Makefile | 4 +- packages/ncurses/Makefile | 4 +- packages/opengl/Makefile | 2 +- packages/opengl/build/Makefile | 4 +- packages/opengl/examples/Makefile | 4 +- packages/opengl/linux/Makefile | 2 +- packages/paszlib/Makefile | 4 +- packages/postgres/Makefile | 4 +- packages/regexpr/Makefile | 4 +- packages/svgalib/Makefile | 4 +- packages/syslog/Makefile | 4 +- packages/uncgi/Makefile | 4 +- packages/utmp/Makefile | 4 +- packages/x11/Makefile | 2 +- packages/zip/Makefile | 2 +- packages/zlib/Makefile | 2 +- rtl/Makefile | 2 +- rtl/go32v1/Makefile | 2 +- rtl/go32v2/Makefile | 2 +- rtl/linux/Makefile | 2 +- rtl/os2/Makefile | 2 +- rtl/win32/Makefile | 2 +- tests/Makefile | 2 +- utils/Makefile | 4 +- utils/fpcmake.inc | 222 +++++++++--------- utils/fpcmake.ini | 6 + utils/fpcmake.pp | 10 +- utils/fprcp/Makefile | 4 +- utils/h2pas/Makefile | 4 +- utils/simulator/Makefile | 4 +- utils/tply/Makefile | 4 +- 73 files changed, 407 insertions(+), 306 deletions(-) rename install/{fpc-0.99.14.spec => fpc-0.99.15.spec} (91%) rename install/{fpc-docs-0.99.14.spec => fpc-docs-0.99.15.spec} (91%) diff --git a/api/Makefile b/api/Makefile index 69d7504c13..3d65ece797 100644 --- a/api/Makefile +++ b/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 diff --git a/api/go32v2/Makefile b/api/go32v2/Makefile index a7a88e5e4f..bae7ceb6e0 100644 --- a/api/go32v2/Makefile +++ b/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) diff --git a/api/linux/Makefile b/api/linux/Makefile index b9b619c91d..3a04a328f7 100644 --- a/api/linux/Makefile +++ b/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) diff --git a/api/win32/Makefile b/api/win32/Makefile index 6c6901a17c..d65c4d518c 100644 --- a/api/win32/Makefile +++ b/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) diff --git a/base/Makefile b/base/Makefile index ff8f186852..ce30cde939 100644 --- a/base/Makefile +++ b/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 diff --git a/compiler/Makefile b/compiler/Makefile index 835b83e3e9..ffca3b274f 100644 --- a/compiler/Makefile +++ b/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 diff --git a/compiler/new/Makefile b/compiler/new/Makefile index c56393f020..d9b924fafb 100644 --- a/compiler/new/Makefile +++ b/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 diff --git a/fcl/Makefile b/fcl/Makefile index 711ef7373b..b6453aff16 100644 --- a/fcl/Makefile +++ b/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 diff --git a/fcl/db/Makefile b/fcl/db/Makefile index e1daaa1c87..e0803cbf01 100644 --- a/fcl/db/Makefile +++ b/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) diff --git a/fcl/go32v2/Makefile b/fcl/go32v2/Makefile index ca04632c03..01e1a93bb4 100644 --- a/fcl/go32v2/Makefile +++ b/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 diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile index 08f5ad4dbc..d384a4bde0 100644 --- a/fcl/linux/Makefile +++ b/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 ##################################################################### diff --git a/fcl/linux/Makefile.fpc b/fcl/linux/Makefile.fpc index b84df991bc..8b28948fe6 100644 --- a/fcl/linux/Makefile.fpc +++ b/fcl/linux/Makefile.fpc @@ -4,6 +4,7 @@ [targets] units=classes $(INCUNITS) $(XMLUNITS) $(SHEDITUNITS) process asyncio ssockets +rst=ssockets [defaults] defaulttarget=linux diff --git a/fcl/os2/Makefile b/fcl/os2/Makefile index 3934dee7f4..423c54fa2e 100644 --- a/fcl/os2/Makefile +++ b/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 diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile index 7a82093065..c4a579ee7f 100644 --- a/fcl/shedit/gtk/Makefile +++ b/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) diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile index 1fa0233fc7..1f077ab57c 100644 --- a/fcl/tests/Makefile +++ b/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 diff --git a/fcl/win32/Makefile b/fcl/win32/Makefile index 8612e573ab..2748dbb63a 100644 --- a/fcl/win32/Makefile +++ b/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 diff --git a/ide/Makefile b/ide/Makefile index 5d90ca5a07..c830101983 100644 --- a/ide/Makefile +++ b/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 diff --git a/ide/fake/Makefile b/ide/fake/Makefile index 482de58789..1e2cdd3703 100644 --- a/ide/fake/Makefile +++ b/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 diff --git a/ide/fake/compiler/Makefile b/ide/fake/compiler/Makefile index 1bf25cabcf..e3537a61e9 100644 --- a/ide/fake/compiler/Makefile +++ b/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 diff --git a/ide/fake/gdb/Makefile b/ide/fake/gdb/Makefile index cd7fb8c6f0..0a2cf831b2 100644 --- a/ide/fake/gdb/Makefile +++ b/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 diff --git a/ide/text/Makefile b/ide/text/Makefile index 0e867bffd2..1485d04be5 100644 --- a/ide/text/Makefile +++ b/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) diff --git a/install/demo/Makefile b/install/demo/Makefile index 9174e33876..721a58d8e7 100644 --- a/install/demo/Makefile +++ b/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 diff --git a/install/demo/Makefile.fpc b/install/demo/Makefile.fpc index c15d7d7302..0e4ac1ddfc 100644 --- a/install/demo/Makefile.fpc +++ b/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 - diff --git a/install/demo/graph/Makefile b/install/demo/graph/Makefile index 03ca2bf4b6..deebbc728d 100644 --- a/install/demo/graph/Makefile +++ b/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) diff --git a/install/demo/modex/Makefile b/install/demo/modex/Makefile index 9835928e3f..e6f9885d4e 100644 --- a/install/demo/modex/Makefile +++ b/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) diff --git a/install/demo/text/Makefile b/install/demo/text/Makefile index aa61042eee..2987fc5f8e 100644 --- a/install/demo/text/Makefile +++ b/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) diff --git a/install/demo/win32/Makefile b/install/demo/win32/Makefile index a6fab04dba..c2237e550e 100644 --- a/install/demo/win32/Makefile +++ b/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) diff --git a/install/fpc-0.99.14.spec b/install/fpc-0.99.15.spec similarity index 91% rename from install/fpc-0.99.14.spec rename to install/fpc-0.99.15.spec index 677e81dd97..2623bab387 100644 --- a/install/fpc-0.99.14.spec +++ b/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 (peter@freepascal.org) 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} diff --git a/install/fpc-docs-0.99.14.spec b/install/fpc-docs-0.99.15.spec similarity index 91% rename from install/fpc-docs-0.99.14.spec rename to install/fpc-docs-0.99.15.spec index e7d0c7146f..ebf87a7d13 100644 --- a/install/fpc-docs-0.99.14.spec +++ b/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 (peter@freepascal.org) 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} diff --git a/install/fpinst/Makefile b/install/fpinst/Makefile index 81201468f3..419abc086c 100644 --- a/install/fpinst/Makefile +++ b/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) diff --git a/packages/Makefile b/packages/Makefile index c66092cce4..c96a989b71 100644 --- a/packages/Makefile +++ b/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 diff --git a/packages/cmem/Makefile b/packages/cmem/Makefile index dc5459b636..270a2dcd58 100644 --- a/packages/cmem/Makefile +++ b/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) diff --git a/packages/forms/Makefile b/packages/forms/Makefile index c53f6f0b03..db2f19b46f 100644 --- a/packages/forms/Makefile +++ b/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) diff --git a/packages/forms/demo/Makefile b/packages/forms/demo/Makefile index fbc5085f4b..e269bc3bb7 100644 --- a/packages/forms/demo/Makefile +++ b/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) diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index f5525a129d..0383d0ea46 100644 --- a/packages/gdbint/Makefile +++ b/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) diff --git a/packages/gdbint/libgdb/Makefile b/packages/gdbint/libgdb/Makefile index 804bcc9e4a..f38f8bba6c 100644 --- a/packages/gdbint/libgdb/Makefile +++ b/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 diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 84cf3025a3..f821189ba5 100644 --- a/packages/ggi/Makefile +++ b/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) diff --git a/packages/gtk/Makefile b/packages/gtk/Makefile index b2a547dead..e6aee4a6bf 100644 --- a/packages/gtk/Makefile +++ b/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 diff --git a/packages/gtk/examples/Makefile b/packages/gtk/examples/Makefile index 09b73dead6..cc04aa3fbc 100644 --- a/packages/gtk/examples/Makefile +++ b/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) diff --git a/packages/gtk/tutorial/Makefile b/packages/gtk/tutorial/Makefile index 1ae6781fb8..bf105eaa40 100644 --- a/packages/gtk/tutorial/Makefile +++ b/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) diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index 865101aee0..95c58a43f4 100644 --- a/packages/ibase/Makefile +++ b/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) diff --git a/packages/inet/Makefile b/packages/inet/Makefile index 470c4c7a16..9ed2d59a43 100644 --- a/packages/inet/Makefile +++ b/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) diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index c3d9b00548..ffa4a3a8d2 100644 --- a/packages/mysql/Makefile +++ b/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) diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index 5161a7bbbf..220888ed64 100644 --- a/packages/ncurses/Makefile +++ b/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) diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index 0a6dfe35c3..1e171cce7a 100644 --- a/packages/opengl/Makefile +++ b/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 diff --git a/packages/opengl/build/Makefile b/packages/opengl/build/Makefile index 67eb3b6b61..c674355ee2 100644 --- a/packages/opengl/build/Makefile +++ b/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) diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile index f1c6eebff0..1cd96dc4f6 100644 --- a/packages/opengl/examples/Makefile +++ b/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) diff --git a/packages/opengl/linux/Makefile b/packages/opengl/linux/Makefile index cbaff30217..b323e050d4 100644 --- a/packages/opengl/linux/Makefile +++ b/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 diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index e3e032830d..d216aaadb1 100644 --- a/packages/paszlib/Makefile +++ b/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) diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index 0660e357a9..b520ef6a8d 100644 --- a/packages/postgres/Makefile +++ b/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) diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile index 10263273e3..ce455a2155 100644 --- a/packages/regexpr/Makefile +++ b/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) diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index 08e3be3aa4..644bc4ede7 100644 --- a/packages/svgalib/Makefile +++ b/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) diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index d56338d958..d54ded0343 100644 --- a/packages/syslog/Makefile +++ b/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) diff --git a/packages/uncgi/Makefile b/packages/uncgi/Makefile index e088b9bcf7..24fe0773fb 100644 --- a/packages/uncgi/Makefile +++ b/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) diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index 156b2587fa..08a94f07af 100644 --- a/packages/utmp/Makefile +++ b/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) diff --git a/packages/x11/Makefile b/packages/x11/Makefile index aad36704da..bf7a0701ea 100644 --- a/packages/x11/Makefile +++ b/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 diff --git a/packages/zip/Makefile b/packages/zip/Makefile index e76080493a..0066febf4b 100644 --- a/packages/zip/Makefile +++ b/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 diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index f02108b9df..d18137ea08 100644 --- a/packages/zlib/Makefile +++ b/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 diff --git a/rtl/Makefile b/rtl/Makefile index 3e7c1032db..d4ddef7ef9 100644 --- a/rtl/Makefile +++ b/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 diff --git a/rtl/go32v1/Makefile b/rtl/go32v1/Makefile index 46fc77067d..800637da61 100644 --- a/rtl/go32v1/Makefile +++ b/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 diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index aad417fe6c..8bc2437e95 100644 --- a/rtl/go32v2/Makefile +++ b/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 diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 2d385c5f6e..9a8310b125 100644 --- a/rtl/linux/Makefile +++ b/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 diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index c6d711a232..50440c16a7 100644 --- a/rtl/os2/Makefile +++ b/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 diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 31c3f8b7be..19db72d030 100644 --- a/rtl/win32/Makefile +++ b/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 diff --git a/tests/Makefile b/tests/Makefile index aa27dc48f6..5903f2a6ad 100644 --- a/tests/Makefile +++ b/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 diff --git a/utils/Makefile b/utils/Makefile index baa96812dc..ef3d721cf8 100644 --- a/utils/Makefile +++ b/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) diff --git a/utils/fpcmake.inc b/utils/fpcmake.inc index 1e32e2f3b6..cc970479a7 100644 --- a/utils/fpcmake.inc +++ b/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 diff --git a/utils/fpcmake.ini b/utils/fpcmake.ini index 4be488c8e0..4a3f167491 100644 --- a/utils/fpcmake.ini +++ b/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) diff --git a/utils/fpcmake.pp b/utils/fpcmake.pp index 3a67671a93..68db8f87a6 100644 --- a/utils/fpcmake.pp +++ b/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 diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index 084ce2e0b2..b556f6faad 100644 --- a/utils/fprcp/Makefile +++ b/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) diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index a8a3344bb5..883cada337 100644 --- a/utils/h2pas/Makefile +++ b/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) diff --git a/utils/simulator/Makefile b/utils/simulator/Makefile index 16d0c3b218..856c89db32 100644 --- a/utils/simulator/Makefile +++ b/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) diff --git a/utils/tply/Makefile b/utils/tply/Makefile index 7b4c9faad3..920de55343 100644 --- a/utils/tply/Makefile +++ b/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)