From f1b0c333cbeae693be1980728f81c56d98b28951 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 16 Mar 1999 00:46:54 +0000 Subject: [PATCH] * makefile.fpc targets start with fpc_ * small updates for install scripts --- base/Makefile | 115 ++++++++++++++++++++++------------- base/makefile.fpc | 79 ++++++++++++------------ compiler/Makefile | 52 ++++++++-------- ide/text/Makefile | 42 +++++++++++-- install/debian/README.debian | 13 +++- install/debian/copyright | 2 +- install/debian/postinst | 4 +- install/debian/rules | 11 ++-- install/fpinst/install.lin | 11 ++-- install/fpinst/install.w32 | 2 +- install/makecfg | 17 +++--- rtl/go32v2/Makefile | 47 +++++++++++--- rtl/linux/Makefile | 38 +++++++++++- rtl/win32/Makefile | 47 ++++++++++---- 14 files changed, 322 insertions(+), 158 deletions(-) diff --git a/base/Makefile b/base/Makefile index 71c720541a..c57845cb45 100644 --- a/base/Makefile +++ b/base/Makefile @@ -43,36 +43,10 @@ endif ##################################################################### RELEASE=1 -NODEFAULTRULES=1 ##################################################################### -# Include default makefile -##################################################################### - -ifndef FPCMAKE -ifdef FPCDIR -FPCMAKE=$(FPCDIR)/makefile.fpc -else -FPCMAKE=makefile.fpc -endif -endif - -override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) -ifeq ($(FPCMAKE),) -nofpcmake: - @echo - @echo makefile.fpc not found! - @echo Check the FPCMAKE and FPCDIR environment variables. - @echo - @exit -else -include $(FPCMAKE) -endif - - -##################################################################### -# Dependencies +# Main targets ##################################################################### .PHONY: all clean install staticinstall sharedinstall \ @@ -94,6 +68,69 @@ info: @echo example: make api_staticinstall @exit +all: $(addsuffix _all,$(MODULES)) + +clean: $(addsuffix _clean,$(MODULES)) + +install: $(addsuffix _install,$(MODULES)) + +staticinstall: $(addsuffix _staticinstall,$(MODULES)) + +sharedinstall: $(addsuffix _sharedinstall,$(MODULES)) + + +##################################################################### +# Include default makefile +##################################################################### + +# test if FPCMAKE is still valid +ifndef FPCMAKE +ifdef FPCDIR +FPCMAKE=$(FPCDIR)/makefile.fpc +endif +endif +ifdef FPCMAKE +ifeq ($(strip $(wildcard $(FPCMAKE))),) +FPCDIR= +FPCMAKE= +endif +endif + +ifndef FPCDIR +ifdef DEFAULTFPCDIR +FPCDIR=$(DEFAULTFPCDIR) +endif +endif + +ifndef FPCMAKE +ifdef FPCDIR +FPCMAKE=$(FPCDIR)/makefile.fpc +else +FPCMAKE=makefile.fpc +endif +endif + +override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) +ifndef FPCMAKE +testfpcmake: + @echo makefile.fpc not found! + @echo Check the FPCMAKE and FPCDIR environment variables. + @stopnow +ifndef NODEFAULTALL +all: testfpcmake +endif +install: testfpcmake +clean: testfpcmake +else +include $(FPCMAKE) +testfpcmake: +endif + + +##################################################################### +# Dependencies +##################################################################### + ####################################### # Compiler ####################################### @@ -107,6 +144,9 @@ compiler_clean: compiler_install: $(MAKE) -C compiler install +compiler_installlib: + $(MAKE) -C compiler installlib + compiler_staticinstall: compiler_sharedinstall: @@ -243,21 +283,6 @@ ide_sharedinstall: $(MAKE) -C $(IDEDIR) sharedlibinstall -####################################### -# Common targets all,install,clean -####################################### - -all: $(addsuffix _all,$(MODULES)) - -clean: $(addsuffix _clean,$(MODULES)) - -install: $(addsuffix _install,$(MODULES)) - -staticinstall: $(addsuffix _staticinstall,$(MODULES)) - -sharedinstall: $(addsuffix _sharedinstall,$(MODULES)) - - ####################################### # Packaging targets ####################################### @@ -295,7 +320,11 @@ compilerzip: #compiler_clean rtl_clean # # $Log$ -# Revision 1.7 1999-03-09 01:35:46 peter +# Revision 1.8 1999-03-16 00:46:54 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.7 1999/03/09 01:35:46 peter # * makefile.fpc updates and defaultfpcdir var # # diff --git a/base/makefile.fpc b/base/makefile.fpc index bcb99d4b38..28087f578d 100644 --- a/base/makefile.fpc +++ b/base/makefile.fpc @@ -661,8 +661,6 @@ export BASEINSTALLDIR PACKAGESUFFIX # General compile rules ##################################################################### -ifndef NODEFAULTRULES - # Create Filenames LOADEROFILES=$(addsuffix $(OEXT),$(LOADEROBJECTS)) EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS)) @@ -670,9 +668,11 @@ EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS)) UNITFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS)) UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS)) -.PHONY : all fpc_clean install \ - fpc_libsclean staticlibinstall sharedlibinstall libinstall \ - info cfginfo objectinfo installinfo filesinfo +.PHONY : fpc_all fpc_units fpc_loaders fpc_exes \ + fpc_staticlib fpc_sharedlib \ + fpc_clean fpc_libsclean fpc_cleanall \ + fpc_install fpc_staticlibinstall fpc_sharedlibinstall fpc_libinstall \ + fpc_info fpc_cfginfo fpc_objectinfo fpc_installinfo fpc_filesinfo .SUFFIXES : $(EXEEXT) $(PPUEXT) $(PASEXT) $(OEXT) @@ -681,19 +681,17 @@ UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS)) # Default ##################################################################### -ifndef NODEFAULTALL ifdef DEFAULTUNITS -all: loaders units +fpc_all: fpc_loaders fpc_units else -all: loaders units exes -endif +fpc_all: fpc_loaders fpc_units fpc_exes endif -loaders: $(LOADEROFILES) +fpc_loaders: $(LOADEROFILES) -units: $(UNITFILES) +fpc_units: $(UNITFILES) -exes: $(EXEFILES) +fpc_exes: $(EXEFILES) # General compile rules %$(PPUEXT): %$(PASEXT) @@ -712,12 +710,12 @@ exes: $(EXEFILES) # Library ##################################################################### -staticlib: +fpc_staticlib: $(MAKE) libsclean $(MAKE) all SMARTLINK=YES LIBTYPE=static -sharedlib: +fpc_sharedlib: ifdef inlinux $(MAKE) libsclean $(MAKE) all LIBTYPE=shared @@ -730,7 +728,7 @@ endif # Install rules ##################################################################### -standardinstall : all +fpc_install : all ifndef DEFAULTUNITS ifdef EXEOBJECTS $(MKDIR) $(BININSTALLDIR) @@ -755,10 +753,6 @@ else endif endif -ifndef NODEFAULTINSTALL -install: standardinstall $(EXTRAINSTALL) -endif - # Target for the sharedlib install which is not avail for all targets SHAREDINSTALL=sharedlibinstall ifeq ($(OS_TARGET),go32v1) @@ -768,21 +762,20 @@ ifeq ($(OS_TARGET),go32v2) SHAREDINSTALL= endif -staticlibinstall: staticlib +fpc_staticlibinstall: staticlib $(MKDIR) $(STATIC_UNITINSTALLDIR) $(INSTALL) $(UNITFILES) $(STATIC_UNITINSTALLDIR) $(MKDIR) $(STATIC_LIBINSTALLDIR) $(INSTALLEXE) *$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR) - -sharedlibinstall: sharedlib +fpc_sharedlibinstall: sharedlib $(MKDIR) $(SHARED_UNITINSTALLDIR) $(INSTALL) $(UNITFILES) $(SHARED_UNITINSTALLDIR) $(MKDIR) $(SHARED_LIBINSTALLDIR) $(INSTALLEXE) *$(SHAREDLIBEXT) $(SHARED_LIBINSTALLDIR) -libinstall: staticlibinstall $(SHAREDINSTALL) +fpc_libinstall: staticlibinstall $(SHAREDINSTALL) ##################################################################### @@ -810,7 +803,7 @@ ZIPTARGET=install endif # Note: This will not remove the zipfile first -zipinstalladd: +fpc_zipinstalladd: ifndef ZIPNAME @$(ECHO) Please specify ZIPNAME! @exit @@ -823,13 +816,13 @@ else endif # This will remove the zipfile -zipinstalldel: +fpc_zipinstalldel: ifdef ZIPNAME $(DEL) $(PACKAGEDIR)/$(ZIPNAME) endif # First remove the zip and then install -zipinstall: zipinstalldel zipinstalladd +fpc_zipinstall: fpc_zipinstalldel fpc_zipinstalladd ##################################################################### @@ -847,19 +840,23 @@ endif ifdef LOADEROBJECTS -$(DEL) $(LOADEROFILES) endif -ifdef EXTRACLEAN - -$(DEL) $(EXTRACLEAN) -endif -fpc_libsclean : clean +fpc_libsclean: clean -$(DEL) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) +fpc_cleanall: +ifdef EXEOBJECTS + -$(DEL) $(EXEFILES) +endif + -$(DEL) *$(OEXT) *$(PPUEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) + -$(DELTREE) *$(SMARTEXT) + ##################################################################### # Depend rules ##################################################################### -depend: +fpc_depend: makedep $(UNITOBJECTS) @@ -867,9 +864,9 @@ depend: # Info rules ##################################################################### -info: cfginfo objectinfo toolsinfo installinfo +fpc_info: fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installinfo -cfginfo: +fpc_cfginfo: @$(ECHO) @$(ECHO) == Configuration info == @$(ECHO) @@ -881,7 +878,7 @@ cfginfo: @$(ECHO) Basedir... $(BASEDIR) @$(ECHO) -toolsinfo: +fpc_toolsinfo: @$(ECHO) @$(ECHO) == Tools info == @$(ECHO) @@ -907,7 +904,7 @@ ifdef UPX endif @$(ECHO) -objectinfo: +fpc_objectinfo: @$(ECHO) @$(ECHO) == Object info == @$(ECHO) @@ -916,7 +913,7 @@ objectinfo: @$(ECHO) ExeObjects.... $(EXEOBJECTS) @$(ECHO) -installinfo: +fpc_installinfo: @$(ECHO) @$(ECHO) == Install info == @$(ECHO) @@ -942,7 +939,7 @@ INCFILES:=$(wildcard *.inc) MSGFILES:=$(wildcard *.msg) ASFILES:=$(wildcard *.as) -filesinfo: +fpc_filesinfo: @$(ECHO) @$(ECHO) == Files info == @$(ECHO) @@ -962,11 +959,13 @@ ifdef ASFILES @$(ECHO) As files are $(ASFILES) endif -endif #NODEFAULTRULES - # # $Log$ -# Revision 1.10 1999-03-12 21:01:30 michael +# Revision 1.11 1999-03-16 00:46:55 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.10 1999/03/12 21:01:30 michael # + Changed clean and libsclean to fpc_target # # Revision 1.9 1999/03/11 17:54:00 peter diff --git a/compiler/Makefile b/compiler/Makefile index 749b2093ca..28e51d57af 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -57,16 +57,24 @@ override LOCALOPT+=$(LOCALDEF) ##################################################################### -# Override default makefile settings +# Common targets ##################################################################### -NODEFAULTALL=1 -NODEFAULTCLEAN=1 +.PHONY: all clean install info \ + staticlib sharedlib \ + staticinstall sharedinstall libinstall \ -# Change the default target to our local all target -first: all +info: testfpcmake fpc_info -EXTRAINSTALL=myinstall +staticlib: testfpcmake fpc_staticlib + +sharedlib: testfpcmake fpc_sharedlib + +staticinstall: testfpcmake fpc_staticinstall + +sharedinstall: testfpcmake fpc_sharedinstall + +libinstall: testfpcmake fpc_libinstall ##################################################################### @@ -74,11 +82,6 @@ EXTRAINSTALL=myinstall ##################################################################### # test if FPCMAKE is still valid -ifndef FPCMAKE -ifdef FPCDIR -FPCMAKE=$(FPCDIR)/makefile.fpc -endif -endif ifdef FPCMAKE ifeq ($(strip $(wildcard $(FPCMAKE))),) FPCDIR= @@ -101,16 +104,11 @@ endif endif override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) -ifndef FPCMAKE +ifeq ($(FPCMAKE),) testfpcmake: @echo makefile.fpc not found! @echo Check the FPCMAKE and FPCDIR environment variables. - @stopnow -ifndef NODEFAULTALL -all: testfpcmake -endif -install: testfpcmake -clean: testfpcmake + @exit else include $(FPCMAKE) testfpcmake: @@ -217,9 +215,7 @@ next : $(MAKE) all endif -clean : testfpcmake fpc_clean - -$(DEL) *$(OEXT) *$(PPUEXT) *$(ASMEXT) *$(STATICLIBEXT) $(EXENAME) - -$(DELTREE) $(SMARTEXT) +clean : testfpcmake execlean fpc_cleanall execlean : -$(DEL) $(EXENAME) @@ -297,10 +293,10 @@ cycle: testfpcmake $(MAKE) remake3 $(MAKE) echotime -cycledep: +cycledep: testfpcmake $(MAKE) cycle USEDEPEND=1 -cvstest: +cvstest: testfpcmake $(MAKE) cycle 'LOCALOPT=-n -Se' 'RTLOPTS=-n -Se' @@ -309,7 +305,7 @@ cvstest: ##################################################################### # This will only install the ppc386.exe, not the message files etc. -quickinstall: +quickinstall: testfpcmake ifdef inlinux $(MKDIR) $(LIBINSTALLDIR) $(INSTALLEXE) $(EXENAME) $(LIBINSTALLDIR) @@ -330,7 +326,7 @@ endif $(INSTALL) errore.msg errorn.msg $(MSGINSTALLDIR) # this also installs the link /usr/bin/ppc386. The .deb does that later -myinstall: installlib +install: testfpcmake installlib ifdef inlinux $(MKDIR) $(BININSTALLDIR) ln -sf $(LIBINSTALLDIR)/ppc386 $(BININSTALLDIR)/ppc386 @@ -374,7 +370,11 @@ $(M68KEXENAME): $(PASFILES) $(INCFILES) # # $Log$ -# Revision 1.21 1999-03-12 17:24:43 michael +# Revision 1.22 1999-03-16 00:46:56 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.21 1999/03/12 17:24:43 michael # + Fixed clean target # # Revision 1.20 1999/03/11 17:54:01 peter diff --git a/ide/text/Makefile b/ide/text/Makefile index 45f0f36eb0..8572c81b2f 100644 --- a/ide/text/Makefile +++ b/ide/text/Makefile @@ -43,8 +43,6 @@ else override NEEDUNITDIR+=../fake/gdb endif -EXTRAINSTALL=myinstall - ##################################################################### # Real targets @@ -54,6 +52,31 @@ UNITOBJECTS= EXEOBJECTS=fp +##################################################################### +# Common targets +##################################################################### + +.PHONY: all clean install info \ + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + +all: testfpcmake fpc_all + +info: testfpcmake fpc_info + +staticlib: testfpcmake fpc_staticlib + +sharedlib: testfpcmake fpc_sharedlib + +libsclean: testfpcmake fpc_libsclean + +staticinstall: testfpcmake fpc_staticinstall + +sharedinstall: testfpcmake fpc_sharedinstall + +libinstall: testfpcmake fpc_libinstall + + ##################################################################### # Include default makefile ##################################################################### @@ -82,12 +105,13 @@ endif override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) ifeq ($(FPCMAKE),) -nofpcmake: +testfpcmake: @echo makefile.fpc not found! @echo Check the FPCMAKE and FPCDIR environment variables. @exit else include $(FPCMAKE) +testfpcmake: endif @@ -110,10 +134,14 @@ full: fullgdb: make all FULL=1 GDB=1 +# This is necessary because we don't have all units separate in the +# units targets +clean : testfpcmake fpc_cleanall + # # Installation # -myinstall: +install: fpc_install $(INSTALL) $(wildcard *.pt) $(wildcard *.tdf) $(BININSTALLDIR) # @@ -124,7 +152,11 @@ clean_compiler: # # $Log$ -# Revision 1.13 1999-03-09 01:35:52 peter +# Revision 1.14 1999-03-16 00:47:00 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.13 1999/03/09 01:35:52 peter # * makefile.fpc updates and defaultfpcdir var # # diff --git a/install/debian/README.debian b/install/debian/README.debian index 7fb77e5e6b..d1022012e5 100644 --- a/install/debian/README.debian +++ b/install/debian/README.debian @@ -1,6 +1,15 @@ Free Pascal for DEBIAN ---------------------- -The home page is http://tfdec1.fys.kuleuven.ac.be/~michael/fpc/ +The Original site is + http://www.freepascal.org/ + +Mirrored at + http://freepascal.zeuswpi.org/ + http://gd.tuwien.ac.at/languages/pascal/fpc/www/ + http://www.brain.uni-freiburg.de/~klaus/fpc/ + http://www.atlasz.com/freepascal/ + http://deadlock.et.tudelft.nl/~fpc/ + http://www.freepascal.sk/ -Peter Vreman , Tue, 20 Nov 1998 12:00:00 +0200 +Peter Vreman , Tue, 20 Mar 1999 12:00:00 +0200 diff --git a/install/debian/copyright b/install/debian/copyright index 0da75ae9d3..f20172a947 100644 --- a/install/debian/copyright +++ b/install/debian/copyright @@ -2,7 +2,7 @@ The package was originally put together by: Peter Vreman From sources obtained from: - tflily.fys.kuleuven.ac.be/pub/fpc/dist/linux/fpc-0.99.10.tar.gz + ftp://tflily.fys.kuleuven.ac.be/pub/fpc/dist/linux/fpc-0.99.10.tar.gz This program is free software; you can redistribute it and/or modify diff --git a/install/debian/postinst b/install/debian/postinst index 1a941c9488..34595f7aa2 100644 --- a/install/debian/postinst +++ b/install/debian/postinst @@ -1,10 +1,10 @@ #! /bin/sh # create link -ln -sf /usr/lib/fpc/0.99.10/ppc386 /usr/bin/ppc386 +ln -sf /usr/lib/fpc/0.99.11/ppc386 /usr/bin/ppc386 # create /etc/ppc386.cfg -/usr/lib/fpc/0.99.10/samplecfg /usr/lib/fpc/0.99.10 `dirname \`find /usr/lib/gcc-lib/ -name libgcc.a -print | grep -v egcs \`` +/usr/lib/fpc/0.99.11/samplecfg /usr/lib/fpc/0.99.11 `dirname \`find /usr/lib/gcc-lib/ -name libgcc.a -print | grep -v egcs \`` # update ld.so cache ldconfig diff --git a/install/debian/rules b/install/debian/rules index 6878956b4a..fe78b58c30 100644 --- a/install/debian/rules +++ b/install/debian/rules @@ -9,8 +9,9 @@ build-stamp: dh_testdir # Add here commands to compile the package. - $(MAKE) - + $(MAKE) compiler_all + $(MAKE) rtl_all + touch build-stamp clean: @@ -19,7 +20,8 @@ clean: rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + $(MAKE) compiler_clean + $(MAKE) rtl_clean dh_clean @@ -36,7 +38,8 @@ binary-arch: build dh_installdirs # Add here commands to install the files into debian/tmp - $(MAKE) PREFIXINSTALLDIR=`pwd`/debian/tmp/usr install + $(MAKE) compiler_installlib PREFIXINSTALLDIR=`pwd`/debian/tmp/usr + $(MAKE) rtl_install PREFIXINSTALLDIR=`pwd`/debian/tmp/usr # dh_installdocs TODO NEWS AUTHORS KNOWNBUGS README README.guile dh_installexamples diff --git a/install/fpinst/install.lin b/install/fpinst/install.lin index 4ff558836f..88d4265020 100644 --- a/install/fpinst/install.lin +++ b/install/fpinst/install.lin @@ -140,14 +140,17 @@ defaultcfg= # searchpath for units (does the same as -Up) # For statically, smartlinked units #IFDEF FPC_LINK_STATIC - -Fu$1/linuxunits/static +-Fu\$1/rtl/static +-Fu\$1/units/static #ENDIF # For Dynamically linked units #IFDEF FPC_LINK_DYNAMIC - -Fu$1/linuxunits/shared +-Fu\$1/rtl/shared +-Fu\$1/units/shared #ENDIF # For normal units --Fu$1/linuxunits +-Fu\$1/rtl +-Fu\$1/units #-Fu~/pp/units;~/pp/rtl/linux #-Fu/usr/lib/ppc/units;/usr/lib/ppc/linuxunits @@ -167,7 +170,7 @@ defaultcfg= #-k-s # Always strip debuginfo from the executable -#-Xs +-Xs # ------------- diff --git a/install/fpinst/install.w32 b/install/fpinst/install.w32 index 80353a04d7..1824d6ae51 100644 --- a/install/fpinst/install.w32 +++ b/install/fpinst/install.w32 @@ -177,7 +177,7 @@ defaultcfg= #-k-s # Always strip debuginfo from the executable -#-Xs +-Xs # ------------- diff --git a/install/makecfg b/install/makecfg index 5113907fad..3839068427 100644 --- a/install/makecfg +++ b/install/makecfg @@ -38,7 +38,7 @@ fi echo Writing sample configuration file to /etc/ppc386.cfg cat < /etc/ppc386.cfg # -# Example ppc386.cfg for Free Pascal Compiler Version 0.99.10 +# Example ppc386.cfg for Free Pascal Compiler Version 0.99.11 # # ---------------------- @@ -143,8 +143,8 @@ cat < /etc/ppc386.cfg # path to the messagefile, not necessary anymore but can be used to override # the default language -#-Fr\$2/msg/errore.msg -#-Fr\$2/msg/errorn.msg +#-Fr\$1/msg/errore.msg +#-Fr\$1/msg/errorn.msg # path to the gcclib -Fg\$2 @@ -155,14 +155,17 @@ cat < /etc/ppc386.cfg # searchpath for units (does the same as -Up) # For statically, smartlinked units #IFDEF FPC_LINK_STATIC --Fu\$1/staticunits +-Fu\$1/rtl/static +-Fu\$1/units/static #ENDIF # For Dynamically linked units #IFDEF FPC_LINK_DYNAMIC --Fu\$1/sharedunits +-Fu\$1/rtl/shared +-Fu\$1/units/shared #ENDIF # For normal units --Fu\$1/linuxunits +-Fu\$1/rtl +-Fu\$1/units #-Fu/pp/units;/pp/rtl/dos/go32v2 #-Fu/usr/lib/ppc/units;/usr/lib/ppc/linuxunits @@ -183,7 +186,7 @@ cat < /etc/ppc386.cfg #-k-s # Always strip debuginfo from the executable -#-Xs +-Xs # ------------- diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 10e59474fc..dc5fe45dd5 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -63,6 +63,35 @@ UNITOBJECTS=$(SYSTEMUNIT) strings go32 initc \ msmouse graph +##################################################################### +# Common targets +##################################################################### + +.PHONY: all clean install info \ + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + +all: testfpcmake fpc_all + +clean: testfpcmake fpc_clean + +install: testfpcmake fpc_install + +info: testfpcmake fpc_info + +staticlib: testfpcmake fpc_staticlib + +sharedlib: testfpcmake fpc_sharedlib + +libsclean: testfpcmake fpc_libsclean + +staticinstall: testfpcmake fpc_staticinstall + +sharedinstall: testfpcmake fpc_sharedinstall + +libinstall: testfpcmake fpc_libinstall + + ##################################################################### # Include default makefile ##################################################################### @@ -91,12 +120,13 @@ endif override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) ifeq ($(FPCMAKE),) -nofpcmake: +testfpcmake: @echo makefile.fpc not found! @echo Check the FPCMAKE and FPCDIR environment variables. @exit else include $(FPCMAKE) +testfpcmake: endif @@ -202,16 +232,13 @@ graph$(PPUEXT) : graph.pp go32$(PPUEXT) $(SYSTEMPPU) mmx$(PPUEXT) \ $(wildcard $(PPI)/*.ppi) $(COMPILER) -I$(PPI) graph.pp $(REDIR) -####################################################################### -# Clean targets -####################################################################### - -clean: fpc_clean - -libsclean: fpc_libsclean - +# # $Log$ -# Revision 1.10 1999-03-12 21:04:45 michael +# Revision 1.11 1999-03-16 00:47:08 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.10 1999/03/12 21:04:45 michael # + clean and libsclean added # # Revision 1.9 1999/03/09 01:35:54 peter diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index fa2a470c23..ce62386e99 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -72,6 +72,35 @@ UNITOBJECTS=$(SYSTEMUNIT) strings linux \ errors sockets ipc graph +##################################################################### +# Common targets +##################################################################### + +.PHONY: all clean install info \ + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + +all: testfpcmake fpc_all + +clean: testfpcmake fpc_clean + +install: testfpcmake fpc_install + +info: testfpcmake fpc_info + +staticlib: testfpcmake fpc_staticlib + +sharedlib: testfpcmake fpc_sharedlib + +libsclean: testfpcmake fpc_libsclean + +staticinstall: testfpcmake fpc_staticinstall + +sharedinstall: testfpcmake fpc_sharedinstall + +libinstall: testfpcmake fpc_libinstall + + ##################################################################### # Include default makefile ##################################################################### @@ -100,12 +129,13 @@ endif override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) ifeq ($(FPCMAKE),) -nofpcmake: +testfpcmake: @echo makefile.fpc not found! @echo Check the FPCMAKE and FPCDIR environment variables. @exit else include $(FPCMAKE) +testfpcmake: endif @@ -221,7 +251,11 @@ libsclean: fpc_libsclean # # $Log$ -# Revision 1.16 1999-03-12 21:07:51 michael +# Revision 1.17 1999-03-16 00:47:09 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.16 1999/03/12 21:07:51 michael # + clean and libsclean added # # Revision 1.15 1999/03/09 01:35:55 peter diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index b6ef85b646..bb82b9d53a 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -67,6 +67,35 @@ WINDOWS_FILES=base errors defines \ WINDOWS_SOURCE_FILES=$(addsuffix .pp,$(WINDOWS_FILES)) +##################################################################### +# Common targets +##################################################################### + +.PHONY: all clean install info \ + staticlib sharedlib libsclean \ + staticinstall sharedinstall libinstall \ + +all: testfpcmake fpc_all + +clean: testfpcmake fpc_clean + +install: testfpcmake fpc_install + +info: testfpcmake fpc_info + +staticlib: testfpcmake fpc_staticlib + +sharedlib: testfpcmake fpc_sharedlib + +libsclean: testfpcmake fpc_libsclean + +staticinstall: testfpcmake fpc_staticinstall + +sharedinstall: testfpcmake fpc_sharedinstall + +libinstall: testfpcmake fpc_libinstall + + ##################################################################### # Include default makefile ##################################################################### @@ -95,12 +124,13 @@ endif override FPCMAKE:=$(strip $(wildcard $(FPCMAKE))) ifeq ($(FPCMAKE),) -nofpcmake: +testfpcmake: @echo makefile.fpc not found! @echo Check the FPCMAKE and FPCDIR environment variables. @exit else include $(FPCMAKE) +testfpcmake: endif @@ -326,18 +356,13 @@ unidef.pp : unifun.pp unidef.sed sed -f unidef.sed unifun.pp > unidef.pp endif -####################################################################### -# CLEAN targets -####################################################################### - -clean: fpc_clean - -libsclean: fpc_libsclean - - # # $Log$ -# Revision 1.22 1999-03-12 21:02:19 michael +# Revision 1.23 1999-03-16 00:47:10 peter +# * makefile.fpc targets start with fpc_ +# * small updates for install scripts +# +# Revision 1.22 1999/03/12 21:02:19 michael # + clean and libsclean added # # Revision 1.21 1999/03/10 23:45:21 peter