paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 08:09:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

* merged

Browse Source
This commit is contained in:
peter 1999-07-17 11:30:23 +00:00
parent a877a98f38
commit c8dddab319
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
base/makefile.fpc
View File

@ -738,15 +738,6 @@ endif
# Install rules # Install rules
##################################################################### #####################################################################
# Create UnitInstallFiles
override UNITINSTALLFILES=$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))
ifdef EXTRAINSTALLUNITS
override EXTRAINSTALLFILES+=$(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS)))
ifneq ($(EXTRAINSTALLFILES),)
override UNITINSTALLFILES+=$(EXTRAINSTALLFILES)
endif
endif
fpc_showinstallfiles : all fpc_showinstallfiles : all
ifndef DEFAULTUNITS ifndef DEFAULTUNITS
ifdef EXEOBJECTS ifdef EXEOBJECTS
@ -756,12 +747,18 @@ endif
ifdef LOADEROBJECTS ifdef LOADEROBJECTS
$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)) $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
endif endif
# Show Units if unitobjects or extrainstallunits is set ifdef UNITOBJECTS
ifneq ($(UNITINSTALLFILES),) $(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES)))
$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(UNITINSTALLFILES)) endif
ifdef EXTRAINSTALLUNITS
$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))))
endif endif
fpc_install : all fpc_install : all
# Create UnitInstallFiles
ifdef EXTRAINSTALLUNITS
override EXTRAINSTALLFILES=$(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS)))
endif
ifndef DEFAULTUNITS ifndef DEFAULTUNITS
ifdef EXEOBJECTS ifdef EXEOBJECTS
$(MKDIR) $(BININSTALLDIR) $(MKDIR) $(BININSTALLDIR)
@ -776,11 +773,15 @@ ifdef LOADEROBJECTS
$(MKDIR) $(UNITINSTALLDIR) $(MKDIR) $(UNITINSTALLDIR)
$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR) $(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
endif endif
# Install Units if unitobjects or extrainstallunits is set ifdef UNITOBJECTS
ifneq ($(UNITINSTALLFILES),)
$(MKDIR) $(UNITINSTALLDIR) $(MKDIR) $(UNITINSTALLDIR)
$(INSTALL) $(UNITINSTALLFILES) $(UNITINSTALLDIR) $(INSTALL) $(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES)) $(UNITINSTALLDIR)
endif endif
ifdef EXTRAINSTALLUNITS
$(MKDIR) $(UNITINSTALLDIR)
$(INSTALL) $(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))) $(UNITINSTALLDIR)
endif
# Target for the sharedlib install which is not avail for all targets # Target for the sharedlib install which is not avail for all targets
ifdef inlinux ifdef inlinux
@ -873,15 +874,6 @@ endif
# Clean rules # Clean rules
##################################################################### #####################################################################
# Create UnitCleanFiles
override UNITCLEANFILES=$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))
ifdef EXTRACLEANUNITS
override EXTRACLEANFILES=$(wildcard $(addsuffix $(OEXT),$(EXTRACLEANUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRACLEANUNITS)) $(addsuffix $(PPUEXT),$(EXTRACLEANUNITS)))
ifneq ($(EXTRACLEANFILES),)
override UNITCLEANFILES+=$(EXTRACLEANFILES)
endif
endif
fpc_clean: fpc_clean:
ifdef EXEOBJECTS ifdef EXEOBJECTS
-$(DEL) $(EXEFILES) $(EXEOFILES) -$(DEL) $(EXEFILES) $(EXEOFILES)
@ -889,9 +881,11 @@ endif
ifdef LOADEROBJECTS ifdef LOADEROBJECTS
-$(DEL) $(LOADEROFILES) -$(DEL) $(LOADEROFILES)
endif endif
# Clean Units if unitobjects or extrainstallunits is set ifdef UNITOBJECTS
ifneq ($(UNITCLEANFILES),) -$(DEL) $(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))
-$(DEL) $(UNITCLEANFILES) endif
ifdef EXTRACLEANUNITS
-$(DEL) $(wildcard $(addsuffix $(OEXT),$(EXTRACLEANUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRACLEANUNITS)) $(addsuffix $(PPUEXT),$(EXTRACLEANUNITS)))
endif endif
-$(DEL) $(PPAS) link.res log -$(DEL) $(PPAS) link.res log
@ -989,6 +983,7 @@ fpc_objectinfo:
@$(ECHO) @$(ECHO)
@$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS) @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)
@$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS) @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)
@$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLFILES)
@$(ECHO) @$(ECHO)
@$(ECHO) == Unit info == @$(ECHO) == Unit info ==
@$(ECHO) @$(ECHO)
@ -1044,7 +1039,10 @@ endif
# #
# $Log$ # $Log$
# Revision 1.38 1999-07-16 13:45:24 peter # Revision 1.39 1999-07-17 11:30:23 peter
# * merged
#
# Revision 1.38 1999/07/16 13:45:24 peter
# * 0.99.12b updates # * 0.99.12b updates
# * merges # * merges
# #
@ -1066,6 +1064,9 @@ endif
# Revision 1.32 1999/06/11 13:31:14 hajny # Revision 1.32 1999/06/11 13:31:14 hajny
# * fixes for OS/2 # * fixes for OS/2
# #
# Revision 1.31.2.5 1999/07/17 11:29:02 peter
# * more extrainstallunits,extracleanunits updates
#
# Revision 1.31.2.4 1999/07/16 13:40:56 peter # Revision 1.31.2.4 1999/07/16 13:40:56 peter
# + extrainstallunits,extracleanunits # + extrainstallunits,extracleanunits
# #