From 455a3472031948aef4b47b3256a21aa3c19d01ae Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 16 May 1999 02:37:29 +0000 Subject: [PATCH] + fpc_showinstallfiles to show which files will be added to the system --- base/Makefile | 16 ++++++++++++---- base/makefile.fpc | 21 +++++++++++++++++++-- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/base/Makefile b/base/Makefile index 306824ee3e..115e27c798 100644 --- a/base/Makefile +++ b/base/Makefile @@ -16,14 +16,14 @@ # Config ##################################################################### -MODULES=rtl compiler utils api fv gdb ide +MODULES=rtl compiler utils fcl gtk api fv gdb ide ifndef RTLDIR RTLDIR=rtl endif ifndef COMPILERDIR -COMPILERDIR=utils +COMPILERDIR=compiler endif ifndef UTILSDIR @@ -75,7 +75,9 @@ RELEASE=1 $(addsuffix _install,$(MODULES)) \ $(addsuffix _staticinstall,$(MODULES)) \ $(addsuffix _sharedinstall,$(MODULES))\ - ide_allzip ide_gdbzip ide_fullzip ide_fullgdbzip + compiler_cycle \ + idezips ide_allzip ide_gdbzip ide_fullzip ide_fullgdbzip \ + fclzip gtkzip fvzip compilerzip utilszip info: @echo @@ -178,6 +180,9 @@ rtl_sharedinstall: # Compiler ####################################### +compiler_cycle: + $(MAKE) -C $(COMPILERDIR) cycle + compiler_all: rtl_all $(MAKE) -C $(COMPILERDIR) all @@ -423,7 +428,10 @@ utilszip: utils_clean rtl_clean # # $Log$ -# Revision 1.15 1999-05-12 16:17:06 peter +# Revision 1.16 1999-05-16 02:37:29 peter +# + fpc_showinstallfiles to show which files will be added to the system +# +# Revision 1.15 1999/05/12 16:17:06 peter # + utils_X targets # * missing export of prefixinstalldir # diff --git a/base/makefile.fpc b/base/makefile.fpc index ea71d7394a..4a66eb7911 100644 --- a/base/makefile.fpc +++ b/base/makefile.fpc @@ -238,7 +238,7 @@ ECHO=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO=echo else -export ECHO:=$(firstword $(ECHO)) +export ECHO:=@$(firstword $(ECHO)) endif endif @@ -748,6 +748,20 @@ endif # Install rules ##################################################################### +fpc_showinstallfiles : all +ifndef DEFAULTUNITS +ifdef EXEOBJECTS + $(ECHO) $(addprefix "\n"$(BININSTALLDIR)/,$(EXEFILES)) +endif +endif +ifdef LOADEROBJECTS + $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)) +endif +ifdef UNITOBJECTS + $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(UNITFILES)) + $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(UNITOFILES)) +endif + fpc_install : all ifndef DEFAULTUNITS ifdef EXEOBJECTS @@ -1019,7 +1033,10 @@ endif # # $Log$ -# Revision 1.26 1999-05-14 22:46:21 peter +# Revision 1.27 1999-05-16 02:37:30 peter +# + fpc_showinstallfiles to show which files will be added to the system +# +# Revision 1.26 1999/05/14 22:46:21 peter # * patch for comments in ld.so.conf # # Revision 1.25 1999/05/12 16:17:07 peter